Commit 7775c818 authored by David Sterba's avatar David Sterba

btrfs: remove unused parameter from btrfs_subvolume_release_metadata

Unused since qgroup refactoring that split data and metadata accounting,
the btrfs_qgroup_free helper.
Reviewed-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 66cb7ddb
...@@ -2703,8 +2703,7 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root, ...@@ -2703,8 +2703,7 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
int nitems, int nitems,
u64 *qgroup_reserved, bool use_global_rsv); u64 *qgroup_reserved, bool use_global_rsv);
void btrfs_subvolume_release_metadata(struct btrfs_fs_info *fs_info, void btrfs_subvolume_release_metadata(struct btrfs_fs_info *fs_info,
struct btrfs_block_rsv *rsv, struct btrfs_block_rsv *rsv);
u64 qgroup_reserved);
int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes); int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes);
void btrfs_delalloc_release_metadata(struct inode *inode, u64 num_bytes); void btrfs_delalloc_release_metadata(struct inode *inode, u64 num_bytes);
int btrfs_delalloc_reserve_space(struct inode *inode, u64 start, u64 len); int btrfs_delalloc_reserve_space(struct inode *inode, u64 start, u64 len);
......
...@@ -5826,8 +5826,7 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root, ...@@ -5826,8 +5826,7 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
} }
void btrfs_subvolume_release_metadata(struct btrfs_fs_info *fs_info, void btrfs_subvolume_release_metadata(struct btrfs_fs_info *fs_info,
struct btrfs_block_rsv *rsv, struct btrfs_block_rsv *rsv)
u64 qgroup_reserved)
{ {
btrfs_block_rsv_release(fs_info, rsv, (u64)-1); btrfs_block_rsv_release(fs_info, rsv, (u64)-1);
} }
......
...@@ -487,8 +487,7 @@ static noinline int create_subvol(struct inode *dir, ...@@ -487,8 +487,7 @@ static noinline int create_subvol(struct inode *dir,
trans = btrfs_start_transaction(root, 0); trans = btrfs_start_transaction(root, 0);
if (IS_ERR(trans)) { if (IS_ERR(trans)) {
ret = PTR_ERR(trans); ret = PTR_ERR(trans);
btrfs_subvolume_release_metadata(fs_info, &block_rsv, btrfs_subvolume_release_metadata(fs_info, &block_rsv);
qgroup_reserved);
goto fail_free; goto fail_free;
} }
trans->block_rsv = &block_rsv; trans->block_rsv = &block_rsv;
...@@ -613,7 +612,7 @@ static noinline int create_subvol(struct inode *dir, ...@@ -613,7 +612,7 @@ static noinline int create_subvol(struct inode *dir,
kfree(root_item); kfree(root_item);
trans->block_rsv = NULL; trans->block_rsv = NULL;
trans->bytes_reserved = 0; trans->bytes_reserved = 0;
btrfs_subvolume_release_metadata(fs_info, &block_rsv, qgroup_reserved); btrfs_subvolume_release_metadata(fs_info, &block_rsv);
if (async_transid) { if (async_transid) {
*async_transid = trans->transid; *async_transid = trans->transid;
...@@ -753,9 +752,7 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir, ...@@ -753,9 +752,7 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir,
d_instantiate(dentry, inode); d_instantiate(dentry, inode);
ret = 0; ret = 0;
fail: fail:
btrfs_subvolume_release_metadata(fs_info, btrfs_subvolume_release_metadata(fs_info, &pending_snapshot->block_rsv);
&pending_snapshot->block_rsv,
pending_snapshot->qgroup_reserved);
dec_and_free: dec_and_free:
if (atomic_dec_and_test(&root->will_be_snapshoted)) if (atomic_dec_and_test(&root->will_be_snapshoted))
wake_up_atomic_t(&root->will_be_snapshoted); wake_up_atomic_t(&root->will_be_snapshoted);
...@@ -2555,7 +2552,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file, ...@@ -2555,7 +2552,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,
err = ret; err = ret;
inode->i_flags |= S_DEAD; inode->i_flags |= S_DEAD;
out_release: out_release:
btrfs_subvolume_release_metadata(fs_info, &block_rsv, qgroup_reserved); btrfs_subvolume_release_metadata(fs_info, &block_rsv);
out_up_write: out_up_write:
up_write(&fs_info->subvol_sem); up_write(&fs_info->subvol_sem);
if (err) { if (err) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment