We already get the block counts and the calculate the end block at the beginning of the function. Let's use the local variables for consistency and readability. No functional changes Signed-off-by: Nikolay Borisov <nborisov@xxxxxxxx> Reviewed-by: Jeff Moyer <jmoyer@xxxxxxxxxx> --- Andrew, Sending to you since this has been languishing on the mailing for quite some time. The patch has been reviewed here: https://www.mail-archive.com/linux-kernel@xxxxxxxxxxxxxxx/msg1460544.html fs/direct-io.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/direct-io.c b/fs/direct-io.c index a8131087aa1c..a73448a501c2 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c @@ -1200,7 +1200,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, } /* watch out for a 0 len io from a tricksy fs */ - if (iov_iter_rw(iter) == READ && !iov_iter_count(iter)) + if (iov_iter_rw(iter) == READ && !count) return 0; dio = kmem_cache_alloc(dio_cache, GFP_KERNEL); @@ -1316,8 +1316,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, dio->should_dirty = (iter->type == ITER_IOVEC); sdio.iter = iter; - sdio.final_block_in_request = - (offset + iov_iter_count(iter)) >> blkbits; + sdio.final_block_in_request = end >> blkbits; /* * In case of non-aligned buffers, we may need 2 more -- 2.7.4
