* [PATCH] btrfs: fix lost error handling when replaying directory deletes
@ 2021-10-14 16:26 fdmanana
2021-10-14 17:23 ` Josef Bacik
2021-10-15 10:20 ` David Sterba
0 siblings, 2 replies; 3+ messages in thread
From: fdmanana @ 2021-10-14 16:26 UTC (permalink / raw)
To: linux-btrfs
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] btrfs: fix lost error handling when replaying directory deletes
2021-10-14 16:26 [PATCH] btrfs: fix lost error handling when replaying directory deletes fdmanana
@ 2021-10-14 17:23 ` Josef Bacik
2021-10-15 10:20 ` David Sterba
1 sibling, 0 replies; 3+ messages in thread
From: Josef Bacik @ 2021-10-14 17:23 UTC (permalink / raw)
To: fdmanana; +Cc: linux-btrfs
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] btrfs: fix lost error handling when replaying directory deletes
2021-10-14 16:26 [PATCH] btrfs: fix lost error handling when replaying directory deletes fdmanana
2021-10-14 17:23 ` Josef Bacik
@ 2021-10-15 10:20 ` David Sterba
1 sibling, 0 replies; 3+ messages in thread
From: David Sterba @ 2021-10-15 10:20 UTC (permalink / raw)
To: fdmanana; +Cc: linux-btrfs
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-15 10:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-14 16:26 [PATCH] btrfs: fix lost error handling when replaying directory deletes fdmanana
2021-10-14 17:23 ` Josef Bacik
2021-10-15 10:20 ` David Sterba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox