aboutsummaryrefslogtreecommitdiff
path: root/fs/ocfs2/dlm/userdlm.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-12 10:29:35 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-12 10:29:35 +0100
commitc1dfdc7597d051b09555d4ae2acb90403e238746 (patch)
tree86aa49f5a2ab25459f9196dd6724bbe6645b1375 /fs/ocfs2/dlm/userdlm.h
parentefbe027e95dc13ac343b6130948418d7ead7ddf1 (diff)
parent8b1fae4e4200388b64dd88065639413cb3f1051c (diff)
Merge commit 'v2.6.28-rc8' into sched/core
Diffstat (limited to 'fs/ocfs2/dlm/userdlm.h')
-rw-r--r--fs/ocfs2/dlm/userdlm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/userdlm.h b/fs/ocfs2/dlm/userdlm.h
index 39ec2773849..0c3cc03c61f 100644
--- a/fs/ocfs2/dlm/userdlm.h
+++ b/fs/ocfs2/dlm/userdlm.h
@@ -33,7 +33,7 @@
#include <linux/workqueue.h>
/* user_lock_res->l_flags flags. */
-#define USER_LOCK_ATTACHED (0x00000001) /* have we initialized
+#define USER_LOCK_ATTACHED (0x00000001) /* we have initialized
* the lvb */
#define USER_LOCK_BUSY (0x00000002) /* we are currently in
* dlm_lock */