git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/pcm-estrpipe-in-pm' into for-linus
[pandora-kernel.git]
/
fs
/
ocfs2
/
ocfs2_lockid.h
diff --git
a/fs/ocfs2/ocfs2_lockid.h
b/fs/ocfs2/ocfs2_lockid.h
index
fcdba09
..
c212cf5
100644
(file)
--- a/
fs/ocfs2/ocfs2_lockid.h
+++ b/
fs/ocfs2/ocfs2_lockid.h
@@
-108,6
+108,7
@@
static char *ocfs2_lock_type_strings[] = {
[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",
};