diff options
| author | Sunil Mushran <sunil.mushran@oracle.com> | 2010-10-09 10:24:46 -0700 |
|---|---|---|
| committer | Sunil Mushran <sunil.mushran@oracle.com> | 2010-10-09 10:24:46 -0700 |
| commit | 98f486f23bc5b6a6fa90e1a0707b7e9fe0e7f3e4 (patch) | |
| tree | 3998ce4a9c8871299934f7b1b305867ea9d4ac40 /fs/ocfs2/super.c | |
| parent | 54b5187b5a1ad6573ade8b18e065dda92501fc52 (diff) | |
| download | op-kernel-dev-98f486f23bc5b6a6fa90e1a0707b7e9fe0e7f3e4.zip op-kernel-dev-98f486f23bc5b6a6fa90e1a0707b7e9fe0e7f3e4.tar.gz | |
ocfs2: Add an incompat feature flag OCFS2_FEATURE_INCOMPAT_CLUSTERINFO
OCFS2_FEATURE_INCOMPAT_CLUSTERINFO allows us to use sb->s_cluster_info for
both userspace and o2cb cluster stacks. It also allows us to extend cluster
info to include stack flags.
This patch also adds stackflags to sb->s_clusterinfo. It also introduces a
clusterinfo flag OCFS2_CLUSTER_O2CB_GLOBAL_HEARTBEAT to denote the enabled
global heartbeat mode.
This incompat flag can be set/cleared using tunefs.ocfs2 --fs-features. The
clusterinfo flag is set/cleared using tunefs.ocfs2 --update-cluster-stack.
Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Diffstat (limited to 'fs/ocfs2/super.c')
| -rw-r--r-- | fs/ocfs2/super.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index fa1be1b..7554317 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -2149,7 +2149,9 @@ static int ocfs2_initialize_super(struct super_block *sb, goto bail; } - if (ocfs2_userspace_stack(osb)) { + if (ocfs2_clusterinfo_valid(osb)) { + osb->osb_stackflags = + OCFS2_RAW_SB(di)->s_cluster_info.ci_stackflags; memcpy(osb->osb_cluster_stack, OCFS2_RAW_SB(di)->s_cluster_info.ci_stack, OCFS2_STACK_LABEL_LEN); |
