[Ocfs2-tools-commits] khackel commits r593 - in trunk: clusterbo
libo2cb/include mount.ocfs2
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Jan 26 01:55:27 CST 2005
Author: khackel
Date: 2005-01-26 01:55:25 -0600 (Wed, 26 Jan 2005)
New Revision: 593
Modified:
trunk/clusterbo/o2cb_config.c
trunk/libo2cb/include/ocfs2_heartbeat.h
trunk/libo2cb/include/ocfs2_nodemanager.h
trunk/mount.ocfs2/mount.ocfs2.c
Log:
update of mount and libo2cb to change node number from u16 to u8
Modified: trunk/clusterbo/o2cb_config.c
===================================================================
--- trunk/clusterbo/o2cb_config.c 2005-01-26 05:17:18 UTC (rev 592)
+++ trunk/clusterbo/o2cb_config.c 2005-01-26 07:55:25 UTC (rev 593)
@@ -34,7 +34,9 @@
#include "jconfig.h"
#include "o2cb_config.h"
+#include "o2cb.h"
+
struct _O2CBConfig {
gchar *c_name;
guint c_num_nodes;
@@ -94,7 +96,7 @@
if (!ptr || *ptr)
goto out_error;
rc = -ERANGE;
- if ((val == ULONG_MAX) || (val > UINT_MAX))
+ if ((val == ULONG_MAX) || (val >= NM_MAX_NODES))
goto out_error;
node->n_number = val;
Modified: trunk/libo2cb/include/ocfs2_heartbeat.h
===================================================================
--- trunk/libo2cb/include/ocfs2_heartbeat.h 2005-01-26 05:17:18 UTC (rev 592)
+++ trunk/libo2cb/include/ocfs2_heartbeat.h 2005-01-26 07:55:25 UTC (rev 593)
@@ -40,7 +40,8 @@
__u32 fd;
char disk_uuid[CLUSTER_DISK_UUID_LEN+1];
char pad1[15]; /* Pad to the __u16 following it */
- __u16 group_num;
+ __u8 group_num;
+ __u8 pad2;
__u32 bits;
__u32 blocks;
__u64 start;
Modified: trunk/libo2cb/include/ocfs2_nodemanager.h
===================================================================
--- trunk/libo2cb/include/ocfs2_nodemanager.h 2005-01-26 05:17:18 UTC (rev 592)
+++ trunk/libo2cb/include/ocfs2_nodemanager.h 2005-01-26 07:55:25 UTC (rev 593)
@@ -54,11 +54,12 @@
typedef struct _nm_node_info
{
- __u16 node_num;
- __u16 pad1;
- __u32 pad2;
+ __u8 node_num;
+ __u8 pad1;
+ __u16 pad2;
+ __u32 pad3;
char node_name[NM_MAX_NAME_LEN+1];
- char pad3[63];
+ char pad4[63];
nm_network_iface ifaces[NM_MAX_IFACES];
} nm_node_info;
@@ -80,9 +81,11 @@
typedef struct _nm_group_change
{
- __u16 group_num;
- __u16 node_num;
- __u16 slot_num;
+ __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;
@@ -93,7 +96,7 @@
__u16 opcode;
__u32 pad1;
union {
- __u16 index;
+ __u8 index;
char name[NM_MAX_NAME_LEN+1];
nm_node_info node;
nm_group_change gc;
Modified: trunk/mount.ocfs2/mount.ocfs2.c
===================================================================
--- trunk/mount.ocfs2/mount.ocfs2.c 2005-01-26 05:17:18 UTC (rev 592)
+++ trunk/mount.ocfs2/mount.ocfs2.c 2005-01-26 07:55:25 UTC (rev 593)
@@ -71,16 +71,16 @@
#define HEARTBEAT_DISK_FILE "/proc/cluster/heartbeat/.disk"
-int create_remote_group(char *group_name, __u16 node);
-int get_node_map(__u16 group_num, char *bitmap);
-int get_raw_node_map(__u16 groupnum, char *groupdev, __u32 block_bits, __u32 num_blocks, __u64 start_block, char *bitmap);
+int create_remote_group(char *group_name, __u8 node);
+int get_node_map(__u8 group_num, char *bitmap);
+int get_raw_node_map(__u8 groupnum, char *groupdev, __u32 block_bits, __u32 num_blocks, __u64 start_block, char *bitmap);
int get_ocfs2_disk_hb_params(char *group_dev, __u32 *block_bits, __u32 *cluster_bits,
__u64 *start_block, __u32 *num_clusters);
-int activate_group(char *group_name, char *group_dev, __u16 group_num,
+int activate_group(char *group_name, char *group_dev, __u8 group_num,
__u32 block_bits, __u64 num_blocks, __u64 start_block);
-int add_to_local_group(char *uuid, __u16 group_num, __u16 node_num);
-int create_group(char *uuid, __u16 *group_num);
-int get_my_nodenum(__u16 *nodenum);
+int add_to_local_group(char *uuid, __u8 group_num, __u8 node_num);
+int create_group(char *uuid, __u8 *group_num);
+int get_my_nodenum(__u8 *nodenum);
int add_me_to_group(char *groupname, char *groupdev);
int ocfs2_detect_one(char *dev, char *uuid, int uuid_size);
static int read_options(int argc, char **argv, char **device, char **mp);
@@ -276,7 +276,7 @@
int add_me_to_group(char *groupname, char *groupdev)
{
int ret;
- __u16 my_nodenum, groupnum;
+ __u8 my_nodenum, groupnum;
__u32 pre_nodemap[] = {0, 0, 0, 0, 0, 0, 0, 0};
__u32 post_nodemap[] = {0, 0, 0, 0, 0, 0, 0, 0};
int start, next, i;
@@ -393,7 +393,7 @@
return 0;
}
-int get_my_nodenum(__u16 *nodenum)
+int get_my_nodenum(__u8 *nodenum)
{
FILE *file;
int ret = -EINVAL;
@@ -423,7 +423,7 @@
return ret;
}
-int create_group(char *uuid, __u16 *group_num)
+int create_group(char *uuid, __u8 *group_num)
{
FILE *file;
int ret = -EINVAL, retval;
@@ -473,7 +473,7 @@
}
-int add_to_local_group(char *uuid, __u16 group_num, __u16 node_num)
+int add_to_local_group(char *uuid, __u8 group_num, __u8 node_num)
{
FILE *file;
int ret = -EINVAL, retval;
@@ -522,7 +522,7 @@
return ret;
}
-int activate_group(char *group_name, char *group_dev, __u16 group_num,
+int activate_group(char *group_name, char *group_dev, __u8 group_num,
__u32 block_bits, __u64 num_blocks, __u64 start_block)
{
int dev_fd = -1;
@@ -619,7 +619,7 @@
return status;
}
-int get_node_map(__u16 group_num, char *bitmap)
+int get_node_map(__u8 group_num, char *bitmap)
{
FILE *file = NULL;
hb_op *op;
@@ -660,7 +660,7 @@
}
-int get_raw_node_map(__u16 groupnum, char *groupdev, __u32 block_bits, __u32 num_blocks, __u64 start_block, char *bitmap)
+int get_raw_node_map(__u8 groupnum, char *groupdev, __u32 block_bits, __u32 num_blocks, __u64 start_block, char *bitmap)
{
int i;
int ret = -EINVAL;
@@ -745,7 +745,7 @@
return ret;
}
-int create_remote_group(char *group_name, __u16 node)
+int create_remote_group(char *group_name, __u8 node)
{
int ret, fd = -1, remote_node = -1;
gsd_ioc ioc;
More information about the Ocfs2-tools-commits
mailing list