mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 22:25:03 +00:00
btrfs: fix lost error handling when replaying directory deletes
commit 10adb1152d
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>
This commit is contained in:
parent
c25984fa18
commit
5223324ed1
1 changed files with 3 additions and 1 deletions
|
@ -2490,7 +2490,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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue