|
@@ -487,8 +487,7 @@ static noinline int create_subvol(struct inode *dir,
|
|
|
trans = btrfs_start_transaction(root, 0);
|
|
|
if (IS_ERR(trans)) {
|
|
|
ret = PTR_ERR(trans);
|
|
|
- btrfs_subvolume_release_metadata(fs_info, &block_rsv,
|
|
|
- qgroup_reserved);
|
|
|
+ btrfs_subvolume_release_metadata(fs_info, &block_rsv);
|
|
|
goto fail_free;
|
|
|
}
|
|
|
trans->block_rsv = &block_rsv;
|
|
@@ -613,7 +612,7 @@ fail:
|
|
|
kfree(root_item);
|
|
|
trans->block_rsv = NULL;
|
|
|
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) {
|
|
|
*async_transid = trans->transid;
|
|
@@ -753,9 +752,7 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir,
|
|
|
d_instantiate(dentry, inode);
|
|
|
ret = 0;
|
|
|
fail:
|
|
|
- btrfs_subvolume_release_metadata(fs_info,
|
|
|
- &pending_snapshot->block_rsv,
|
|
|
- pending_snapshot->qgroup_reserved);
|
|
|
+ btrfs_subvolume_release_metadata(fs_info, &pending_snapshot->block_rsv);
|
|
|
dec_and_free:
|
|
|
if (atomic_dec_and_test(&root->will_be_snapshoted))
|
|
|
wake_up_atomic_t(&root->will_be_snapshoted);
|
|
@@ -2555,7 +2552,7 @@ out_end_trans:
|
|
|
err = ret;
|
|
|
inode->i_flags |= S_DEAD;
|
|
|
out_release:
|
|
|
- btrfs_subvolume_release_metadata(fs_info, &block_rsv, qgroup_reserved);
|
|
|
+ btrfs_subvolume_release_metadata(fs_info, &block_rsv);
|
|
|
out_up_write:
|
|
|
up_write(&fs_info->subvol_sem);
|
|
|
if (err) {
|