[PATCH] btrfs: fix lost error handling when replaying directory deletes

[PATCH] btrfs: fix lost error handling when replaying directory deletes

[fdmanana]

From: Filipe Manana <fdmanana@suse.com>

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).

Signed-off-by: Filipe Manana <fdmanana@suse.com>
---
 fs/btrfs/tree-log.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 71b3ddb0333d..711394d1138c 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -2528,7 +2528,9 @@ static noinline int replay_dir_deletes(struct btrfs_trans_handle *trans,
 		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;
 		}
 
-- 
2.33.0

Re: [PATCH] btrfs: fix lost error handling when replaying directory deletes

[Josef Bacik]

On Thu, Oct 14, 2021 at 05:26:04PM +0100, fdmanana@kernel.org wrote:
> From: Filipe Manana <fdmanana@suse.com>
> 
> 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).
> 
> Signed-off-by: Filipe Manana <fdmanana@suse.com>

Reviewed-by: Josef Bacik <josef@toxicpanda.com>

Thanks,

Josef

Re: [PATCH] btrfs: fix lost error handling when replaying directory deletes

[David Sterba]

On Thu, Oct 14, 2021 at 05:26:04PM +0100, fdmanana@kernel.org wrote:
> From: Filipe Manana <fdmanana@suse.com>
> 
> 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).
> 
> Signed-off-by: Filipe Manana <fdmanana@suse.com>

Added to misc-next, thanks.