ocfs2-mount-shared-volume-without-ha-stack.patch removed from -mm tree
The patch titled
Subject: ocfs2: mount shared volume without ha stack
has been removed from the -mm tree. Its filename was
ocfs2-mount-shared-volume-without-ha-stack.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Gang He <[email protected]>
Subject: ocfs2: mount shared volume without ha stack
Usually we create and use a ocfs2 shared volume on the top of ha stack. For pcmk based ha stack, which includes DLM, corosync and pacemaker services.
The customers complained they could not mount existent ocfs2 volume in the single node without ha stack, e.g. single node backup/restore scenario.
Like this case, the customers just want to access the data from the existent ocfs2 volume quickly, but do not want to restart or setup ha stack.
Then, I'd like to add a mount option "nocluster", if the users use this option to mount a ocfs2 shared volume, the whole mount will not depend on the ha related services. the command will mount the existent ocfs2 volume directly (like local mount), for avoiding setup the ha stack.
---
fs/ocfs2/ocfs2.h | 4 ++- fs/ocfs2/slot_map.c | 46 ++++++++++++++++++++++++------------------ fs/ocfs2/super.c | 21 +++++++++++++++++++ 3 files changed, 51 insertions(+), 20 deletions(-)
fs/ocfs2/ocfs2.h renamed from fs/ocfs2/ocfs2.h~ocfs2-mount-shared-volume-without-ha-stack +3 -1
@@ -279,6 +279,7 @@ enum ocfs2_mount_optionsOCFS2_MOUNT_JOURNAL_ASYNC_COMMIT =1 <<15 ,/* Journal Async Commit */ OCFS2_MOUNT_ERRORS_CONT =1 <<16 ,/* Return EIO to the calling process on error */ OCFS2_MOUNT_ERRORS_ROFS =1 <<17 ,/* Change filesystem to read-only on error */ + OCFS2_MOUNT_NOCLUSTER = 1 << 18, /* No cluster aware filesystem mount */ };#define OCFS2_OSB_SOFT_RO 0x0001
@@ -673,7 +674,8 @@ static inline int ocfs2_cluster_o2cb_glostatic inline int ocfs2_mount_local (struct ocfs2_super *osb) { -return (osb->s_feature_incompat &OCFS2_FEATURE_INCOMPAT_LOCAL_MOUNT ); +return ((osb->s_feature_incompat &OCFS2_FEATURE_INCOMPAT_LOCAL_MOUNT ) + || (osb->s_mount_opt &OCFS2_MOUNT_NOCLUSTER )); }static inline int ocfs2_uses_extended_slot_map (struct ocfs2_super *osb)
fs/ocfs2/slot_map.c renamed from fs/ocfs2/slot_map.c~ocfs2-mount-shared-volume-without-ha-stack +27 -19
65 lines not on this page · raw message
fs/ocfs2/super.c renamed from fs/ocfs2/super.c~ocfs2-mount-shared-volume-without-ha-stack +21 -0
@@ -175,6 +175,7 @@ enum { Opt_dir_resv_level, Opt_journal_async_commit, Opt_err_cont, + Opt_nocluster, Opt_err, };
@@ -208,6 +209,7 @@ static const match_table_t tokens = { {Opt_dir_resv_level, "dir_resv_level=%u"}, {Opt_journal_async_commit, "journal_async_commit"}, {Opt_err_cont, "errors=continue"}, + {Opt_nocluster, "nocluster"}, {Opt_err, NULL} };
@@ -619,6 +621,13 @@ static int ocfs2_remount(struct super_bl goto out; } + tmp =OCFS2_MOUNT_NOCLUSTER ; +if ((osb->s_mount_opt & tmp) != (parsed_options.mount_opt & tmp)) { + ret = -EINVAL ; +mlog (ML_ERROR ,"Cannot change nocluster option on remount\n" ); + goto out; + } + tmp =OCFS2_MOUNT_HB_LOCAL |OCFS2_MOUNT_HB_GLOBAL |OCFS2_MOUNT_HB_NONE ;if ((osb->s_mount_opt & tmp) != (parsed_options.mount_opt & tmp)) {
@@ -859,6 +868,7 @@ static int ocfs2_verify_userspace_stack( }if (ocfs2_userspace_stack (osb) && + !(osb->s_mount_opt &OCFS2_MOUNT_NOCLUSTER ) &&strncmp (osb->osb_cluster_stack, mopt->cluster_stack,OCFS2_STACK_LABEL_LEN )) { mlog(ML_ERROR,
@@ -1139,6 +1149,11 @@ static int ocfs2_fill_super(struct super osb->s_mount_opt &OCFS2_MOUNT_DATA_WRITEBACK ?"writeback" : "ordered"); +if ((osb->s_mount_opt &OCFS2_MOUNT_NOCLUSTER ) && + !(osb->s_feature_incompat &OCFS2_FEATURE_INCOMPAT_LOCAL_MOUNT )) +printk (KERN_NOTICE "ocfs2: The shared device (%s) is mounted " +"without cluster aware mode.\n" , osb->dev_str); +atomic_set (&osb->vol_state,VOLUME_MOUNTED );wake_up (&osb->osb_mount_event);
@@ -1445,6 +1460,9 @@ static int ocfs2_parse_options(struct sucase Opt_journal_async_commit: mopt->mount_opt |=OCFS2_MOUNT_JOURNAL_ASYNC_COMMIT ;break ; +case Opt_nocluster: + mopt->mount_opt |=OCFS2_MOUNT_NOCLUSTER ; +break ;default :mlog (ML_ERROR , "Unrecognized mount option \"%s\" "
@@ -1556,6 +1574,9 @@ static int ocfs2_show_options(struct seqif (opts &OCFS2_MOUNT_JOURNAL_ASYNC_COMMIT )seq_printf (s,",journal_async_commit" ); +if (opts &OCFS2_MOUNT_NOCLUSTER ) +seq_printf (s,",nocluster" ); +return 0 ; }
_
Patches currently in -mm which might be from [email protected] are