[Ocfs2-tools-commits] jlbec commits r526 - trunk/libo2cb/include

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-12-30 17:20:53 -0600 (Thu, 30 Dec 2004)
New Revision: 526

Modified:
   trunk/libo2cb/include/ocfs2_heartbeat.h
   trunk/libo2cb/include/ocfs2_nodemanager.h
   trunk/libo2cb/include/ocfs2_tcp.h
Log:

o Clean up unused portions of the libo2cb headers.  This way they can
  be cleanly shared with the kernel module.



Modified: trunk/libo2cb/include/ocfs2_heartbeat.h
===================================================================
--- trunk/libo2cb/include/ocfs2_heartbeat.h	2004-12-30 20:19:26 UTC (rev 525)
+++ trunk/libo2cb/include/ocfs2_heartbeat.h	2004-12-30 23:20:53 UTC (rev 526)
@@ -1,10 +1,8 @@
 /* -*- mode: c; c-basic-offset: 8; -*-
  * vim: noexpandtab sw=8 ts=8 sts=0:
  *
- * dlmhb.h
+ * ocfs2_heartbeat.h
  *
- * Function prototypes
- *
  * Copyright (C) 2002, 2004 Oracle.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -21,23 +19,14 @@
  * License along with this program; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 021110-1307, USA.
- *
- * Authors: Kurt Hackel, Mark Fasheh, Sunil Mushran, Wim Coekaerts,
- *	    Manish Singh, Neeraj Goyal, Suchit Kaura
  */
 
-#ifndef DLMHB_H
-#define DLMHB_H
+#ifndef _OCFS2_HEARTBEAT_H
+#define _OCFS2_HEARTBEAT_H
 
 #define CLUSTER_DISK_UUID_LEN      32      // 16 byte binary == 32 char hex string
 
-enum {
-	HB_NODE_STATE_INIT = 0,
-	HB_NODE_STATE_DOWN,
-	HB_NODE_STATE_UP
-};
 
-
 #define HB_OP_MAGIC      0xf00d
 enum {
 	HB_OP_START_DISK_HEARTBEAT=371,
@@ -57,39 +46,9 @@
 	__u64 start;
 } hb_op;
 
-enum {
-	HB_TYPE_DISK = 0,
-	HB_TYPE_NET
-};
-
-
-/* callback stuff */
-
-enum {
-	HB_NODE_DOWN_CB = 0,
-	HB_NODE_UP_CB,
-	HB_NODE_RESPONDED_CB,    // this one is very chatty
-	HB_NUM_CB
-};
-
-enum {
-	HB_Root = 1,
-	HB_Disk,
-	HB_WriteOpArraySize
-};
-
 typedef struct _hb_disk_heartbeat_block
 {
 	__u64 time;
 } hb_disk_heartbeat_block;
 
-
-// number of initial allowed misses 
-#define HB_INITIAL_DISK_MARGIN     60
-#define HB_INITIAL_NET_MARGIN      60
-
-// number of allowed misses in steady state
-#define HB_DISK_MARGIN             30
-#define HB_NET_MARGIN              30
-
-#endif /* DLMHB_H */
+#endif /* _OCFS2_HEARTBEAT_H */

Modified: trunk/libo2cb/include/ocfs2_nodemanager.h
===================================================================
--- trunk/libo2cb/include/ocfs2_nodemanager.h	2004-12-30 20:19:26 UTC (rev 525)
+++ trunk/libo2cb/include/ocfs2_nodemanager.h	2004-12-30 23:20:53 UTC (rev 526)
@@ -1,10 +1,8 @@
 /* -*- mode: c; c-basic-offset: 8; -*-
  * vim: noexpandtab sw=8 ts=8 sts=0:
  *
- * dlmnm.h
+ * ocfs2_nodemanager.h
  *
- * Function prototypes
- *
  * Copyright (C) 2002, 2004 Oracle.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -26,8 +24,8 @@
  *	    Manish Singh, Neeraj Goyal, Suchit Kaura
  */
 
-#ifndef DLMNM_H
-#define DLMNM_H
+#ifndef _OCFS2_NODEMANAGER_H
+#define _OCFS2_NODEMANAGER_H
 
 #include "ocfs2_heartbeat.h"
 
@@ -42,26 +40,8 @@
 #define NM_GROUP_INODE_START    200000
 #define NM_NODE_INODE_START     100000
 
-enum {
-	NM_CLUSTER_DOWN=0,
-	NM_CLUSTER_UP
-};
 
-enum {
-	NM_GROUP_NOT_READY=0,
-	NM_GROUP_READY
-};
 
-enum {
-	NM_Root = 1,
-	NM_Cluster,
-	NM_Node,
-	NM_Group,
-};
-
-
-
-
 typedef struct _nm_network_iface
 {
 	__u16 ip_port;			/* for simplicity, just define exactly one port for this if */
@@ -120,4 +100,4 @@
 	} arg_u;
 } nm_op;
 
-#endif /* DLMNM_H */
+#endif /* _OCFS2_NODEMANAGER_H */

Modified: trunk/libo2cb/include/ocfs2_tcp.h
===================================================================
--- trunk/libo2cb/include/ocfs2_tcp.h	2004-12-30 20:19:26 UTC (rev 525)
+++ trunk/libo2cb/include/ocfs2_tcp.h	2004-12-30 23:20:53 UTC (rev 526)
@@ -1,10 +1,8 @@
 /* -*- mode: c; c-basic-offset: 8; -*-
  * vim: noexpandtab sw=8 ts=8 sts=0:
  *
- * dlmtcp.h
+ * ocfs2_tcp.h
  *
- * Function prototypes
- *
  * Copyright (C) 2002, 2004 Oracle.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -21,13 +19,10 @@
  * License along with this program; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 021110-1307, USA.
- *
- * Authors: Kurt Hackel, Mark Fasheh, Sunil Mushran, Wim Coekaerts,
- *	    Manish Singh, Neeraj Goyal, Suchit Kaura
  */
 
-#ifndef DLMNET_H
-#define DLMNET_H
+#ifndef _OCFS2_TCP_H
+#define _OCFS2_TCP_H
 
 typedef struct _gsd_ioc
 {
@@ -48,15 +43,4 @@
 #define  GSD_IOC_CREATE_GROUP   _IOR(NET_IOC_MAGIC, 3, gsd_ioc)
 #define  GSD_IOC_ADD_GROUP_NODE _IOR(NET_IOC_MAGIC, 4, gsd_ioc)
 
-#define GSD_MESSAGE   130
-#define GSD_ACTION_ADD_GROUP        (0x01)
-#define GSD_ACTION_ADD_GROUP_NODE   (0x02)
-typedef struct _gsd_message
-{
-	__u16 from;
-	__u8 action;
-	__u8 namelen;
-	__u8 name[NM_MAX_NAME_LEN];
-} gsd_message;
-
-#endif /* DLMNET_H */
+#endif /* _OCFS2_TCP_H */