Commit ebc7c767 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba

btrfs: remove pointless code when creating and deleting a subvolume

When creating and deleting a subvolume, after starting a transaction we
are explicitly calling btrfs_record_root_in_trans() for the root which we
passed to btrfs_start_transaction(). This is pointless because at
transaction.c:start_transaction() we end up doing that call, regardless
of whether we actually start a new transaction or join an existing one,
and if we were not it would mean the root item of that root would not
be updated in the root tree when committing the transaction, leading to
problems easy to spot with fstests for example.

Remove these redundant calls. They were introduced with commit
74e97958 ("btrfs: qgroup: fix qgroup prealloc rsv leak in subvolume
operations").
Reviewed-by: default avatarBoris Burkov <boris@bur.io>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 6d81df75
...@@ -4552,11 +4552,6 @@ int btrfs_delete_subvolume(struct btrfs_inode *dir, struct dentry *dentry) ...@@ -4552,11 +4552,6 @@ int btrfs_delete_subvolume(struct btrfs_inode *dir, struct dentry *dentry)
ret = PTR_ERR(trans); ret = PTR_ERR(trans);
goto out_release; goto out_release;
} }
ret = btrfs_record_root_in_trans(trans, root);
if (ret) {
btrfs_abort_transaction(trans, ret);
goto out_end_trans;
}
btrfs_qgroup_convert_reserved_meta(root, qgroup_reserved); btrfs_qgroup_convert_reserved_meta(root, qgroup_reserved);
qgroup_reserved = 0; qgroup_reserved = 0;
trans->block_rsv = &block_rsv; trans->block_rsv = &block_rsv;
......
...@@ -658,9 +658,6 @@ static noinline int create_subvol(struct mnt_idmap *idmap, ...@@ -658,9 +658,6 @@ static noinline int create_subvol(struct mnt_idmap *idmap,
ret = PTR_ERR(trans); ret = PTR_ERR(trans);
goto out_release_rsv; goto out_release_rsv;
} }
ret = btrfs_record_root_in_trans(trans, BTRFS_I(dir)->root);
if (ret)
goto out;
btrfs_qgroup_convert_reserved_meta(root, qgroup_reserved); btrfs_qgroup_convert_reserved_meta(root, qgroup_reserved);
qgroup_reserved = 0; qgroup_reserved = 0;
trans->block_rsv = &block_rsv; trans->block_rsv = &block_rsv;
......
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