[PATCH] Btrfs: cleanup the same name in end_bio_extent_readpage

[PATCH] Btrfs: cleanup the same name in end_bio_extent_readpage

[Liu Bo]

We've defined a 'offset' out of bio_for_each_segment_all.

This is just a clean rename, no function changes.

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
---
 fs/btrfs/extent_io.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 3af4966..7e27ba7 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2609,12 +2609,12 @@ readpage_ok:
 		if (likely(uptodate)) {
 			loff_t i_size = i_size_read(inode);
 			pgoff_t end_index = i_size >> PAGE_CACHE_SHIFT;
-			unsigned offset;
+			unsigned off;
 
 			/* Zero out the end if this page straddles i_size */
-			offset = i_size & (PAGE_CACHE_SIZE-1);
-			if (page->index == end_index && offset)
-				zero_user_segment(page, offset, PAGE_CACHE_SIZE);
+			off = i_size & (PAGE_CACHE_SIZE-1);
+			if (page->index == end_index && off)
+				zero_user_segment(page, off, PAGE_CACHE_SIZE);
 			SetPageUptodate(page);
 		} else {
 			ClearPageUptodate(page);
-- 
1.8.1.4

Re: [PATCH] Btrfs: cleanup the same name in end_bio_extent_readpage

[Chris Mason]

On 08/19/2014 11:32 AM, Liu Bo wrote:
> We've defined a 'offset' out of bio_for_each_segment_all.

This isn't causing problems though?  It should just be shadowing the
bio_for_each_segment_all variable for the duration of the curlies.

No objection as a cleanup, just making sure I'm not missing something.

-chris

Re: [PATCH] Btrfs: cleanup the same name in end_bio_extent_readpage

[Liu Bo]

On Tue, Aug 19, 2014 at 03:31:00PM -0400, Chris Mason wrote:
> On 08/19/2014 11:32 AM, Liu Bo wrote:
> > We've defined a 'offset' out of bio_for_each_segment_all.
> 
> This isn't causing problems though?  It should just be shadowing the
> bio_for_each_segment_all variable for the duration of the curlies.
> 
> No objection as a cleanup, just making sure I'm not missing something.

It did't cause any problems yet in my testers at least, so just a cleanup.

thanks,
-liubo