From 6f8f5c260af67fed49fe14efc3ad1f69654c260e Mon Sep 17 00:00:00 2001 From: Gu Zheng Date: Mon, 29 Apr 2013 11:55:52 -0700 Subject: [PATCH] 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 Signed-off-by: Gu Zheng Cc: Al Viro Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe --- fs/block_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/block_dev.c b/fs/block_dev.c index aea605c98ba6..dc7f9836fb5e 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -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); }