summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/dlm/userdlm.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-12-13 09:12:51 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-12-13 09:12:51 +0000
commit72aaf09fda49f5919d98d65d35e5179f3acb0497 (patch)
tree5fd25748f7f5640f8ee8efb86ddca88d12840791 /fs/ocfs2/dlm/userdlm.h
parent67fbc2312312095acc2f19a0b601bac10f84cf9d (diff)
parent58c2467355ed3154a12ee49d8f8236547145c9d3 (diff)
downloadop-kernel-dev-72aaf09fda49f5919d98d65d35e5179f3acb0497.zip
op-kernel-dev-72aaf09fda49f5919d98d65d35e5179f3acb0497.tar.gz
Merge git://git.marvell.com/orion into devel
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 39ec277..0c3cc03 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 */
OpenPOWER on IntegriCloud