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

* linux-next: manual merge of the aio tree with the aio-direct tree
@ 2013-08-21  7:21 Stephen Rothwell
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2013-08-21  7:21 UTC (permalink / raw)
  To: Benjamin LaHaise
  Cc: linux-next, linux-kernel, Kent Overstreet, Asias He, Dave Kleikamp

[-- Attachment #1: Type: text/plain, Size: 941 bytes --]

Hi Benjamin,

Today's linux-next merge of the aio 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 73a7075e3f6e ("aio: Kill
aio_rw_vect_retry()") from the aio tree.

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

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

diff --cc fs/block_dev.c
index 89d8ec5,8772b15..0000000

--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@@ -1541,9 -1542,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);
  }
  
  /*

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread