[Ocfs2-commits] mfasheh commits r2586 - in branches/readonly-operation/fs/ocfs2: . cluster

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2005-09-16 18:24:39 -0500 (Fri, 16 Sep 2005)
New Revision: 2586

Modified:
   branches/readonly-operation/fs/ocfs2/cluster/ocfs2_nodemanager.h
   branches/readonly-operation/fs/ocfs2/ocfs2_fs.h
   branches/readonly-operation/fs/ocfs2/super.c
Log:
* Bump the api version

* Get rid of OCFS2_COMPAT_HB_OK



Modified: branches/readonly-operation/fs/ocfs2/cluster/ocfs2_nodemanager.h
===================================================================
--- branches/readonly-operation/fs/ocfs2/cluster/ocfs2_nodemanager.h	2005-09-16 22:57:03 UTC (rev 2585)
+++ branches/readonly-operation/fs/ocfs2/cluster/ocfs2_nodemanager.h	2005-09-16 23:24:39 UTC (rev 2586)
@@ -28,7 +28,7 @@
 #ifndef _OCFS2_NODEMANAGER_H
 #define _OCFS2_NODEMANAGER_H
 
-#define O2NM_API_VERSION	4
+#define O2NM_API_VERSION	5
 
 #define O2NM_MAX_NODES		255
 #define O2NM_INVALID_NODE_NUM	255

Modified: branches/readonly-operation/fs/ocfs2/ocfs2_fs.h
===================================================================
--- branches/readonly-operation/fs/ocfs2/ocfs2_fs.h	2005-09-16 22:57:03 UTC (rev 2585)
+++ branches/readonly-operation/fs/ocfs2/ocfs2_fs.h	2005-09-16 23:24:39 UTC (rev 2586)
@@ -185,7 +185,6 @@
 };
 
 /* Parameter passed from mount.ocfs2 to module */
-#define OCFS2_COMPAT_HB_OK		"hbok"
 #define OCFS2_HB_NONE			"heartbeat=none"
 #define OCFS2_HB_LOCAL			"heartbeat=local"
 

Modified: branches/readonly-operation/fs/ocfs2/super.c
===================================================================
--- branches/readonly-operation/fs/ocfs2/super.c	2005-09-16 22:57:03 UTC (rev 2585)
+++ branches/readonly-operation/fs/ocfs2/super.c	2005-09-16 23:24:39 UTC (rev 2586)
@@ -142,7 +142,6 @@
 #endif
 
 enum {
-	Opt_hbok,
 	Opt_barrier,
 	Opt_err_panic,
 	Opt_err_ro,
@@ -157,7 +156,6 @@
 };
 
 static match_table_t tokens = {
-	{Opt_hbok, OCFS2_COMPAT_HB_OK},
 	{Opt_barrier, "barrier=%u"},
 	{Opt_err_panic, "errors=panic"},
 	{Opt_err_ro, "errors=remount-ro"},
@@ -706,7 +704,6 @@
 
 		token = match_token(p, tokens, args);
 		switch (token) {
-		case Opt_hbok:
 		case Opt_hb_local:
 			*mount_opt |= OCFS2_MOUNT_HB_LOCAL;
 			break;