Merge branch 'for-3.10/core' of git://git.kernel.dk/linux-block

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / block_dev.c

diff --git a/fs/block_dev.c b/fs/block_dev.c
index d9871c1f08949082ab5175f09c50668f961b9512..2091db8cdd783a2287ce9165a7223cfe59cf5a2b 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1556,7 +1556,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);
 }