Merge commit 'origin/master' into next

[pandora-kernel.git] / fs / ocfs2 / ocfs2_lockid.h

diff --git a/fs/ocfs2/ocfs2_lockid.h b/fs/ocfs2/ocfs2_lockid.h
index 82c200f..fcdba09 100644 (file)
--- a/fs/ocfs2/ocfs2_lockid.h
+++ b/fs/ocfs2/ocfs2_lockid.h
@@ -46,6 +46,9 @@ enum ocfs2_lock_type {
        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_NUM_LOCK_TYPES
 };
 
@@ -77,6 +80,15 @@ static inline char ocfs2_lock_type_char(enum ocfs2_lock_type type)
                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;
                default:
                        c = '\0';
        }
@@ -95,6 +107,8 @@ static char *ocfs2_lock_type_strings[] = {
        [OCFS2_LOCK_TYPE_DENTRY] = "Dentry",
        [OCFS2_LOCK_TYPE_OPEN] = "Open",
        [OCFS2_LOCK_TYPE_FLOCK] = "Flock",
+       [OCFS2_LOCK_TYPE_QINFO] = "Quota",
+       [OCFS2_LOCK_TYPE_ORPHAN_SCAN] = "OrphanScan",
 };
 
 static inline const char *ocfs2_lock_type_string(enum ocfs2_lock_type type)