objtool: Add bch2_trans_unlocked_or_in_restart_error() to bcachefs noreturns
PATCH 1/1 objtool: Add bch2_trans_unlocked_or_in_restart_error() to bcachefs noreturns
From: Youling Tang <[email protected]>
Fix the following objtool warning during build time:fs/bcachefs/btree_cache.o: warning: objtool: btree_node_lock.constprop.0() falls through to next function bch2_recalc_btree_reserve() fs/bcachefs/btree_update.o: warning: objtool: bch2_trans_update_get_key_cache() falls through to next function need_whiteout_for_snapshot()
bch2_trans_unlocked_or_in_restart_error() is an Obviously Correct (tm) panic() wrapper, add it to the list of known noreturns.
--- tools/objtool/noreturns.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/objtool/noreturns.h +1 -1
@@ -19,7 +19,7 @@ NORETURN(__x64_sys_exit_group) NORETURN(arch_cpu_idle_dead) NORETURN(bch2_trans_in_restart_error) NORETURN(bch2_trans_restart_error) -NORETURN(bch2_trans_unlocked_error) +NORETURN(bch2_trans_unlocked_or_in_restart_error) NORETURN(cpu_bringup_and_idle) NORETURN(cpu_startup_entry) NORETURN(do_exit)
Signature · 1 line
2.34.1
Quoted 6 lines · Youling Tang
From: Youling Tang <[email protected]>
Fix the following objtool warning during build time:
fs/bcachefs/btree_cache.o: warning: objtool: btree_node_lock.constprop.0() falls through to next functionbch2_recalc_btree_reserve()fs/bcachefs/btree_update.o: warning: objtool:bch2_trans_update_get_key_cache()falls through to next functionneed_whiteout_for_snapshot()
Quoted 6 lines
bch2_trans_unlocked_or_in_restart_error()is an Obviously Correct (tm)panic()wrapper, add it to the list of known noreturns.Fixes b318882022a8 ("bcachefs: bch2_trans_verify_not_unlocked_or_in_restart()")Reported-by k2ci<[email protected]>Signed-off-by Youling Tang <[email protected]>
Peter, can you take this one?
Signature · 1 line
Josh
Quoted 6 lines · Youling Tang
From: Youling Tang <[email protected]>
Fix the following objtool warning during build time:
fs/bcachefs/btree_cache.o: warning: objtool: btree_node_lock.constprop.0() falls through to next functionbch2_recalc_btree_reserve()fs/bcachefs/btree_update.o: warning: objtool:bch2_trans_update_get_key_cache()falls through to next functionneed_whiteout_for_snapshot()
Quoted 6 lines
bch2_trans_unlocked_or_in_restart_error()is an Obviously Correct (tm)panic()wrapper, add it to the list of known noreturns.Fixes b318882022a8 ("bcachefs: bch2_trans_verify_not_unlocked_or_in_restart()")Reported-by k2ci<[email protected]>Signed-off-by Youling Tang <[email protected]>
Quoted 20 lines
--- tools/objtool/noreturns.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/objtool/noreturns.h +1
-1@@ -19,7 +19,7 @@ NORETURN(__x64_sys_exit_group) NORETURN(arch_cpu_idle_dead) NORETURN(bch2_trans_in_restart_error) NORETURN(bch2_trans_restart_error) -NORETURN(bch2_trans_unlocked_error) +NORETURN(bch2_trans_unlocked_or_in_restart_error) NORETURN(cpu_bringup_and_idle) NORETURN(cpu_startup_entry) NORETURN(do_exit)Signature · 1 line
2.34.1
The following commit has been merged into the objtool/urgent branch of tip:
The following commit has been merged into the objtool/urgent branch of tip:
Commit-ID: b4ae43b053537ec28f430c0ddb9b916ab296dbe5 Gitweb: https://git.kernel.org/tip/b4ae43b053537ec28f430c0ddb9b916ab296dbe5 Author: Youling Tang <[email protected]> AuthorDate: Tue, 18 Feb 2025 14:42:30 +08:00 Committer: Josh Poimboeuf <[email protected]> CommitterDate: Tue, 25 Feb 2025 10:16:31 -08:00
objtool: Add bch2_trans_unlocked_or_in_restart_error() to bcachefs noreturns
Fix the following objtool warning during build time:
fs/bcachefs/btree_cache.o: warning: objtool: btree_node_lock.constprop.0() falls through to next function bch2_recalc_btree_reserve() fs/bcachefs/btree_update.o: warning: objtool: bch2_trans_update_get_key_cache() falls through to next function need_whiteout_for_snapshot()
bch2_trans_unlocked_or_in_restart_error() is an Obviously Correct (tm) panic() wrapper, add it to the list of known noreturns.
--- tools/objtool/noreturns.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/objtool/noreturns.h +1 -1
@@ -19,7 +19,7 @@ NORETURN(__x64_sys_exit_group) NORETURN(arch_cpu_idle_dead) NORETURN(bch2_trans_in_restart_error) NORETURN(bch2_trans_restart_error) -NORETURN(bch2_trans_unlocked_error) +NORETURN(bch2_trans_unlocked_or_in_restart_error) NORETURN(cpu_bringup_and_idle) NORETURN(cpu_startup_entry) NORETURN(do_exit)