Commit 908c7f19 authored by Tejun Heo's avatar Tejun Heo
Browse files

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: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarJan Kara <jack@suse.cz>
Acked-by: default avatar"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>
parent ebd8fef3

arch/x86/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -4534,7 +4534,7 @@ int kvm_mmu_module_init(void) 
	if (!mmu_page_header_cache)

		goto nomem;



	if (percpu_counter_init(&kvm_total_used_mmu_pages, 0))

	if (percpu_counter_init(&kvm_total_used_mmu_pages, 0, GFP_KERNEL))

		goto nomem;



	register_shrinker(&mmu_shrinker);

fs/btrfs/disk-io.c

+4 −4
Original line number Diff line number Diff line
@@ -1180,7 +1180,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);
@@ -2185,7 +2185,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;
@@ -2193,13 +2193,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;

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -3493,7 +3493,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;

fs/ext2/super.c

+3 −3
Original line number Diff line number Diff line
@@ -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");

fs/ext3/super.c

+3 −3
Original line number Diff line number Diff line
@@ -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");

CRA Git | Maintained and supported by SUSTech CRA and CCSE