openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

btrfs: Fix transaction abort during failure in btrfs_rm_dev_item 

btrfs_rm_dev_item calls several function under an active transaction,
however it fails to abort it if an error happens. Fix this by adding
explicit btrfs_abort_transaction/btrfs_end_transaction calls.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Nikolay Borisov 2017-10-23 09:58:46 +03:00 committed by David Sterba
parent f82b735936
commit 5e9f2ad5b2
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/btrfs/volumes.c
View File

@ -1750,20 +1750,24 @@ static int btrfs_rm_dev_item(struct btrfs_fs_info *fs_info,
key.offset = device->devid; key.offset = device->devid;
ret = btrfs_search_slot(trans, root, &key, path, -1, 1); ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
if (ret < 0) if (ret) {
goto out; if (ret > 0)
ret = -ENOENT;
if (ret > 0) { btrfs_abort_transaction(trans, ret);
ret = -ENOENT; btrfs_end_transaction(trans);
goto out; goto out;
} }
ret = btrfs_del_item(trans, root, path); ret = btrfs_del_item(trans, root, path);
if (ret) if (ret) {
goto out; btrfs_abort_transaction(trans, ret);
btrfs_end_transaction(trans);
}
out: out:
btrfs_free_path(path); btrfs_free_path(path);
btrfs_commit_transaction(trans); if (!ret)
ret = btrfs_commit_transaction(trans);
return ret; return ret;
} }