diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2015-01-22 12:20:19 -0500 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-05-27 19:39:51 +0200 |
| commit | 6c3082c4a6db6b2637829feac310509d89bf98b8 (patch) | |
| tree | c074101c0e4bf1dfa399559f404c6a6ae7b0c587 | |
| parent | f260656a0bd3a62ed160ce9a78ee1ed694e00659 (diff) | |
| download | android_kernel_m2note-6c3082c4a6db6b2637829feac310509d89bf98b8.tar.gz | |
ext4: use old percpu_counter_init() function signature
Older kernels don't pass in a gfp_flags argument.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | fs/ext4/extents_status.c | 4 | ||||
| -rw-r--r-- | fs/ext4/super.c | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index 1a33fb2e4..2d6c28c9b 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -1197,10 +1197,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, GFP_KERNEL); + err = percpu_counter_init(&sbi->s_es_stats.es_stats_all_cnt, 0); if (err) return err; - err = percpu_counter_init(&sbi->s_es_stats.es_stats_lru_cnt, 0, GFP_KERNEL); + err = percpu_counter_init(&sbi->s_es_stats.es_stats_lru_cnt, 0); if (err) goto err1; diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 2c9e6864a..d96ceda3c 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4122,20 +4122,17 @@ 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, - GFP_KERNEL); + err = percpu_counter_init(&sbi->s_freeclusters_counter, block); 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, - GFP_KERNEL); + err = percpu_counter_init(&sbi->s_freeinodes_counter, freei); } if (!err) err = percpu_counter_init(&sbi->s_dirs_counter, - ext4_count_dirs(sb), GFP_KERNEL); + ext4_count_dirs(sb)); if (!err) - err = percpu_counter_init(&sbi->s_dirtyclusters_counter, 0, - GFP_KERNEL); + err = percpu_counter_init(&sbi->s_dirtyclusters_counter, 0); if (err) { ext4_msg(sb, KERN_ERR, "insufficient memory"); goto failed_mount6; |