[Ocfs2-commits] mfasheh commits r2633 - trunk/fs/ocfs2

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: zab
Date: 2005-10-04 17:09:51 -0500 (Tue, 04 Oct 2005)
New Revision: 2633

Modified:
   trunk/fs/ocfs2/super.c
Log:
* don't allow a change of heartbeat mode on remount

Signed-off-by: zab



Modified: trunk/fs/ocfs2/super.c
===================================================================
--- trunk/fs/ocfs2/super.c	2005-10-04 18:50:43 UTC (rev 2632)
+++ trunk/fs/ocfs2/super.c	2005-10-04 22:09:51 UTC (rev 2633)
@@ -373,6 +373,13 @@
 		goto out;
 	}
 
+	if ((osb->s_mount_opt & OCFS2_MOUNT_HB_LOCAL) !=
+	    (parsed_options & OCFS2_MOUNT_HB_LOCAL)) {
+		ret = -EINVAL;
+		mlog(ML_ERROR, "Cannot change heartbeat mode on remount\n");
+		goto out;
+	}
+
 	/* We're going to/from readonly mode. */
 	if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) {
 		/* Lock here so the check of HARD_RO and the potential