diff options
| author | Nikolay Borisov <nborisov@suse.com> | 2017-10-23 09:58:46 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-11-15 14:44:44 +0100 |
| commit | 5e9f2ad5b2904a7e81df6d9a3dbef29478952eac (patch) | |
| tree | 627c60136505f4104a5fc306de2d82f4ad323134 | |
| parent | f82b735936ffd58b6711cf1f1054616517d8ffcd (diff) | |
| download | linux-5e9f2ad5b2904a7e81df6d9a3dbef29478952eac.tar.gz linux-5e9f2ad5b2904a7e81df6d9a3dbef29478952eac.tar.bz2 linux-5e9f2ad5b2904a7e81df6d9a3dbef29478952eac.zip | |
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>
| -rw-r--r-- | fs/btrfs/volumes.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index f1ecb938ba4d..84d37b4ab230 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1750,20 +1750,24 @@ static int btrfs_rm_dev_item(struct btrfs_fs_info *fs_info, key.offset = device->devid; ret = btrfs_search_slot(trans, root, &key, path, -1, 1); - if (ret < 0) - goto out; - - if (ret > 0) { - ret = -ENOENT; + if (ret) { + if (ret > 0) + ret = -ENOENT; + btrfs_abort_transaction(trans, ret); + btrfs_end_transaction(trans); goto out; } ret = btrfs_del_item(trans, root, path); - if (ret) - goto out; + if (ret) { + btrfs_abort_transaction(trans, ret); + btrfs_end_transaction(trans); + } + out: btrfs_free_path(path); - btrfs_commit_transaction(trans); + if (!ret) + ret = btrfs_commit_transaction(trans); return ret; } |