Revert "btrfs: clean up our handling of refs == 0 in snapshot delete"
This reverts commit c6dfc73da3
.
This commit is contained in:
parent
f8bda51205
commit
9dfd5971af
1 changed files with 5 additions and 23 deletions
|
@ -4806,15 +4806,7 @@ static noinline void reada_walk_down(struct btrfs_trans_handle *trans,
|
|||
/* We don't care about errors in readahead. */
|
||||
if (ret < 0)
|
||||
continue;
|
||||
|
||||
/*
|
||||
* This could be racey, it's conceivable that we raced and end
|
||||
* up with a bogus refs count, if that's the case just skip, if
|
||||
* we are actually corrupt we will notice when we look up
|
||||
* everything again with our locks.
|
||||
*/
|
||||
if (refs == 0)
|
||||
continue;
|
||||
BUG_ON(refs == 0);
|
||||
|
||||
if (wc->stage == DROP_REFERENCE) {
|
||||
if (refs == 1)
|
||||
|
@ -4881,11 +4873,7 @@ static noinline int walk_down_proc(struct btrfs_trans_handle *trans,
|
|||
BUG_ON(ret == -ENOMEM);
|
||||
if (ret)
|
||||
return ret;
|
||||
if (unlikely(wc->refs[level] == 0)) {
|
||||
btrfs_err(fs_info, "bytenr %llu has 0 references, expect > 0",
|
||||
eb->start);
|
||||
return -EUCLEAN;
|
||||
}
|
||||
BUG_ON(wc->refs[level] == 0);
|
||||
}
|
||||
|
||||
if (wc->stage == DROP_REFERENCE) {
|
||||
|
@ -5018,9 +5006,8 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
|
|||
goto out_unlock;
|
||||
|
||||
if (unlikely(wc->refs[level - 1] == 0)) {
|
||||
btrfs_err(fs_info, "bytenr %llu has 0 references, expect > 0",
|
||||
bytenr);
|
||||
ret = -EUCLEAN;
|
||||
btrfs_err(fs_info, "Missing references.");
|
||||
ret = -EIO;
|
||||
goto out_unlock;
|
||||
}
|
||||
*lookup_info = 0;
|
||||
|
@ -5222,12 +5209,7 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,
|
|||
path->locks[level] = 0;
|
||||
return ret;
|
||||
}
|
||||
if (unlikely(wc->refs[level] == 0)) {
|
||||
btrfs_tree_unlock_rw(eb, path->locks[level]);
|
||||
btrfs_err(fs_info, "bytenr %llu has 0 references, expect > 0",
|
||||
eb->start);
|
||||
return -EUCLEAN;
|
||||
}
|
||||
BUG_ON(wc->refs[level] == 0);
|
||||
if (wc->refs[level] == 1) {
|
||||
btrfs_tree_unlock_rw(eb, path->locks[level]);
|
||||
path->locks[level] = 0;
|
||||
|
|
Loading…
Reference in a new issue