[Ocfs2-commits] manish commits r1469 - trunk/src

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-09-13 19:04:01 -0500 (Mon, 13 Sep 2004)
New Revision: 1469

Modified:
   trunk/src/ocfs.h
   trunk/src/vote.c
Log:
bitops should operate on unsigned longs


Modified: trunk/src/ocfs.h
===================================================================
--- trunk/src/ocfs.h	2004-09-13 23:26:33 UTC (rev 1468)
+++ trunk/src/ocfs.h	2004-09-14 00:04:01 UTC (rev 1469)
@@ -360,7 +360,7 @@
 	__u32 uncommitted_holders;
 	__u8 lock_type;
 	struct rw_semaphore lock;
-	int readonly_state;
+	unsigned long readonly_state;
 	ocfs_node_map readonly_map;
 };
 

Modified: trunk/src/vote.c
===================================================================
--- trunk/src/vote.c	2004-09-13 23:26:33 UTC (rev 1468)
+++ trunk/src/vote.c	2004-09-14 00:04:01 UTC (rev 1469)
@@ -885,7 +885,7 @@
 #warning "should we even be erroring here at all!"
 		LOG_ERROR_ARGS("inode %llu, vote_status=%d, vote_state=%d, "
 			       "lockid=%llu, flags = 0x%x, asked type = %u "
-			       "master = %d, state = 0x%x, type = %u\n",
+			       "master = %d, state = 0x%lx, type = %u\n",
 			       OCFS_I(inode)->ip_blkno, obj->vote_status, 
 			       obj->vote_state, lock_id, flags, lock_type, 
 			       GET_INODE_LOCKRES(inode)->master_node_num,