[Ocfs2-commits] khackel commits r1225 - trunk/src

[svn-commits at oss.oracle.com]

Author: khackel
Date: 2004-06-29 19:00:47 -0500 (Tue, 29 Jun 2004)
New Revision: 1225

Modified:
   trunk/src/dlm.c
   trunk/src/ocfs2_disk_dlm.h
Log:
changed reserved1 in publish to vote_map

Modified: trunk/src/dlm.c
===================================================================
--- trunk/src/dlm.c	2004-06-29 23:39:35 UTC (rev 1224)
+++ trunk/src/dlm.c	2004-06-30 00:00:47 UTC (rev 1225)
@@ -67,18 +67,15 @@
 static int ocfs_zap_child_buffers_func(struct dentry *dentry, void *data);
 
 
-#warning change these later
 void ocfs_set_publish_vote_map(ocfs_super *osb, ocfs_publish *publish, ocfs_node_map *vote_map)
 {
-	// publish->vote_map; // this can only hold 64 bit
-	// publish->reserved1;  // this can hold __u8[32] = 256, our current max ;-)
-	ocfs_node_map_set_to_disk(publish->reserved1, vote_map);
+	ocfs_node_map_set_to_disk(publish->vote_map, vote_map);
 }
 
 void ocfs_get_publish_vote_map(ocfs_super *osb, ocfs_publish *publish, ocfs_node_map *vote_map)
 {
 	ocfs_node_map_init(osb, vote_map);
-	ocfs_node_map_set_from_disk(vote_map, publish->reserved1);
+	ocfs_node_map_set_from_disk(vote_map, publish->vote_map);
 }
 
 void ocfs_set_disk_lock_open_map(ocfs_super *osb,

Modified: trunk/src/ocfs2_disk_dlm.h
===================================================================
--- trunk/src/ocfs2_disk_dlm.h	2004-06-29 23:39:35 UTC (rev 1224)
+++ trunk/src/ocfs2_disk_dlm.h	2004-06-30 00:00:47 UTC (rev 1225)
@@ -107,8 +107,8 @@
 	__u32 dirty;		/* Is the node in a clean state */
 /*10*/	__u32 vote_type;	/* Type required */
 	__u32 mounted;		/* Does the publisher have it mounted */
-/*18*/	__u32 reserved1[8];
-/*38*/	__u64 vote_map;		/* Who needs to vote */
+/*18*/	__u32 vote_map[8];	/* Who needs to vote */
+/*38*/	__u64 reserved1;
 /*50*/	__u64 publ_seq_num;	/* Sequence for vote */
 	__u64 lock_id;		/* Lock vote is requested for */
 	/* last seq num used in comm voting */