Skip to content

Commit fdb4a70

Browse files
adam900710gregkh
authored andcommitted
btrfs: always report error in run_one_delayed_ref()
[ Upstream commit 39f501d ] 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 <anand.jain@oracle.com> Signed-off-by: Qu Wenruo <wqu@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent f641067 commit fdb4a70

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

fs/btrfs/extent-tree.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1717,6 +1717,11 @@ static int run_one_delayed_ref(struct btrfs_trans_handle *trans,
17171717
BUG();
17181718
if (ret && insert_reserved)
17191719
btrfs_pin_extent(trans, node->bytenr, node->num_bytes, 1);
1720+
if (ret < 0)
1721+
btrfs_err(trans->fs_info,
1722+
"failed to run delayed ref for logical %llu num_bytes %llu type %u action %u ref_mod %d: %d",
1723+
node->bytenr, node->num_bytes, node->type,
1724+
node->action, node->ref_mod, ret);
17201725
return ret;
17211726
}
17221727

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

0 commit comments

Comments
 (0)