btrfs: abort transaction after failed inode updates in create_subvol
We can just abort the transaction here, and in fact do that for every other failure in this function except these two cases. CC: stable@vger.kernel.org # 4.4+ Reviewed-by: Filipe Manana <fdmanana@suse.com> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Josef Bacik <josef@toxicpanda.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Родитель
147271e35b
Коммит
c7e54b5102
|
@ -704,11 +704,17 @@ static noinline int create_subvol(struct inode *dir,
|
||||||
|
|
||||||
btrfs_i_size_write(BTRFS_I(dir), dir->i_size + namelen * 2);
|
btrfs_i_size_write(BTRFS_I(dir), dir->i_size + namelen * 2);
|
||||||
ret = btrfs_update_inode(trans, root, dir);
|
ret = btrfs_update_inode(trans, root, dir);
|
||||||
BUG_ON(ret);
|
if (ret) {
|
||||||
|
btrfs_abort_transaction(trans, ret);
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
ret = btrfs_add_root_ref(trans, objectid, root->root_key.objectid,
|
ret = btrfs_add_root_ref(trans, objectid, root->root_key.objectid,
|
||||||
btrfs_ino(BTRFS_I(dir)), index, name, namelen);
|
btrfs_ino(BTRFS_I(dir)), index, name, namelen);
|
||||||
BUG_ON(ret);
|
if (ret) {
|
||||||
|
btrfs_abort_transaction(trans, ret);
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
ret = btrfs_uuid_tree_add(trans, root_item->uuid,
|
ret = btrfs_uuid_tree_add(trans, root_item->uuid,
|
||||||
BTRFS_UUID_KEY_SUBVOL, objectid);
|
BTRFS_UUID_KEY_SUBVOL, objectid);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче