FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-12 10:55:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

btrfs: separate definition of assertion failure handlers

Browse Source 
There's a report where objtool detects unreachable instructions, eg.:

  fs/btrfs/ctree.o: warning: objtool: btrfs_search_slot()+0x2d4: unreachable instruction

This seems to be a false positive due to compiler version. The cause is
in the ASSERT macro implementation that does the conditional check as
IS_DEFINED(CONFIG_BTRFS_ASSERT) and not an #ifdef.

To avoid that, use the ifdefs directly.

There are still 2 reports that aren't fixed:

  fs/btrfs/extent_io.o: warning: objtool: __set_extent_bit()+0x71f: unreachable instruction
  fs/btrfs/relocation.o: warning: objtool: find_data_references()+0x4e0: unreachable instruction

Co-developed-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2019-12-16 20:00:48 +01:00
parent a69976bc69
commit 68c467cbb2
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/btrfs/ctree.h
View File

@ -3157,17 +3157,21 @@ do { \
rcu_read_unlock(); \ rcu_read_unlock(); \
} while (0) } while (0)
__cold #ifdef CONFIG_BTRFS_ASSERT
static inline void assfail(const char *expr, const char *file, int line) __cold __noreturn
static inline void assertfail(const char *expr, const char *file, int line)
{ {
if (IS_ENABLED(CONFIG_BTRFS_ASSERT)) { pr_err("assertion failed: %s, in %s:%d\n", expr, file, line);
pr_err("assertion failed: %s, in %s:%d\n", expr, file, line); BUG();
BUG();
}
} }
#define ASSERT(expr) \ #define ASSERT(expr) \
(likely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__)) (likely(expr) ? (void)0 : assertfail(#expr, __FILE__, __LINE__))
#else
static inline void assertfail(const char *expr, const char* file, int line) { }
#define ASSERT(expr) (void)(expr)
#endif
/* /*
* Use that for functions that are conditionally exported for sanity tests but * Use that for functions that are conditionally exported for sanity tests but