kernel/linux.git/drivers/block/drbd, branch v3.15.2

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2014-04-12T21:49:50+00:00

Pull vfs updates from Al Viro: "The first vfs pile, with deep apologies for being very late in this window. Assorted cleanups and fixes, plus a large preparatory part of iov_iter work. There's a lot more of that, but it'll probably go into the next merge window - it *does* shape up nicely, removes a lot of boilerplate, gets rid of locking inconsistencie between aio_write and splice_write and I hope to get Kent's direct-io rewrite merged into the same queue, but some of the stuff after this point is having (mostly trivial) conflicts with the things already merged into mainline and with some I want more testing. This one passes LTP and xfstests without regressions, in addition to usual beating. BTW, readahead02 in ltp syscalls testsuite has started giving failures since "mm/readahead.c: fix readahead failure for memoryless NUMA nodes and limit readahead pages" - might be a false positive, might be a real regression..." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (63 commits) missing bits of "splice: fix racy pipe->buffers uses" cifs: fix the race in cifs_writev() ceph_sync_{,direct_}write: fix an oops on ceph_osdc_new_request() failure kill generic_file_buffered_write() ocfs2_file_aio_write(): switch to generic_perform_write() ceph_aio_write(): switch to generic_perform_write() xfs_file_buffered_aio_write(): switch to generic_perform_write() export generic_perform_write(), start getting rid of generic_file_buffer_write() generic_file_direct_write(): get rid of ppos argument btrfs_file_aio_write(): get rid of ppos kill the 5th argument of generic_file_buffered_write() kill the 4th argument of __generic_file_aio_write() lustre: don't open-code kernel_recvmsg() ocfs2: don't open-code kernel_recvmsg() drbd: don't open-code kernel_recvmsg() constify blk_rq_map_user_iov() and friends lustre: switch to kernel_sendmsg() ocfs2: don't open-code kernel_sendmsg() take iov_iter stuff to mm/iov_iter.c process_vm_access: tidy up a bit ...

drbd: don't open-code kernel_recvmsg()

2014-04-02T03:19:32+00:00

Signed-off-by: Al Viro

drbd: Fix future possible NULL pointer dereference

2014-02-21T23:42:34+00:00

Right now every resource has exactly one connection. But we are preparing for dynamic connections. I.e. in the future thre can be resources without connections. However smatch points this out as 'variable dereferenced before check', which is correct. This issue was introduced in drbd: get_one_status(): Iterate over resource->devices instead of connection->peer_devices Reported-by: Dan Carpenter Signed-off-by: Andreas Gruenbacher Signed-off-by: Philipp Reisner Signed-off-by: Jens Axboe

drbd: Add drbd_thread->resource and make drbd_thread->connection optional

2014-02-17T15:50:48+00:00

In the drbd_thread "infrastructure" functions, only use the resource instead of the connection. Make the connection field of drbd_thread optional. This will allow to introduce threads which are not associated with a connection. Signed-off-by: Andreas Gruenbacher Signed-off-by: Philipp Reisner

drbd: Use the right peer device

2014-02-17T15:50:47+00:00

in w_e_ (peer request) callbacks and in peer request I/O completion handlers Signed-off-by: Andreas Gruenbacher Signed-off-by: Philipp Reisner

drbd: Remove unused parameter of wire_flags_to_bio()

2014-02-17T15:50:46+00:00

Signed-off-by: Andreas Gruenbacher Signed-off-by: Philipp Reisner

drbd: Get rid of first_peer_device() in handle_write_conflicts()

2014-02-17T15:50:45+00:00

Signed-off-by: Andreas Gruenbacher Signed-off-by: Philipp Reisner

drbd: In the worker thread, process drbd_work instead of drbd_device_work items

2014-02-17T15:50:44+00:00

Signed-off-by: Andreas Gruenbacher Signed-off-by: Philipp Reisner

drbd: Turn w_make_ov_request and make_resync_request into "normal" functions

2014-02-17T15:50:43+00:00

These functions are not used as drbd_work callbacks. Signed-off-by: Andreas Gruenbacher Signed-off-by: Philipp Reisner

drbd: Make w_make_resync_request() static

2014-02-17T15:50:42+00:00

Signed-off-by: Andreas Gruenbacher Signed-off-by: Philipp Reisner