linux-next: manual merge of the aio-direct tree with Linus' tree

[Stephen Rothwell]

Hi Dave,

Today's linux-next merge of the aio-direct tree got a conflict in
fs/block_dev.c between commits 02afc27faec9 ("direct-io: Handle O_(D)SYNC
AIO") and 73a7075e3f6e ("aio: Kill aio_rw_vect_retry()") from Linus' tree
and commit b176eedb2a8b ("block_dev: add support for read_iter,
write_iter") from the aio-direct tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc fs/block_dev.c
index 1e86823,89d8ec5..0000000
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@@ -1518,8 -1517,8 +1517,8 @@@ ssize_t blkdev_write_iter(struct kiocb 
        BUG_ON(iocb->ki_pos != pos);
  
        blk_start_plug(&plug);
-       ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos);
+       ret = __generic_file_write_iter(iocb, iter, &iocb->ki_pos);
 -      if (ret > 0 || ret == -EIOCBQUEUED) {
 +      if (ret > 0) {
                ssize_t err;
  
                err = generic_write_sync(file, pos, ret);
@@@ -1542,9 -1541,9 +1541,9 @@@ static ssize_t blkdev_read_iter(struct 
                return 0;
  
        size -= pos;
 -      if (size < iocb->ki_left)
 +      if (size < iocb->ki_nbytes)
-               nr_segs = iov_shorten((struct iovec *)iov, nr_segs, size);
-       return generic_file_aio_read(iocb, iov, nr_segs, pos);
+               iov_iter_shorten(iter, size);
+       return generic_file_read_iter(iocb, iter, pos);
  }
  
  /*

pgp5w4NOz17NN.pgp
Description: PGP signature