aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/disk-io.c8
-rw-r--r--fs/btrfs/extent-tree.c2
2 files changed, 5 insertions, 5 deletions
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)
1183 if (!writers) 1183 if (!writers)
1184 return ERR_PTR(-ENOMEM); 1184 return ERR_PTR(-ENOMEM);
1185 1185
1186 ret = percpu_counter_init(&writers->counter, 0); 1186 ret = percpu_counter_init(&writers->counter, 0, GFP_KERNEL);
1187 if (ret < 0) { 1187 if (ret < 0) {
1188 kfree(writers); 1188 kfree(writers);
1189 return ERR_PTR(ret); 1189 return ERR_PTR(ret);
@@ -2188,7 +2188,7 @@ int open_ctree(struct super_block *sb,
2188 goto fail_srcu; 2188 goto fail_srcu;
2189 } 2189 }
2190 2190
2191 ret = percpu_counter_init(&fs_info->dirty_metadata_bytes, 0); 2191 ret = percpu_counter_init(&fs_info->dirty_metadata_bytes, 0, GFP_KERNEL);
2192 if (ret) { 2192 if (ret) {
2193 err = ret; 2193 err = ret;
2194 goto fail_bdi; 2194 goto fail_bdi;
@@ -2196,13 +2196,13 @@ int open_ctree(struct super_block *sb,
2196 fs_info->dirty_metadata_batch = PAGE_CACHE_SIZE * 2196 fs_info->dirty_metadata_batch = PAGE_CACHE_SIZE *
2197 (1 + ilog2(nr_cpu_ids)); 2197 (1 + ilog2(nr_cpu_ids));
2198 2198
2199 ret = percpu_counter_init(&fs_info->delalloc_bytes, 0); 2199 ret = percpu_counter_init(&fs_info->delalloc_bytes, 0, GFP_KERNEL);
2200 if (ret) { 2200 if (ret) {
2201 err = ret; 2201 err = ret;
2202 goto fail_dirty_metadata_bytes; 2202 goto fail_dirty_metadata_bytes;
2203 } 2203 }
2204 2204
2205 ret = percpu_counter_init(&fs_info->bio_counter, 0); 2205 ret = percpu_counter_init(&fs_info->bio_counter, 0, GFP_KERNEL);
2206 if (ret) { 2206 if (ret) {
2207 err = ret; 2207 err = ret;
2208 goto fail_delalloc_bytes; 2208 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,
3494 if (!found) 3494 if (!found)
3495 return -ENOMEM; 3495 return -ENOMEM;
3496 3496
3497 ret = percpu_counter_init(&found->total_bytes_pinned, 0); 3497 ret = percpu_counter_init(&found->total_bytes_pinned, 0, GFP_KERNEL);
3498 if (ret) { 3498 if (ret) {
3499 kfree(found); 3499 kfree(found);
3500 return ret; 3500 return ret;