diff options
Diffstat (limited to 'fs/btrfs/extent-tree.c')
-rw-r--r-- | fs/btrfs/extent-tree.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 3f2ccfed3b0e..2f6e74803c9f 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -4382,8 +4382,8 @@ int btrfs_block_rsv_use_bytes(struct btrfs_block_rsv *block_rsv, u64 num_bytes) | |||
4382 | return ret; | 4382 | return ret; |
4383 | } | 4383 | } |
4384 | 4384 | ||
4385 | static void block_rsv_add_bytes(struct btrfs_block_rsv *block_rsv, | 4385 | void btrfs_block_rsv_add_bytes(struct btrfs_block_rsv *block_rsv, |
4386 | u64 num_bytes, bool update_size) | 4386 | u64 num_bytes, bool update_size) |
4387 | { | 4387 | { |
4388 | spin_lock(&block_rsv->lock); | 4388 | spin_lock(&block_rsv->lock); |
4389 | block_rsv->reserved += num_bytes; | 4389 | block_rsv->reserved += num_bytes; |
@@ -4415,7 +4415,7 @@ int btrfs_cond_migrate_bytes(struct btrfs_fs_info *fs_info, | |||
4415 | global_rsv->full = 0; | 4415 | global_rsv->full = 0; |
4416 | spin_unlock(&global_rsv->lock); | 4416 | spin_unlock(&global_rsv->lock); |
4417 | 4417 | ||
4418 | block_rsv_add_bytes(dest, num_bytes, true); | 4418 | btrfs_block_rsv_add_bytes(dest, num_bytes, true); |
4419 | return 0; | 4419 | return 0; |
4420 | } | 4420 | } |
4421 | 4421 | ||
@@ -4497,7 +4497,7 @@ int btrfs_delayed_refs_rsv_refill(struct btrfs_fs_info *fs_info, | |||
4497 | num_bytes, flush); | 4497 | num_bytes, flush); |
4498 | if (ret) | 4498 | if (ret) |
4499 | return ret; | 4499 | return ret; |
4500 | block_rsv_add_bytes(block_rsv, num_bytes, 0); | 4500 | btrfs_block_rsv_add_bytes(block_rsv, num_bytes, 0); |
4501 | trace_btrfs_space_reservation(fs_info, "delayed_refs_rsv", | 4501 | trace_btrfs_space_reservation(fs_info, "delayed_refs_rsv", |
4502 | 0, num_bytes, 1); | 4502 | 0, num_bytes, 1); |
4503 | return 0; | 4503 | return 0; |
@@ -4569,7 +4569,7 @@ int btrfs_block_rsv_migrate(struct btrfs_block_rsv *src, | |||
4569 | if (ret) | 4569 | if (ret) |
4570 | return ret; | 4570 | return ret; |
4571 | 4571 | ||
4572 | block_rsv_add_bytes(dst, num_bytes, update_size); | 4572 | btrfs_block_rsv_add_bytes(dst, num_bytes, update_size); |
4573 | return 0; | 4573 | return 0; |
4574 | } | 4574 | } |
4575 | 4575 | ||
@@ -4622,7 +4622,7 @@ int btrfs_block_rsv_add(struct btrfs_root *root, | |||
4622 | 4622 | ||
4623 | ret = btrfs_reserve_metadata_bytes(root, block_rsv, num_bytes, flush); | 4623 | ret = btrfs_reserve_metadata_bytes(root, block_rsv, num_bytes, flush); |
4624 | if (!ret) | 4624 | if (!ret) |
4625 | block_rsv_add_bytes(block_rsv, num_bytes, true); | 4625 | btrfs_block_rsv_add_bytes(block_rsv, num_bytes, true); |
4626 | 4626 | ||
4627 | return ret; | 4627 | return ret; |
4628 | } | 4628 | } |
@@ -4667,7 +4667,7 @@ int btrfs_block_rsv_refill(struct btrfs_root *root, | |||
4667 | 4667 | ||
4668 | ret = btrfs_reserve_metadata_bytes(root, block_rsv, num_bytes, flush); | 4668 | ret = btrfs_reserve_metadata_bytes(root, block_rsv, num_bytes, flush); |
4669 | if (!ret) { | 4669 | if (!ret) { |
4670 | block_rsv_add_bytes(block_rsv, num_bytes, false); | 4670 | btrfs_block_rsv_add_bytes(block_rsv, num_bytes, false); |
4671 | return 0; | 4671 | return 0; |
4672 | } | 4672 | } |
4673 | 4673 | ||
@@ -5057,7 +5057,7 @@ int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes) | |||
5057 | spin_unlock(&inode->lock); | 5057 | spin_unlock(&inode->lock); |
5058 | 5058 | ||
5059 | /* Now we can safely add our space to our block rsv */ | 5059 | /* Now we can safely add our space to our block rsv */ |
5060 | block_rsv_add_bytes(block_rsv, meta_reserve, false); | 5060 | btrfs_block_rsv_add_bytes(block_rsv, meta_reserve, false); |
5061 | trace_btrfs_space_reservation(root->fs_info, "delalloc", | 5061 | trace_btrfs_space_reservation(root->fs_info, "delalloc", |
5062 | btrfs_ino(inode), meta_reserve, 1); | 5062 | btrfs_ino(inode), meta_reserve, 1); |
5063 | 5063 | ||
@@ -7429,7 +7429,7 @@ try_reserve: | |||
7429 | static void unuse_block_rsv(struct btrfs_fs_info *fs_info, | 7429 | static void unuse_block_rsv(struct btrfs_fs_info *fs_info, |
7430 | struct btrfs_block_rsv *block_rsv, u32 blocksize) | 7430 | struct btrfs_block_rsv *block_rsv, u32 blocksize) |
7431 | { | 7431 | { |
7432 | block_rsv_add_bytes(block_rsv, blocksize, false); | 7432 | btrfs_block_rsv_add_bytes(block_rsv, blocksize, false); |
7433 | block_rsv_release_bytes(fs_info, block_rsv, NULL, 0, NULL); | 7433 | block_rsv_release_bytes(fs_info, block_rsv, NULL, 0, NULL); |
7434 | } | 7434 | } |
7435 | 7435 | ||