Re: [PATCH] Btrfs: compression: added line after variable declaration

From: Joe Perches
Date: Sun Feb 21 2016 - 19:38:01 EST


On Mon, 2016-02-22 at 00:26 +0100, Philippe Loctaux wrote:
> Added line after variable declaration, fixing checkpatch warning.
[]
> diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
[]
> @@ -522,6 +522,7 @@ static noinline int add_ra_bio_pages(struct inode *inode,
>  
>   if (zero_offset) {
>   int zeros;
> +
>   zeros = PAGE_CACHE_SIZE - zero_offset;
>   userpage = kmap_atomic(page);
>   memset(userpage + zero_offset, 0, zeros);

This zeros temporary is used once.
Perhaps it should just be removed instead.

Maybe the userpage declaration should move too.

Something like:
---
 fs/btrfs/compression.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 3346cd8..be41f83 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -517,14 +517,13 @@ static noinline int add_ra_bio_pages(struct inode *inode,
  free_extent_map(em);
 
  if (page->index == end_index) {
- char *userpage;
  size_t zero_offset = isize & (PAGE_CACHE_SIZE - 1);
 
  if (zero_offset) {
- int zeros;
- zeros = PAGE_CACHE_SIZE - zero_offset;
- userpage = kmap_atomic(page);
- memset(userpage + zero_offset, 0, zeros);
+ char *userpage = kmap_atomic(page);
+
+ memset(userpage + zero_offset, 0,
+        PAGE_CACHE_SIZE - zero_offset);
  flush_dcache_page(page);
  kunmap_atomic(userpage);
  }