btrfs: Mark btrfs_assertfail() __noreturn

Fixes a bunch of warnings including:

  vmlinux.o: warning: objtool: select_reloc_root+0x314: unreachable instruction
  vmlinux.o: warning: objtool: finish_inode_if_needed+0x15b1: unreachable instruction
  vmlinux.o: warning: objtool: get_bio_sector_nr+0x259: unreachable instruction
  vmlinux.o: warning: objtool: raid_wait_read_end_io+0xc26: unreachable instruction
  vmlinux.o: warning: objtool: raid56_parity_alloc_scrub_rbio+0x37b: unreachable instruction
  ...

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/960bd9c0c9e3cfc409ba9c35a17644b11b832956.1681342859.git.jpoimboe@kernel.org

diff --git a/fs/btrfs/messages.c b/fs/btrfs/messages.c
index fde5aaa6e7c956b264724eefddd265de6753b4c6..310a05cf95ef3b8a1210bb2265bb34a40da353db 100644 (file)
--- a/fs/btrfs/messages.c
+++ b/fs/btrfs/messages.c
@@ -253,7 +253,7 @@ void __cold _btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt,
 #endif
 
 #ifdef CONFIG_BTRFS_ASSERT
-void __cold btrfs_assertfail(const char *expr, const char *file, int line)
+void __cold __noreturn btrfs_assertfail(const char *expr, const char *file, int line)
 {
        pr_err("assertion failed: %s, in %s:%d\n", expr, file, line);
        BUG();

diff --git a/fs/btrfs/messages.h b/fs/btrfs/messages.h
index 8c516ee58ff95b3b9bd81f085b24e3da0e21fc6a..ac2d1982ba3df826a2ac73a8a8e01bb902990441 100644 (file)
--- a/fs/btrfs/messages.h
+++ b/fs/btrfs/messages.h
@@ -160,7 +160,7 @@ do {                                                                \
 } while (0)
 
 #ifdef CONFIG_BTRFS_ASSERT
-void __cold btrfs_assertfail(const char *expr, const char *file, int line);
+void __cold __noreturn btrfs_assertfail(const char *expr, const char *file, int line);
 
 #define ASSERT(expr)                                           \
        (likely(expr) ? (void)0 : btrfs_assertfail(#expr, __FILE__, __LINE__))

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index ae0c94285124b4f95619632b1cbae291bfc64aba..ceb98489d71874ac4d0fd9af8c2bb51a8602b915 100644 (file)
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -204,6 +204,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func,
                "__ubsan_handle_builtin_unreachable",
                "arch_call_rest_init",
                "arch_cpu_idle_dead",
+               "btrfs_assertfail",
                "cpu_bringup_and_idle",
                "cpu_startup_entry",
                "do_exit",