summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosef Bacik <josef@toxicpanda.com>2019-06-19 13:47:19 -0400
committerDavid Sterba <dsterba@suse.com>2019-07-02 12:30:54 +0200
commitfed14b323db868c3ac0071925763964a6ca58883 (patch)
tree049ee767fcb3cfb9f5772aed4c55bb64ed845a1b
parent0b50174ad5e9fb32abcfdb10b1a14e76a72b20e6 (diff)
downloadlinux-fed14b323db868c3ac0071925763964a6ca58883.tar.gz
linux-fed14b323db868c3ac0071925763964a6ca58883.tar.bz2
linux-fed14b323db868c3ac0071925763964a6ca58883.zip
btrfs: export __btrfs_block_rsv_release
The delalloc reserve stuff calls this directly because it cares about the qgroup accounting stuff, so export it so we can move it around. Fix btrfs_block_rsv_release() to just be a static inline since it just calls __btrfs_block_rsv_release() with NULL for the qgroup stuff. Signed-off-by: Josef Bacik <josef@toxicpanda.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--fs/btrfs/block-rsv.h13
-rw-r--r--fs/btrfs/extent-tree.c13
2 files changed, 13 insertions, 13 deletions
diff --git a/fs/btrfs/block-rsv.h b/fs/btrfs/block-rsv.h
index f4af1c0766a7..feb0a4d4b1c9 100644
--- a/fs/btrfs/block-rsv.h
+++ b/fs/btrfs/block-rsv.h
@@ -70,10 +70,17 @@ int btrfs_block_rsv_use_bytes(struct btrfs_block_rsv *block_rsv, u64 num_bytes);
int btrfs_cond_migrate_bytes(struct btrfs_fs_info *fs_info,
struct btrfs_block_rsv *dest, u64 num_bytes,
int min_factor);
-void btrfs_block_rsv_release(struct btrfs_fs_info *fs_info,
- struct btrfs_block_rsv *block_rsv,
- u64 num_bytes);
void btrfs_block_rsv_add_bytes(struct btrfs_block_rsv *block_rsv,
u64 num_bytes, bool update_size);
+u64 __btrfs_block_rsv_release(struct btrfs_fs_info *fs_info,
+ struct btrfs_block_rsv *block_rsv,
+ u64 num_bytes, u64 *qgroup_to_release);
+
+static inline void btrfs_block_rsv_release(struct btrfs_fs_info *fs_info,
+ struct btrfs_block_rsv *block_rsv,
+ u64 num_bytes)
+{
+ __btrfs_block_rsv_release(fs_info, block_rsv, num_bytes, NULL);
+}
#endif /* BTRFS_BLOCK_RSV_H */
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 2f6e74803c9f..486ddc4c436d 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -4674,9 +4674,9 @@ int btrfs_block_rsv_refill(struct btrfs_root *root,
return ret;
}
-static u64 __btrfs_block_rsv_release(struct btrfs_fs_info *fs_info,
- struct btrfs_block_rsv *block_rsv,
- u64 num_bytes, u64 *qgroup_to_release)
+u64 __btrfs_block_rsv_release(struct btrfs_fs_info *fs_info,
+ struct btrfs_block_rsv *block_rsv,
+ u64 num_bytes, u64 *qgroup_to_release)
{
struct btrfs_block_rsv *global_rsv = &fs_info->global_block_rsv;
struct btrfs_block_rsv *delayed_rsv = &fs_info->delayed_refs_rsv;
@@ -4692,13 +4692,6 @@ static u64 __btrfs_block_rsv_release(struct btrfs_fs_info *fs_info,
qgroup_to_release);
}
-void btrfs_block_rsv_release(struct btrfs_fs_info *fs_info,
- struct btrfs_block_rsv *block_rsv,
- u64 num_bytes)
-{
- __btrfs_block_rsv_release(fs_info, block_rsv, num_bytes, NULL);
-}
-
/**
* btrfs_inode_rsv_release - release any excessive reservation.
* @inode - the inode we need to release from.