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

[Stephen Rothwell]

Hi Al,

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

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

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc fs/block_dev.c
index 89d8ec5,1173a4e..0000000
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@@ -1517,8 -1518,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);

Attachment: pgp00000.pgp
Description: PGP signature