9 files changed, 26 insertions, 21 deletions

diff --git a/fs/aio.c b/fs/aio.c
index 733750096b71..84a751005f5b 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -661,10 +661,10 @@ static struct kioctx *ioctx_alloc(unsigned nr_events)
 
         INIT_LIST_HEAD(&ctx->active_reqs);
 
-        if (percpu_ref_init(&ctx->users, free_ioctx_users))
+        if (percpu_ref_init(&ctx->users, free_ioctx_users, 0, GFP_KERNEL))
                 goto err;
 
-        if (percpu_ref_init(&ctx->reqs, free_ioctx_reqs))
+        if (percpu_ref_init(&ctx->reqs, free_ioctx_reqs, 0, GFP_KERNEL))
                 goto err;
 
         ctx->cpu = alloc_percpu(struct kioctx_cpu);
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index a1d36e62179c..d0d78dc07792 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1183,7 +1183,7 @@ static struct btrfs_subvolume_writers *btrfs_alloc_subvolume_writers(void)
         if (!writers)
                 return ERR_PTR(-ENOMEM);
 
-        ret = percpu_counter_init(&writers->counter, 0);
+        ret = percpu_counter_init(&writers->counter, 0, GFP_KERNEL);
         if (ret < 0) {
                 kfree(writers);
                 return ERR_PTR(ret);
@@ -2188,7 +2188,7 @@ int open_ctree(struct super_block *sb,
                 goto fail_srcu;
         }
 
-        ret = percpu_counter_init(&fs_info->dirty_metadata_bytes, 0);
+        ret = percpu_counter_init(&fs_info->dirty_metadata_bytes, 0, GFP_KERNEL);
         if (ret) {
                 err = ret;
                 goto fail_bdi;
@@ -2196,13 +2196,13 @@ int open_ctree(struct super_block *sb,
         fs_info->dirty_metadata_batch = PAGE_CACHE_SIZE *
                                         (1 + ilog2(nr_cpu_ids));
 
-        ret = percpu_counter_init(&fs_info->delalloc_bytes, 0);
+        ret = percpu_counter_init(&fs_info->delalloc_bytes, 0, GFP_KERNEL);
         if (ret) {
                 err = ret;
                 goto fail_dirty_metadata_bytes;
         }
 
-        ret = percpu_counter_init(&fs_info->bio_counter, 0);
+        ret = percpu_counter_init(&fs_info->bio_counter, 0, GFP_KERNEL);
         if (ret) {
                 err = ret;
                 goto fail_delalloc_bytes;
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 3efe1c3877bf..caaf015d6e4b 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3494,7 +3494,7 @@ static int update_space_info(struct btrfs_fs_info *info, u64 flags,
         if (!found)
                 return -ENOMEM;
 
-        ret = percpu_counter_init(&found->total_bytes_pinned, 0);
+        ret = percpu_counter_init(&found->total_bytes_pinned, 0, GFP_KERNEL);
         if (ret) {
                 kfree(found);
                 return ret;
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index b88edc05c230..170dc41e8bf4 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -1067,14 +1067,14 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
         ext2_rsv_window_add(sb, &sbi->s_rsv_window_head);
 
         err = percpu_counter_init(&sbi->s_freeblocks_counter,
-                                ext2_count_free_blocks(sb));
+                                ext2_count_free_blocks(sb), GFP_KERNEL);
         if (!err) {
                 err = percpu_counter_init(&sbi->s_freeinodes_counter,
-                                ext2_count_free_inodes(sb));
+                                ext2_count_free_inodes(sb), GFP_KERNEL);
         }
         if (!err) {
                 err = percpu_counter_init(&sbi->s_dirs_counter,
-                                ext2_count_dirs(sb));
+                                ext2_count_dirs(sb), GFP_KERNEL);
         }
         if (err) {
                 ext2_msg(sb, KERN_ERR, "error: insufficient memory");
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 622e88249024..bb0fdacad058 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -2039,14 +2039,14 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
                 goto failed_mount2;
         }
         err = percpu_counter_init(&sbi->s_freeblocks_counter,
-                        ext3_count_free_blocks(sb));
+                        ext3_count_free_blocks(sb), GFP_KERNEL);
         if (!err) {
                 err = percpu_counter_init(&sbi->s_freeinodes_counter,
-                                ext3_count_free_inodes(sb));
+                                ext3_count_free_inodes(sb), GFP_KERNEL);
         }
         if (!err) {
                 err = percpu_counter_init(&sbi->s_dirs_counter,
-                                ext3_count_dirs(sb));
+                                ext3_count_dirs(sb), GFP_KERNEL);
         }
         if (err) {
                 ext3_msg(sb, KERN_ERR, "error: insufficient memory");
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 0b28b36e7915..05c159218bc2 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3892,7 +3892,8 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
         /* Register extent status tree shrinker */
         ext4_es_register_shrinker(sbi);
 
-        if ((err = percpu_counter_init(&sbi->s_extent_cache_cnt, 0)) != 0) {
+        err = percpu_counter_init(&sbi->s_extent_cache_cnt, 0, GFP_KERNEL);
+        if (err) {
                 ext4_msg(sb, KERN_ERR, "insufficient memory");
                 goto failed_mount3;
         }
@@ -4106,17 +4107,20 @@ no_journal:
         block = ext4_count_free_clusters(sb);
         ext4_free_blocks_count_set(sbi->s_es, 
                                    EXT4_C2B(sbi, block));
-        err = percpu_counter_init(&sbi->s_freeclusters_counter, block);
+        err = percpu_counter_init(&sbi->s_freeclusters_counter, block,
+                                  GFP_KERNEL);
         if (!err) {
                 unsigned long freei = ext4_count_free_inodes(sb);
                 sbi->s_es->s_free_inodes_count = cpu_to_le32(freei);
-                err = percpu_counter_init(&sbi->s_freeinodes_counter, freei);
+                err = percpu_counter_init(&sbi->s_freeinodes_counter, freei,
+                                          GFP_KERNEL);
         }
         if (!err)
                 err = percpu_counter_init(&sbi->s_dirs_counter,
-                                          ext4_count_dirs(sb));
+                                          ext4_count_dirs(sb), GFP_KERNEL);
         if (!err)
-                err = percpu_counter_init(&sbi->s_dirtyclusters_counter, 0);
+                err = percpu_counter_init(&sbi->s_dirtyclusters_counter, 0,
+                                          GFP_KERNEL);
         if (err) {
                 ext4_msg(sb, KERN_ERR, "insufficient memory");
                 goto failed_mount6;
diff --git a/fs/file_table.c b/fs/file_table.c
index 385bfd31512a..0bab12b20460 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -331,5 +331,5 @@ void __init files_init(unsigned long mempages)
 
         n = (mempages * (PAGE_SIZE / 1024)) / 10;
         files_stat.max_files = max_t(unsigned long, n, NR_FILE);
-        percpu_counter_init(&nr_files, 0);
+        percpu_counter_init(&nr_files, 0, GFP_KERNEL);
 } 
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index f2d0eee9d1f1..8b663b2d9562 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -2725,7 +2725,7 @@ static int __init dquot_init(void)
                 panic("Cannot create dquot hash table");
 
         for (i = 0; i < _DQST_DQSTAT_LAST; i++) {
-                ret = percpu_counter_init(&dqstats.counter[i], 0);
+                ret = percpu_counter_init(&dqstats.counter[i], 0, GFP_KERNEL);
                 if (ret)
                         panic("Cannot create dquot stat counters");
         }
diff --git a/fs/super.c b/fs/super.c
index b9a214d2fe98..1b836107acee 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -175,7 +175,8 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags)
                 goto fail;
 
         for (i = 0; i < SB_FREEZE_LEVELS; i++) {
-                if (percpu_counter_init(&s->s_writers.counter[i], 0) < 0)
+                if (percpu_counter_init(&s->s_writers.counter[i], 0,
+                                        GFP_KERNEL) < 0)
                         goto fail;
                 lockdep_init_map(&s->s_writers.lock_map[i], sb_writers_name[i],
                                  &type->s_writers_key[i], 0);