[Ocfs2-commits] mfasheh commits r2029 - trunk/fs/ocfs2/cluster
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Mon Mar 21 16:54:19 CST 2005
Author: mfasheh
Signed-off-by: manish
Date: 2005-03-21 16:54:17 -0600 (Mon, 21 Mar 2005)
New Revision: 2029
Modified:
trunk/fs/ocfs2/cluster/ocfs2_heartbeat.h
trunk/fs/ocfs2/cluster/ocfs2_nodemanager.h
Log:
* remove some unused junk
Signed-off-by: manish
Modified: trunk/fs/ocfs2/cluster/ocfs2_heartbeat.h
===================================================================
--- trunk/fs/ocfs2/cluster/ocfs2_heartbeat.h 2005-03-21 22:53:02 UTC (rev 2028)
+++ trunk/fs/ocfs2/cluster/ocfs2_heartbeat.h 2005-03-21 22:54:17 UTC (rev 2029)
@@ -29,27 +29,6 @@
#define CLUSTER_DISK_UUID_LEN 32 // 16 byte binary == 32 char hex string
-
-#define HB_OP_MAGIC 0xf00d
-enum {
- HB_OP_START_DISK_HEARTBEAT=371,
- HB_OP_GET_NODE_MAP
-};
-
-typedef struct _hb_op
-{
- __u16 magic;
- __u16 opcode;
- __u32 fd;
- char disk_uuid[CLUSTER_DISK_UUID_LEN+1];
- char pad1[15]; /* Pad to the __u16 following it */
- __u8 group_num;
- __u8 pad2;
- __u32 bits;
- __u32 blocks;
- __u64 start;
-} hb_op;
-
typedef struct _hb_disk_heartbeat_block
{
__u64 time;
Modified: trunk/fs/ocfs2/cluster/ocfs2_nodemanager.h
===================================================================
--- trunk/fs/ocfs2/cluster/ocfs2_nodemanager.h 2005-03-21 22:53:02 UTC (rev 2028)
+++ trunk/fs/ocfs2/cluster/ocfs2_nodemanager.h 2005-03-21 22:54:17 UTC (rev 2029)
@@ -37,48 +37,4 @@
/* host name, group name, cluster name all 64 bytes */
#define NM_MAX_NAME_LEN 64 // __NEW_UTS_LEN
-
-#define NM_GROUP_INODE_START 200000
-#define NM_NODE_INODE_START 100000
-
-/* transaction file nm_op stuff */
-
-#define NM_OP_MAGIC 0xbeaf
-enum {
- NM_OP_CREATE_CLUSTER=123,
- NM_OP_DESTROY_CLUSTER,
- NM_OP_NAME_CLUSTER,
- NM_OP_ADD_CLUSTER_NODE,
- NM_OP_GET_CLUSTER_NUM_NODES,
- NM_OP_GET_NODE_INFO,
- NM_OP_CREATE_GROUP,
- NM_OP_GET_GROUP_INFO,
- NM_OP_ADD_GROUP_NODE,
- NM_OP_GET_GLOBAL_NODE_NUM
-};
-
-typedef struct _nm_group_change
-{
- __u8 group_num;
- __u8 node_num;
- __u8 slot_num;
- __u8 pad1;
- __u32 pad2;
- char disk_uuid[CLUSTER_DISK_UUID_LEN+1];
- char name[NM_MAX_NAME_LEN+1];
-} nm_group_change;
-
-typedef struct _nm_op
-{
- __u16 magic;
- __u16 opcode;
- __u32 pad1;
- union {
- __u8 index;
- char name[NM_MAX_NAME_LEN+1];
-// nm_node_info node;
- nm_group_change gc;
- } arg_u;
-} nm_op;
-
#endif /* _OCFS2_NODEMANAGER_H */
More information about the Ocfs2-commits
mailing list