* [PATCH] Btrfs: compression: added line after variable declaration
@ 2016-02-21 23:26 Philippe Loctaux
2016-02-22 0:37 ` Joe Perches
0 siblings, 1 reply; 3+ messages in thread
From: Philippe Loctaux @ 2016-02-21 23:26 UTC (permalink / raw)
To: clm; +Cc: jbacik, dsterba, linux-btrfs, linux-kernel, Philippe Loctaux
Added line after variable declaration, fixing checkpatch warning.
Signed-off-by: Philippe Loctaux <phil@philippeloctaux.com>
---
fs/btrfs/compression.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 3346cd8..5194b6f 100644
--- 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);
--
2.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Btrfs: compression: added line after variable declaration
2016-02-21 23:26 [PATCH] Btrfs: compression: added line after variable declaration Philippe Loctaux
@ 2016-02-22 0:37 ` Joe Perches
2016-02-22 0:43 ` Philippe Loctaux
0 siblings, 1 reply; 3+ messages in thread
From: Joe Perches @ 2016-02-22 0:37 UTC (permalink / raw)
To: Philippe Loctaux, clm; +Cc: jbacik, dsterba, linux-btrfs, linux-kernel
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);
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Btrfs: compression: added line after variable declaration
2016-02-22 0:37 ` Joe Perches
@ 2016-02-22 0:43 ` Philippe Loctaux
0 siblings, 0 replies; 3+ messages in thread
From: Philippe Loctaux @ 2016-02-22 0:43 UTC (permalink / raw)
To: Joe Perches; +Cc: jbacik, dsterba, linux-btrfs, linux-kernel
Oh, I see now :)
I'll try your changes and tell if they work or not :)
--
Philippe Loctaux
phil@philippeloctaux.com
On Sun, Feb 21, 2016 at 04:37:54PM -0800, Joe Perches wrote:
> 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);
> }
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-02-22 0:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-21 23:26 [PATCH] Btrfs: compression: added line after variable declaration Philippe Loctaux
2016-02-22 0:37 ` Joe Perches
2016-02-22 0:43 ` Philippe Loctaux
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).