lkml.org 
[lkml]   [2008]   [Mar]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/10] ocfs2: Change mlog_bug_on to BUG_ON in ocfs2_lockid.h
    Date
    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>
    ---
    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 86f3e37..82c200f 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];
    }
    --
    1.5.3.8


    \
     
     \ /
      Last update: 2008-03-06 02:19    [W:0.022 / U:33.232 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site