ocfs2: Change mlog_bug_on to BUG_ON in ocfs2_lockid.h
The masklog code is in the o2cb stack, but ocfs2_lockid.h now needs to be included by the user stack. The BUG() in ocfs2_lock_type_string() does not need masklog support, so change it to a regular BUG_ON(). Signed-off-by: Joel Becker <joel.becker@oracle.com> Signed-off-by: Mark Fasheh <mfasheh@suse.com>
This commit is contained in:
parent
cf4d8d75d8
commit
8f318311fa
|
@ -100,7 +100,7 @@ static char *ocfs2_lock_type_strings[] = {
|
||||||
static inline const char *ocfs2_lock_type_string(enum ocfs2_lock_type type)
|
static inline const char *ocfs2_lock_type_string(enum ocfs2_lock_type type)
|
||||||
{
|
{
|
||||||
#ifdef __KERNEL__
|
#ifdef __KERNEL__
|
||||||
mlog_bug_on_msg(type >= OCFS2_NUM_LOCK_TYPES, "%d\n", type);
|
BUG_ON(type >= OCFS2_NUM_LOCK_TYPES);
|
||||||
#endif
|
#endif
|
||||||
return ocfs2_lock_type_strings[type];
|
return ocfs2_lock_type_strings[type];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue