Skip to content

Commit 7775c81

Browse files
committed
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: Liu Bo <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 66cb7dd commit 7775c81

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

fs/btrfs/ctree.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2703,8 +2703,7 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
27032703
int nitems,
27042704
u64 *qgroup_reserved, bool use_global_rsv);
27052705
void btrfs_subvolume_release_metadata(struct btrfs_fs_info *fs_info,
2706-
struct btrfs_block_rsv *rsv,
2707-
u64 qgroup_reserved);
2706+
struct btrfs_block_rsv *rsv);
27082707
int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes);
27092708
void btrfs_delalloc_release_metadata(struct inode *inode, u64 num_bytes);
27102709
int btrfs_delalloc_reserve_space(struct inode *inode, u64 start, u64 len);

fs/btrfs/extent-tree.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5826,8 +5826,7 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
58265826
}
58275827

58285828
void btrfs_subvolume_release_metadata(struct btrfs_fs_info *fs_info,
5829-
struct btrfs_block_rsv *rsv,
5830-
u64 qgroup_reserved)
5829+
struct btrfs_block_rsv *rsv)
58315830
{
58325831
btrfs_block_rsv_release(fs_info, rsv, (u64)-1);
58335832
}

fs/btrfs/ioctl.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -487,8 +487,7 @@ static noinline int create_subvol(struct inode *dir,
487487
trans = btrfs_start_transaction(root, 0);
488488
if (IS_ERR(trans)) {
489489
ret = PTR_ERR(trans);
490-
btrfs_subvolume_release_metadata(fs_info, &block_rsv,
491-
qgroup_reserved);
490+
btrfs_subvolume_release_metadata(fs_info, &block_rsv);
492491
goto fail_free;
493492
}
494493
trans->block_rsv = &block_rsv;
@@ -613,7 +612,7 @@ static noinline int create_subvol(struct inode *dir,
613612
kfree(root_item);
614613
trans->block_rsv = NULL;
615614
trans->bytes_reserved = 0;
616-
btrfs_subvolume_release_metadata(fs_info, &block_rsv, qgroup_reserved);
615+
btrfs_subvolume_release_metadata(fs_info, &block_rsv);
617616

618617
if (async_transid) {
619618
*async_transid = trans->transid;
@@ -753,9 +752,7 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir,
753752
d_instantiate(dentry, inode);
754753
ret = 0;
755754
fail:
756-
btrfs_subvolume_release_metadata(fs_info,
757-
&pending_snapshot->block_rsv,
758-
pending_snapshot->qgroup_reserved);
755+
btrfs_subvolume_release_metadata(fs_info, &pending_snapshot->block_rsv);
759756
dec_and_free:
760757
if (atomic_dec_and_test(&root->will_be_snapshoted))
761758
wake_up_atomic_t(&root->will_be_snapshoted);
@@ -2555,7 +2552,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,
25552552
err = ret;
25562553
inode->i_flags |= S_DEAD;
25572554
out_release:
2558-
btrfs_subvolume_release_metadata(fs_info, &block_rsv, qgroup_reserved);
2555+
btrfs_subvolume_release_metadata(fs_info, &block_rsv);
25592556
out_up_write:
25602557
up_write(&fs_info->subvol_sem);
25612558
if (err) {

0 commit comments

Comments
 (0)