From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>, Rusty Russell <rusty@rustcorp•com.au>,
Christoph Lameter <cl@linux-foundation•org>,
Ingo Molnar <mingo@elte•hu>, Theodore Ts'o <tytso@mit•edu>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Zheng Liu <wenqing.lz@taobao•com>
Subject: linux-next: manual merge of the percpu tree with the ext4 tree
Date: Mon, 8 Sep 2014 16:41:14 +1000 [thread overview]
Message-ID: <20140908164114.262bb178@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2014-09-08 6:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-08 6:41 Stephen Rothwell [this message]
2014-10-13 0:25 ` linux-next: manual merge of the percpu tree with the ext4 tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140908164114.262bb178@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cl@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=tj@kernel$(echo .)org \
--cc=tytso@mit$(echo .)edu \
--cc=wenqing.lz@taobao$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox