btrfs: drop unused parameter qgroup_reserved

Since commit 7775c8184ec0 ("btrfs: remove unused parameter from
btrfs_subvolume_release_metadata") parameter qgroup_reserved is not used
by caller of function btrfs_subvolume_reserve_metadata.  So remove it.

Signed-off-by: Gu JinXiang <gujx@cn.fujitsu.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 9a62bc59cc39d2452e517e8aeb97bab35dcf3f30..f4bf7874c24a4d63609a30a966d14f9db0a323e0 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2767,8 +2767,7 @@ void btrfs_free_reserved_data_space_noquota(struct inode *inode, u64 start,
 void btrfs_trans_release_chunk_metadata(struct btrfs_trans_handle *trans);
 int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
                                     struct btrfs_block_rsv *rsv,
-                                    int nitems,
-                                    u64 *qgroup_reserved, bool use_global_rsv);
+                                    int nitems, bool use_global_rsv);
 void btrfs_subvolume_release_metadata(struct btrfs_fs_info *fs_info,
                                      struct btrfs_block_rsv *rsv);
 void btrfs_delalloc_release_extents(struct btrfs_inode *inode, u64 num_bytes,

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 7ebb05fe2cd85f04c36c99b6fe2a35ac96e078ff..9a65df02a13f65ca421d6119b52afc6f3570000b 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5947,7 +5947,6 @@ void btrfs_trans_release_chunk_metadata(struct btrfs_trans_handle *trans)
 int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
                                     struct btrfs_block_rsv *rsv,
                                     int items,
-                                    u64 *qgroup_reserved,
                                     bool use_global_rsv)
 {
        u64 num_bytes;
@@ -5965,8 +5964,6 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
                num_bytes = 0;
        }
 
-       *qgroup_reserved = num_bytes;
-
        num_bytes = btrfs_calc_trans_metadata_size(fs_info, items);
        rsv->space_info = __find_space_info(fs_info,
                                            BTRFS_BLOCK_GROUP_METADATA);
@@ -5976,8 +5973,8 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
        if (ret == -ENOSPC && use_global_rsv)
                ret = btrfs_block_rsv_migrate(global_rsv, rsv, num_bytes, 1);
 
-       if (ret && *qgroup_reserved)
-               btrfs_qgroup_free_meta_prealloc(root, *qgroup_reserved);
+       if (ret && num_bytes)
+               btrfs_qgroup_free_meta_prealloc(root, num_bytes);
 
        return ret;
 }

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index c431ae05cbe4d1eb247923ecbeb80b58deb98351..7148abaf1da32a985e7ee3dbb12d1186249c7f98 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4293,7 +4293,6 @@ int btrfs_delete_subvolume(struct inode *dir, struct dentry *dentry)
        struct btrfs_trans_handle *trans;
        struct btrfs_block_rsv block_rsv;
        u64 root_flags;
-       u64 qgroup_reserved;
        int ret;
        int err;
 
@@ -4328,8 +4327,7 @@ int btrfs_delete_subvolume(struct inode *dir, struct dentry *dentry)
         * two for dir entries,
         * two for root ref/backref.
         */
-       err = btrfs_subvolume_reserve_metadata(root, &block_rsv,
-                                              5, &qgroup_reserved, true);
+       err = btrfs_subvolume_reserve_metadata(root, &block_rsv, 5, true);
        if (err)
                goto out_up_write;
 

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index a58ab372091ecb3fddc749b9e691cc060b675577..4db2446c70159e525babde91f0917f4d864a5b0b 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -569,7 +569,6 @@ static noinline int create_subvol(struct inode *dir,
        u64 objectid;
        u64 new_dirid = BTRFS_FIRST_FREE_OBJECTID;
        u64 index = 0;
-       u64 qgroup_reserved;
        uuid_le new_uuid;
 
        root_item = kzalloc(sizeof(*root_item), GFP_KERNEL);
@@ -594,8 +593,7 @@ static noinline int create_subvol(struct inode *dir,
         * The same as the snapshot creation, please see the comment
         * of create_snapshot().
         */
-       ret = btrfs_subvolume_reserve_metadata(root, &block_rsv,
-                                              8, &qgroup_reserved, false);
+       ret = btrfs_subvolume_reserve_metadata(root, &block_rsv, 8, false);
        if (ret)
                goto fail_free;
 
@@ -803,7 +801,6 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir,
         */
        ret = btrfs_subvolume_reserve_metadata(BTRFS_I(dir)->root,
                                        &pending_snapshot->block_rsv, 8,
-                                       &pending_snapshot->qgroup_reserved,
                                        false);
        if (ret)
                goto dec_and_free;