Commit 6f8f5c26 authored Apr 29, 2013 by Gu Zheng Committed by Jens Axboe Apr 29, 2013

fs/block_dev.c: fix iov_shorten() criteria in blkdev_aio_read()



blkdev_aio_read() test 'size' to see if it is equal or greater than the
target count we request(iocb->ki_left).  If so there is no need to call
iov_shorten() to reduce number of segments and the iovec's length.  So the
judgement should be changed to 'if (size < iocb->ki_left)' instead.

Signed-off-by: Jianpeng Ma <majianpeng@gmail.com>
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 871dd928

fs/block_dev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1558,7 +1558,7 @@ static ssize_t blkdev_aio_read(struct kiocb iocb, const struct iovec iov,
		return 0;

		size -= pos;
		if (size < INT_MAX)
		if (size < iocb->ki_left)
		nr_segs = iov_shorten((struct iovec *)iov, nr_segs, size);
		return generic_file_aio_read(iocb, iov, nr_segs, pos);
		}

Admin message