diff options
author | Tejun Heo <tj@kernel.org> | 2014-09-07 20:51:29 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-09-07 20:51:29 -0400 |
commit | 908c7f1949cb7cc6e92ba8f18f2998e87e265b8e (patch) | |
tree | af885c65c6fe794cab7b7ad37bd811531a2a2ac5 /fs/ext3/super.c | |
parent | ebd8fef304f99da84d4a52ad056f6137ac9652d4 (diff) |
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>
Diffstat (limited to 'fs/ext3/super.c')
-rw-r--r-- | fs/ext3/super.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 08cdfe5461e3..eba021b88440 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) | |||
2039 | goto failed_mount2; | 2039 | goto failed_mount2; |
2040 | } | 2040 | } |
2041 | err = percpu_counter_init(&sbi->s_freeblocks_counter, | 2041 | err = percpu_counter_init(&sbi->s_freeblocks_counter, |
2042 | ext3_count_free_blocks(sb)); | 2042 | ext3_count_free_blocks(sb), GFP_KERNEL); |
2043 | if (!err) { | 2043 | if (!err) { |
2044 | err = percpu_counter_init(&sbi->s_freeinodes_counter, | 2044 | err = percpu_counter_init(&sbi->s_freeinodes_counter, |
2045 | ext3_count_free_inodes(sb)); | 2045 | ext3_count_free_inodes(sb), GFP_KERNEL); |
2046 | } | 2046 | } |
2047 | if (!err) { | 2047 | if (!err) { |
2048 | err = percpu_counter_init(&sbi->s_dirs_counter, | 2048 | err = percpu_counter_init(&sbi->s_dirs_counter, |
2049 | ext3_count_dirs(sb)); | 2049 | ext3_count_dirs(sb), GFP_KERNEL); |
2050 | } | 2050 | } |
2051 | if (err) { | 2051 | if (err) { |
2052 | ext3_msg(sb, KERN_ERR, "error: insufficient memory"); | 2052 | ext3_msg(sb, KERN_ERR, "error: insufficient memory"); |