* linux-next: manual merge of the percpu tree with the ext4 tree
@ 2014-09-08 6:41 Stephen Rothwell
2014-10-13 0:25 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2014-09-08 6:41 UTC (permalink / raw)
To: Tejun Heo, Rusty Russell, Christoph Lameter, Ingo Molnar,
Theodore Ts'o
Cc: linux-next, linux-kernel, Zheng Liu
[-- Attachment #1: Type: text/plain, Size: 1937 bytes --]
Hi all,
Today's linux-next merge of the percpu tree got a conflict in
fs/ext4/super.c between commit eb68d0e2fc5a ("ext4: track extent status
tree shrinker delay statictics") from the ext4 tree and commit
908c7f1949cb ("percpu_counter: add @gfp to percpu_counter_init()") from
the percpu tree.
I fixed it up (the former removed a reference to percpu_counter_init)
and can carry the fix as necessary (no action is required).
That commit also added two references in fs/ext4/extents_status.c (thus
proving that modifying a little used API causes it to be used
more :-)), so I added the following merge fix patch:
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 8 Sep 2014 16:25:46 +1000
Subject: [PATCH] percpu_counter: fix for ext4 updates
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
fs/ext4/extents_status.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c
index 09fd57667262..3777f7eda5cf 100644
--- a/fs/ext4/extents_status.c
+++ b/fs/ext4/extents_status.c
@@ -13,6 +13,7 @@
#include <linux/list_sort.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
+#include <linux/gfp.h>
#include "ext4.h"
#include "extents_status.h"
@@ -1189,10 +1190,10 @@ int ext4_es_register_shrinker(struct ext4_sb_info *sbi)
sbi->s_es_stats.es_stats_cache_misses = 0;
sbi->s_es_stats.es_stats_scan_time = 0;
sbi->s_es_stats.es_stats_max_scan_time = 0;
- err = percpu_counter_init(&sbi->s_es_stats.es_stats_all_cnt, 0);
+ err = percpu_counter_init(&sbi->s_es_stats.es_stats_all_cnt, 0, GFP_KERNEL);
if (err)
return err;
- err = percpu_counter_init(&sbi->s_es_stats.es_stats_lru_cnt, 0);
+ err = percpu_counter_init(&sbi->s_es_stats.es_stats_lru_cnt, 0, GFP_KERNEL);
if (err)
goto err1;
--
2.1.0
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the percpu tree with the ext4 tree
2014-09-08 6:41 linux-next: manual merge of the percpu tree with the ext4 tree Stephen Rothwell
@ 2014-10-13 0:25 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2014-10-13 0:25 UTC (permalink / raw)
To: Theodore Ts'o
Cc: Tejun Heo, Rusty Russell, Christoph Lameter, Ingo Molnar,
linux-next, linux-kernel, Zheng Liu
[-- Attachment #1: Type: text/plain, Size: 2237 bytes --]
Hi Ted,
On Mon, 8 Sep 2014 16:41:14 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the percpu tree got a conflict in
> fs/ext4/super.c between commit eb68d0e2fc5a ("ext4: track extent status
> tree shrinker delay statictics") from the ext4 tree and commit
> 908c7f1949cb ("percpu_counter: add @gfp to percpu_counter_init()") from
> the percpu tree.
>
> I fixed it up (the former removed a reference to percpu_counter_init)
> and can carry the fix as necessary (no action is required).
>
> That commit also added two references in fs/ext4/extents_status.c (thus
> proving that modifying a little used API causes it to be used
> more :-)), so I added the following merge fix patch:
This patch is now needed when I merge the ext4 tree with Linus'
tree ... so please let Linus know when you send your pull request.
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Mon, 8 Sep 2014 16:25:46 +1000
> Subject: [PATCH] percpu_counter: fix for ext4 updates
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> fs/ext4/extents_status.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c
> index 09fd57667262..3777f7eda5cf 100644
> --- a/fs/ext4/extents_status.c
> +++ b/fs/ext4/extents_status.c
> @@ -13,6 +13,7 @@
> #include <linux/list_sort.h>
> #include <linux/proc_fs.h>
> #include <linux/seq_file.h>
> +#include <linux/gfp.h>
> #include "ext4.h"
> #include "extents_status.h"
>
> @@ -1189,10 +1190,10 @@ int ext4_es_register_shrinker(struct ext4_sb_info *sbi)
> sbi->s_es_stats.es_stats_cache_misses = 0;
> sbi->s_es_stats.es_stats_scan_time = 0;
> sbi->s_es_stats.es_stats_max_scan_time = 0;
> - err = percpu_counter_init(&sbi->s_es_stats.es_stats_all_cnt, 0);
> + err = percpu_counter_init(&sbi->s_es_stats.es_stats_all_cnt, 0, GFP_KERNEL);
> if (err)
> return err;
> - err = percpu_counter_init(&sbi->s_es_stats.es_stats_lru_cnt, 0);
> + err = percpu_counter_init(&sbi->s_es_stats.es_stats_lru_cnt, 0, GFP_KERNEL);
> if (err)
> goto err1;
>
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-10-13 0:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-08 6:41 linux-next: manual merge of the percpu tree with the ext4 tree Stephen Rothwell
2014-10-13 0:25 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox