| Message ID | 1501657852-12603-1-git-send-email-nborisov@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Nikolay Borisov <nborisov@suse.com> writes: > 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@suse.com> Looks ok to me. Reviewed-by: Jeff Moyer <jmoyer@redhat.com>
On 2.08.2017 10:10, Nikolay Borisov wrote: > 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@suse.com> > --- > 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 08cf27811e5a..987bc17a5f5e 100644 > --- a/fs/direct-io.c > +++ b/fs/direct-io.c > @@ -1139,7 +1139,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); > @@ -1248,8 +1248,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 > Ping on that forgotten one :)
diff --git a/fs/direct-io.c b/fs/direct-io.c index 08cf27811e5a..987bc17a5f5e 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c @@ -1139,7 +1139,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); @@ -1248,8 +1248,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
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@suse.com> --- fs/direct-io.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)