[Ocfs2-commits] mfasheh commits r1567 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-10-13 17:44:14 -0500 (Wed, 13 Oct 2004)
New Revision: 1567

Modified:
   trunk/src/ocfs.h
   trunk/src/vote.c
Log:
* make ocfs_lock_res->readonly_state an unsigned long. This gets rid
  of a really annoying warning.



Modified: trunk/src/ocfs.h
===================================================================
--- trunk/src/ocfs.h	2004-10-12 21:53:27 UTC (rev 1566)
+++ trunk/src/ocfs.h	2004-10-13 22:44:14 UTC (rev 1567)
@@ -362,8 +362,7 @@
 	__u32 uncommitted_holders;
 	__u8 lock_type;
 	struct rw_semaphore lock;
-#warning readonly_state is an int, *_bit requires unsigned long
-	int readonly_state;
+	unsigned long readonly_state;
 	ocfs_node_map readonly_map;
 };
 

Modified: trunk/src/vote.c
===================================================================
--- trunk/src/vote.c	2004-10-12 21:53:27 UTC (rev 1566)
+++ trunk/src/vote.c	2004-10-13 22:44:14 UTC (rev 1567)
@@ -882,7 +882,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,