[Ocfs2-commits] jlbec commits r1721 - trunk/cluster
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Mon Dec 27 19:06:35 CST 2004
Author: jlbec
Date: 2004-12-27 19:06:33 -0600 (Mon, 27 Dec 2004)
New Revision: 1721
Modified:
trunk/cluster/heartbeat.h
trunk/cluster/nodemanager.c
trunk/cluster/nodemanager.h
Log:
o ABI changes to make 64bitness work. Needed.
Modified: trunk/cluster/heartbeat.h
===================================================================
--- trunk/cluster/heartbeat.h 2004-12-24 23:06:42 UTC (rev 1720)
+++ trunk/cluster/heartbeat.h 2004-12-28 01:06:33 UTC (rev 1721)
@@ -65,8 +65,9 @@
{
u16 magic;
u16 opcode;
- unsigned int fd;
+ u32 fd;
char disk_uuid[CLUSTER_DISK_UUID_LEN+1];
+ char pad1[15];
u16 group_num;
u32 bits;
u32 blocks;
Modified: trunk/cluster/nodemanager.c
===================================================================
--- trunk/cluster/nodemanager.c 2004-12-24 23:06:42 UTC (rev 1720)
+++ trunk/cluster/nodemanager.c 2004-12-28 01:06:33 UTC (rev 1721)
@@ -64,6 +64,7 @@
#include <linux/seq_file.h>
#include <linux/pagemap.h>
#include <linux/hash.h>
+#include <linux/bitops.h>
#include <asm/uaccess.h>
Modified: trunk/cluster/nodemanager.h
===================================================================
--- trunk/cluster/nodemanager.h 2004-12-24 23:06:42 UTC (rev 1720)
+++ trunk/cluster/nodemanager.h 2004-12-28 01:06:33 UTC (rev 1721)
@@ -80,7 +80,10 @@
typedef struct _nm_node_info
{
u16 node_num;
+ __u16 pad1;
+ __u32 pad2;
char node_name[NM_MAX_NAME_LEN+1];
+ char pad3[63];
nm_network_iface ifaces[NM_MAX_IFACES];
} nm_node_info;
@@ -157,6 +160,7 @@
{
u16 magic;
u16 opcode;
+ __u32 pad1;
union {
u16 index;
char name[NM_MAX_NAME_LEN+1];
More information about the Ocfs2-commits
mailing list