Skip to content

Commit 39f501d

Browse files
adam900710kdave
authored andcommitted
btrfs: always report error in run_one_delayed_ref()
Currently we have a btrfs_debug() for run_one_delayed_ref() failure, but if end users hit such problem, there will be no chance that btrfs_debug() is enabled. This can lead to very little useful info for debugging. This patch will: - Add extra info for error reporting Including: * logical bytenr * num_bytes * type * action * ref_mod - Replace the btrfs_debug() with btrfs_err() - Move the error reporting into run_one_delayed_ref() This is to avoid use-after-free, the @node can be freed in the caller. This error should only be triggered at most once. As if run_one_delayed_ref() failed, we trigger the error message, then causing the call chain to error out: btrfs_run_delayed_refs() `- btrfs_run_delayed_refs() `- btrfs_run_delayed_refs_for_head() `- run_one_delayed_ref() And we will abort the current transaction in btrfs_run_delayed_refs(). If we have to run delayed refs for the abort transaction, run_one_delayed_ref() will just cleanup the refs and do nothing, thus no new error messages would be output. Reviewed-by: Anand Jain <[email protected]> Signed-off-by: Qu Wenruo <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent d73a27b commit 39f501d

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

fs/btrfs/extent-tree.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,6 +1713,11 @@ static int run_one_delayed_ref(struct btrfs_trans_handle *trans,
17131713
BUG();
17141714
if (ret && insert_reserved)
17151715
btrfs_pin_extent(trans, node->bytenr, node->num_bytes, 1);
1716+
if (ret < 0)
1717+
btrfs_err(trans->fs_info,
1718+
"failed to run delayed ref for logical %llu num_bytes %llu type %u action %u ref_mod %d: %d",
1719+
node->bytenr, node->num_bytes, node->type,
1720+
node->action, node->ref_mod, ret);
17161721
return ret;
17171722
}
17181723

@@ -1954,8 +1959,6 @@ static int btrfs_run_delayed_refs_for_head(struct btrfs_trans_handle *trans,
19541959
if (ret) {
19551960
unselect_delayed_ref_head(delayed_refs, locked_ref);
19561961
btrfs_put_delayed_ref(ref);
1957-
btrfs_debug(fs_info, "run_one_delayed_ref returned %d",
1958-
ret);
19591962
return ret;
19601963
}
19611964

0 commit comments

Comments
 (0)