Merge tag 'xtensa-next-20130508' of git://github.com/czankel/xtensa-linux

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

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 3823d3ffb7607c91e7b963ac5c96ec5dc8d92802..2091db8cdd783a2287ce9165a7223cfe59cf5a2b 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -27,6 +27,7 @@
 #include <linux/namei.h>
 #include <linux/log2.h>
 #include <linux/cleancache.h>
+#include <linux/aio.h>
 #include <asm/uaccess.h>
 #include "internal.h"
 
@@ -1555,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);
 }