|
@@ -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)
|
|
|
|
- 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;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
|
|
ret = btrfs_del_item(trans, root, path);
|
|
ret = btrfs_del_item(trans, root, path);
|
|
- if (ret)
|
|
|
|
- goto out;
|
|
|
|
|
|
+ if (ret) {
|
|
|
|
+ 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;
|
|
}
|
|
}
|
|
|
|
|