Re: linux-next: manual merge of the percpu tree with the ext4 tree

[Stephen Rothwell]

Hi Ted,

On Mon, 8 Sep 2014 16:41:14 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx>
> Date: Mon, 8 Sep 2014 16:25:46 +1000
> Subject: [PATCH] percpu_counter: fix for ext4 updates
> 
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
>  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@xxxxxxxxxxxxxxxx

Attachment: signature.asc
Description: PGP signature