directio: account for extra page IOs for unaligned request

sdio_init() initializes pages_in_io to 2 for an unaligned directio request
in order that a zero page may be written to the first and last block.
However, __blockdev_direct_IO_bvec was setting pages_in_io to the number
of pages in the request rather than adding them to the original value.

Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>

diff --git a/fs/direct-io.c b/fs/direct-io.c
index 65ff39f39519f3cbcf0f590bd3cda0453a5c12f3..3c138051e58564d09958c0675a0a82ebdeff0cc3 100644 (file)
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -1400,7 +1400,7 @@ __blockdev_direct_IO_bvec(int rw, struct kiocb *iocb, struct inode *inode,
 
        sdio_init(&sdio, inode, offset, blkbits, get_block, submit_io);
 
-       sdio.pages_in_io = bvec_len;
+       sdio.pages_in_io += bvec_len;
 
        for (i = 0; i < bvec_len; i++) {
                sdio.size += bvec[i].bv_len;