summaryrefslogtreecommitdiff
path: root/fs/ocfs2/ocfs2.h
diff options
context:
space:
mode:
authorSunil Mushran <sunil.mushran@oracle.com>2010-10-07 15:23:50 -0700
committerSunil Mushran <sunil.mushran@oracle.com>2010-10-07 15:23:50 -0700
commit2c442719e90a44a6982c033d69df4aae4b167cfa (patch)
tree33719bdeeab9dc0fcb5898ca673aaa248b639dbb /fs/ocfs2/ocfs2.h
parent98f486f23bc5b6a6fa90e1a0707b7e9fe0e7f3e4 (diff)
downloadlinux-stable-2c442719e90a44a6982c033d69df4aae4b167cfa.tar.gz
linux-stable-2c442719e90a44a6982c033d69df4aae4b167cfa.tar.bz2
linux-stable-2c442719e90a44a6982c033d69df4aae4b167cfa.zip
ocfs2: Add support for heartbeat=global mount option
Adds support for heartbeat=global mount option. It ensures that the heartbeat mode passed matches the one enabled on disk. Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Diffstat (limited to 'fs/ocfs2/ocfs2.h')
-rw-r--r--fs/ocfs2/ocfs2.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
index d5496a792bdb..481387b90b21 100644
--- a/fs/ocfs2/ocfs2.h
+++ b/fs/ocfs2/ocfs2.h
@@ -243,7 +243,7 @@ enum ocfs2_local_alloc_state
enum ocfs2_mount_options
{
- OCFS2_MOUNT_HB_LOCAL = 1 << 0, /* Heartbeat started in local mode */
+ OCFS2_MOUNT_HB_LOCAL = 1 << 0, /* Local heartbeat */
OCFS2_MOUNT_BARRIER = 1 << 1, /* Use block barriers */
OCFS2_MOUNT_NOINTR = 1 << 2, /* Don't catch signals */
OCFS2_MOUNT_ERRORS_PANIC = 1 << 3, /* Panic on errors */
@@ -256,6 +256,8 @@ enum ocfs2_mount_options
control lists */
OCFS2_MOUNT_USRQUOTA = 1 << 10, /* We support user quotas */
OCFS2_MOUNT_GRPQUOTA = 1 << 11, /* We support group quotas */
+ OCFS2_MOUNT_HB_NONE = 1 << 12, /* No heartbeat */
+ OCFS2_MOUNT_HB_GLOBAL = 1 << 13, /* Global heartbeat */
};
#define OCFS2_OSB_SOFT_RO 0x0001