Commit 10adb115 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba

btrfs: fix lost error handling when replaying directory deletes

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: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent f4f39fc5
...@@ -2528,7 +2528,9 @@ static noinline int replay_dir_deletes(struct btrfs_trans_handle *trans, ...@@ -2528,7 +2528,9 @@ static noinline int replay_dir_deletes(struct btrfs_trans_handle *trans,
else { else {
ret = find_dir_range(log, path, dirid, key_type, ret = find_dir_range(log, path, dirid, key_type,
&range_start, &range_end); &range_start, &range_end);
if (ret != 0) if (ret < 0)
goto out;
else if (ret > 0)
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment