percpu_counter: add @gfp to percpu_counter_init()

Percpu allocator now supports allocation mask.  Add @gfp to
percpu_counter_init() so that !GFP_KERNEL allocation masks can be used
with percpu_counters too.

We could have left percpu_counter_init() alone and added
percpu_counter_init_gfp(); however, the number of users isn't that
high and introducing _gfp variants to all percpu data structures would
be quite ugly, so let's just do the conversion.  This is the one with
the most users.  Other percpu data structures are a lot easier to
convert.

This patch doesn't make any functional difference.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Jan Kara <jack@suse.cz>
Acked-by: "David S. Miller" <davem@davemloft.net>
Cc: x86@kernel.org
Cc: Jens Axboe <axboe@kernel.dk>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>

3 files changed, 7 insertions, 7 deletions

diff --git a/lib/flex_proportions.c b/lib/flex_proportions.c
index ebf3bac460b0..b9d026bfcf38 100644
--- a/lib/flex_proportions.c
+++ b/lib/flex_proportions.c
@@ -40,7 +40,7 @@ int fprop_global_init(struct fprop_global *p)
 
         p->period = 0;
         /* Use 1 to avoid dealing with periods with 0 events... */
-        err = percpu_counter_init(&p->events, 1);
+        err = percpu_counter_init(&p->events, 1, GFP_KERNEL);
         if (err)
                 return err;
         seqcount_init(&p->sequence);
@@ -172,7 +172,7 @@ int fprop_local_init_percpu(struct fprop_local_percpu *pl)
 {
         int err;
 
-        err = percpu_counter_init(&pl->events, 0);
+        err = percpu_counter_init(&pl->events, 0, GFP_KERNEL);
         if (err)
                 return err;
         pl->period = 0;
diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c
index 3fde78275cd1..48144cdae819 100644
--- a/lib/percpu_counter.c
+++ b/lib/percpu_counter.c
@@ -112,7 +112,7 @@ s64 __percpu_counter_sum(struct percpu_counter *fbc)
 }
 EXPORT_SYMBOL(__percpu_counter_sum);
 
-int __percpu_counter_init(struct percpu_counter *fbc, s64 amount,
+int __percpu_counter_init(struct percpu_counter *fbc, s64 amount, gfp_t gfp,
                           struct lock_class_key *key)
 {
         unsigned long flags __maybe_unused;
@@ -120,7 +120,7 @@ int __percpu_counter_init(struct percpu_counter *fbc, s64 amount,
         raw_spin_lock_init(&fbc->lock);
         lockdep_set_class(&fbc->lock, key);
         fbc->count = amount;
-        fbc->counters = alloc_percpu(s32);
+        fbc->counters = alloc_percpu_gfp(s32, gfp);
         if (!fbc->counters)
                 return -ENOMEM;
 
diff --git a/lib/proportions.c b/lib/proportions.c
index 05df84801b56..ca95f8d54384 100644
--- a/lib/proportions.c
+++ b/lib/proportions.c
@@ -83,11 +83,11 @@ int prop_descriptor_init(struct prop_descriptor *pd, int shift)
         pd->index = 0;
         pd->pg[0].shift = shift;
         mutex_init(&pd->mutex);
-        err = percpu_counter_init(&pd->pg[0].events, 0);
+        err = percpu_counter_init(&pd->pg[0].events, 0, GFP_KERNEL);
         if (err)
                 goto out;
 
-        err = percpu_counter_init(&pd->pg[1].events, 0);
+        err = percpu_counter_init(&pd->pg[1].events, 0, GFP_KERNEL);
         if (err)
                 percpu_counter_destroy(&pd->pg[0].events);
 
@@ -193,7 +193,7 @@ int prop_local_init_percpu(struct prop_local_percpu *pl)
         raw_spin_lock_init(&pl->lock);
         pl->shift = 0;
         pl->period = 0;
-        return percpu_counter_init(&pl->events, 0);
+        return percpu_counter_init(&pl->events, 0, GFP_KERNEL);
 }
 
 void prop_local_destroy_percpu(struct prop_local_percpu *pl)