Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1339037

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

Show all headers | View raw

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);
 			}

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] Btrfs: compression: added line after variable declaration Philippe Loctaux <phil@philippeloctaux.com> - 2016-02-22 00:30 +0100
  Re: [PATCH] Btrfs: compression: added line after variable  declaration Joe Perches <joe@perches.com> - 2016-02-22 01:40 +0100
    Re: [PATCH] Btrfs: compression: added line after variable declaration Philippe Loctaux <phil@philippeloctaux.com> - 2016-02-22 02:00 +0100

csiph-web