diff options
| author | Filipe Manana <fdmanana@suse.com> | 2022-08-22 15:47:09 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2022-08-23 22:15:21 +0200 |
| commit | 47bf225a8d2cccb15f7e8d4a1ed9b757dd86afd7 (patch) | |
| tree | 6871a9c89880e6f50bd43ea87d9b7ac566d4da10 /fs | |
| parent | ced8ecf026fd8084cf175530ff85c76d6085d715 (diff) | |
| download | linux-stable-47bf225a8d2cccb15f7e8d4a1ed9b757dd86afd7.tar.gz linux-stable-47bf225a8d2cccb15f7e8d4a1ed9b757dd86afd7.tar.bz2 linux-stable-47bf225a8d2cccb15f7e8d4a1ed9b757dd86afd7.zip | |
btrfs: fix silent failure when deleting root reference
At btrfs_del_root_ref(), if btrfs_search_slot() returns an error, we end
up returning from the function with a value of 0 (success). This happens
because the function returns the value stored in the variable 'err',
which is 0, while the error value we got from btrfs_search_slot() is
stored in the 'ret' variable.
So fix it by setting 'err' with the error value.
Fixes: 8289ed9f93bef2 ("btrfs: replace the BUG_ON in btrfs_del_root_ref with proper error handling")
CC: stable@vger.kernel.org # 5.16+
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/root-tree.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c index a64b26b16904..d647cb2938c0 100644 --- a/fs/btrfs/root-tree.c +++ b/fs/btrfs/root-tree.c @@ -349,9 +349,10 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id, key.offset = ref_id; again: ret = btrfs_search_slot(trans, tree_root, &key, path, -1, 1); - if (ret < 0) + if (ret < 0) { + err = ret; goto out; - if (ret == 0) { + } else if (ret == 0) { leaf = path->nodes[0]; ref = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_root_ref); |