summaryrefslogtreecommitdiff
path: root/fs/dlm
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2020-05-08 00:34:28 +0300
committerDavid Teigland <teigland@redhat.com>2020-05-12 22:06:18 +0300
commitfe204591cc9480347af7d2d6029b24a62e449486 (patch)
treead4dcec100a1b6c2de25ba9dc9d21f5ebce9440d /fs/dlm
parentf084a4f4a14b97d2ad6e4bd6406933b2d39e6eca (diff)
downloadlinux-fe204591cc9480347af7d2d6029b24a62e449486.tar.xz
dlm: remove BUG() before panic()
Building a kernel with clang sometimes fails with an objtool error in dlm: fs/dlm/lock.o: warning: objtool: revert_lock_pc()+0xbd: can't find jump dest instruction at .text+0xd7fc The problem is that BUG() never returns and the compiler knows that anything after it is unreachable, however the panic still emits some code that does not get fully eliminated. Having both BUG() and panic() is really pointless as the BUG() kills the current process and the subsequent panic() never hits. In most cases, we probably don't really want either and should replace the DLM_ASSERT() statements with WARN_ON(), as has been done for some of them. Remove the BUG() here so the user at least sees the panic message and we can reliably build randconfig kernels. Fixes: e7fd41792fc0 ("[DLM] The core of the DLM for GFS2/CLVM") Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: clang-built-linux@googlegroups.com Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm')
-rw-r--r--fs/dlm/dlm_internal.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h
index d231ae5d2c65..04fe9f525ac7 100644
--- a/fs/dlm/dlm_internal.h
+++ b/fs/dlm/dlm_internal.h
@@ -97,7 +97,6 @@ do { \
__LINE__, __FILE__, #x, jiffies); \
{do} \
printk("\n"); \
- BUG(); \
panic("DLM: Record message above and reboot.\n"); \
} \
}