Commit 5e9f2ad5 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba

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: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent f82b7359
...@@ -1750,20 +1750,24 @@ static int btrfs_rm_dev_item(struct btrfs_fs_info *fs_info, ...@@ -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;
} }
......
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