diff options
| author | Joel Becker <joel.becker@oracle.com> | 2008-03-04 16:09:39 -0800 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2008-04-18 08:56:07 -0700 |
| commit | 8f318311faf57481452895448e6ffaec7c38a146 (patch) | |
| tree | af367ab2dc2b155ebf8c642d17b5cead1fe637d7 /fs/ocfs2 | |
| parent | cf4d8d75d8aba537a19b313a9364fd08ddbd5622 (diff) | |
| download | linux-8f318311faf57481452895448e6ffaec7c38a146.tar.gz linux-8f318311faf57481452895448e6ffaec7c38a146.tar.bz2 linux-8f318311faf57481452895448e6ffaec7c38a146.zip | |
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>
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/ocfs2_lockid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/ocfs2_lockid.h b/fs/ocfs2/ocfs2_lockid.h index 86f3e3799c2b..82c200f7a8f1 100644 --- a/fs/ocfs2/ocfs2_lockid.h +++ b/fs/ocfs2/ocfs2_lockid.h @@ -100,7 +100,7 @@ static char *ocfs2_lock_type_strings[] = { static inline const char *ocfs2_lock_type_string(enum ocfs2_lock_type type) { #ifdef __KERNEL__ - mlog_bug_on_msg(type >= OCFS2_NUM_LOCK_TYPES, "%d\n", type); + BUG_ON(type >= OCFS2_NUM_LOCK_TYPES); #endif return ocfs2_lock_type_strings[type]; } |