btrfs: unexport btrfs_qgroup_reserve_meta()

There's only one caller outside qgroup.c of btrfs_qgroup_reserve_meta()
and we have btrfs_qgroup_reserve_meta_prealloc() is a wrapper around
that function. Make that caller use btrfs_qgroup_reserve_meta_prealloc()
and unexport btrfs_qgroup_reserve_meta(), simplifying the external API.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 56ff8afe9a2238c0fa4eedd2db140701bee8fe58..09795439b9fb6b17539bc72bf20472d7637d87bf 100644 (file)
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -596,8 +596,7 @@ static int btrfs_delayed_inode_reserve_metadata(
         */
        if (!src_rsv || (!trans->bytes_reserved &&
                         src_rsv->type != BTRFS_BLOCK_RSV_DELALLOC)) {
-               ret = btrfs_qgroup_reserve_meta(root, num_bytes,
-                                         BTRFS_QGROUP_RSV_META_PREALLOC, true);
+               ret = btrfs_qgroup_reserve_meta_prealloc(root, num_bytes, true, true);
                if (ret < 0)
                        return ret;
                ret = btrfs_block_rsv_add(fs_info, dst_rsv, num_bytes,

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 702338580601f344713b8b9d49a541c9265e55e7..0bf3ebc1ffb751886b7b5bfc03a3baa5415fcbf3 100644 (file)
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -4489,8 +4489,8 @@ static int sub_root_meta_rsv(struct btrfs_root *root, int num_bytes,
        return num_bytes;
 }
 
-int btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes,
-                             enum btrfs_qgroup_rsv_type type, bool enforce)
+static int btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes,
+                                    enum btrfs_qgroup_rsv_type type, bool enforce)
 {
        struct btrfs_fs_info *fs_info = root->fs_info;
        int ret;

diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h
index 1c568fc9544e481f3efe88abb1027a7d53694aee..80dd2dacd56db4df819f1f518648d3451c9b7363 100644 (file)
--- a/fs/btrfs/qgroup.h
+++ b/fs/btrfs/qgroup.h
@@ -392,8 +392,6 @@ int btrfs_qgroup_release_data(struct btrfs_inode *inode, u64 start, u64 len, u64
 int btrfs_qgroup_free_data(struct btrfs_inode *inode,
                           struct extent_changeset *reserved, u64 start,
                           u64 len, u64 *freed);
-int btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes,
-                             enum btrfs_qgroup_rsv_type type, bool enforce);
 int btrfs_qgroup_reserve_meta_prealloc(struct btrfs_root *root, int num_bytes,
                                       bool enforce, bool noflush);
 /* Pre-allocated meta reservation can be freed at need */