| From 10adb1152d957a4d570ad630f93a88bb961616c1 Mon Sep 17 00:00:00 2001 |
| From: Filipe Manana <fdmanana@suse.com> |
| Date: Thu, 14 Oct 2021 17:26:04 +0100 |
| Subject: btrfs: fix lost error handling when replaying directory deletes |
| |
| From: Filipe Manana <fdmanana@suse.com> |
| |
| commit 10adb1152d957a4d570ad630f93a88bb961616c1 upstream. |
| |
| At replay_dir_deletes(), if find_dir_range() returns an error we break out |
| of the main while loop and then assign a value of 0 (success) to the 'ret' |
| variable, resulting in completely ignoring that an error happened. Fix |
| that by jumping to the 'out' label when find_dir_range() returns an error |
| (negative value). |
| |
| CC: stable@vger.kernel.org # 4.4+ |
| Reviewed-by: Josef Bacik <josef@toxicpanda.com> |
| Signed-off-by: Filipe Manana <fdmanana@suse.com> |
| Signed-off-by: David Sterba <dsterba@suse.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| fs/btrfs/tree-log.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/fs/btrfs/tree-log.c |
| +++ b/fs/btrfs/tree-log.c |
| @@ -2490,7 +2490,9 @@ again: |
| else { |
| ret = find_dir_range(log, path, dirid, key_type, |
| &range_start, &range_end); |
| - if (ret != 0) |
| + if (ret < 0) |
| + goto out; |
| + else if (ret > 0) |
| break; |
| } |
| |
