Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f318311 authored by Joel Becker's avatar Joel Becker Committed by Mark Fasheh
Browse files

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: default avatarJoel Becker <joel.becker@oracle.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent cf4d8d75

fs/ocfs2/ocfs2_lockid.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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];

}

}