nfsd4.1: fix session memory use calculation

[safe/jmp/linux-2.6] / fs / ocfs2 / ocfs2_lockid.h

diff --git a/fs/ocfs2/ocfs2_lockid.h b/fs/ocfs2/ocfs2_lockid.h
index 4ca02b1..d277aab 100644 (file)
--- a/fs/ocfs2/ocfs2_lockid.h
+++ b/fs/ocfs2/ocfs2_lockid.h
@@ -45,6 +45,11 @@ enum ocfs2_lock_type {
        OCFS2_LOCK_TYPE_RW,
        OCFS2_LOCK_TYPE_DENTRY,
        OCFS2_LOCK_TYPE_OPEN,
+       OCFS2_LOCK_TYPE_FLOCK,
+       OCFS2_LOCK_TYPE_QINFO,
+       OCFS2_LOCK_TYPE_NFS_SYNC,
+       OCFS2_LOCK_TYPE_ORPHAN_SCAN,
+       OCFS2_LOCK_TYPE_REFCOUNT,
        OCFS2_NUM_LOCK_TYPES
 };
 
@@ -73,6 +78,21 @@ static inline char ocfs2_lock_type_char(enum ocfs2_lock_type type)
                case OCFS2_LOCK_TYPE_OPEN:
                        c = 'O';
                        break;
+               case OCFS2_LOCK_TYPE_FLOCK:
+                       c = 'F';
+                       break;
+               case OCFS2_LOCK_TYPE_QINFO:
+                       c = 'Q';
+                       break;
+               case OCFS2_LOCK_TYPE_NFS_SYNC:
+                       c = 'Y';
+                       break;
+               case OCFS2_LOCK_TYPE_ORPHAN_SCAN:
+                       c = 'P';
+                       break;
+               case OCFS2_LOCK_TYPE_REFCOUNT:
+                       c = 'T';
+                       break;
                default:
                        c = '\0';
        }
@@ -90,12 +110,17 @@ static char *ocfs2_lock_type_strings[] = {
        [OCFS2_LOCK_TYPE_RW] = "Write/Read",
        [OCFS2_LOCK_TYPE_DENTRY] = "Dentry",
        [OCFS2_LOCK_TYPE_OPEN] = "Open",
+       [OCFS2_LOCK_TYPE_FLOCK] = "Flock",
+       [OCFS2_LOCK_TYPE_QINFO] = "Quota",
+       [OCFS2_LOCK_TYPE_NFS_SYNC] = "NFSSync",
+       [OCFS2_LOCK_TYPE_ORPHAN_SCAN] = "OrphanScan",
+       [OCFS2_LOCK_TYPE_REFCOUNT] = "Refcount",
 };
 
 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];
 }