[Ocfs2-commits] jlbec commits r2410 - trunk/fs/ocfs2

[svn-commits at oss.oracle.com]

Author: jlbec
Signed-off-by: mfasheh
Date: 2005-06-19 01:08:35 -0500 (Sun, 19 Jun 2005)
New Revision: 2410

Modified:
   trunk/fs/ocfs2/inode.h
   trunk/fs/ocfs2/ocfs2.h
   trunk/fs/ocfs2/seqnum.c
Log:

o Sequence number values need to be unsigned long to match b_state.

Signed-off-by: mfasheh



Modified: trunk/fs/ocfs2/inode.h
===================================================================
--- trunk/fs/ocfs2/inode.h	2005-06-19 00:55:10 UTC (rev 2409)
+++ trunk/fs/ocfs2/inode.h	2005-06-19 06:08:35 UTC (rev 2410)
@@ -55,7 +55,7 @@
 	struct list_head	ip_handle_list;
 	ocfs2_journal_handle	*ip_handle;
 
-	unsigned int		ip_clean_buffer_seq;
+	unsigned long		ip_clean_buffer_seq;
 	u32			ip_flags; /* see below */
 
 	/* protected by recovery_lock. */

Modified: trunk/fs/ocfs2/ocfs2.h
===================================================================
--- trunk/fs/ocfs2/ocfs2.h	2005-06-19 00:55:10 UTC (rev 2409)
+++ trunk/fs/ocfs2/ocfs2.h	2005-06-19 06:08:35 UTC (rev 2410)
@@ -211,7 +211,7 @@
 	wait_queue_head_t checkpoint_event;
 	atomic_t needs_checkpoint;
 	struct _ocfs2_journal *journal;
-	unsigned int osb_clean_buffer_seq;
+	unsigned long osb_clean_buffer_seq;
 
 	enum ocfs2_local_alloc_state local_alloc_state;
 	struct buffer_head *local_alloc_bh;

Modified: trunk/fs/ocfs2/seqnum.c
===================================================================
--- trunk/fs/ocfs2/seqnum.c	2005-06-19 00:55:10 UTC (rev 2409)
+++ trunk/fs/ocfs2/seqnum.c	2005-06-19 06:08:35 UTC (rev 2410)
@@ -68,8 +68,8 @@
 #define OCFS2_MAX_BH_BITS	(8 * sizeof(((struct buffer_head *) 0)->b_state))
 #define OCFS2_STATE_BH_BITS	(OCFS2_MAX_BH_BITS - OCFS2_USED_BH_BITS)
 
-#define OCFS2_MAX_SEQUENCE	(1 << OCFS2_STATE_BH_BITS)
-#define OCFS2_MAX_SEQUENCE_MASK	((1 << OCFS2_STATE_BH_BITS) - 1)
+#define OCFS2_MAX_SEQUENCE	(1UL << OCFS2_STATE_BH_BITS)
+#define OCFS2_MAX_SEQUENCE_MASK	((1UL << OCFS2_STATE_BH_BITS) - 1)
 #define OCFS2_SEQUENCE_MASK	((~0UL) << OCFS2_USED_BH_BITS)
 
 static spinlock_t ocfs2_clean_buffer_lock = SPIN_LOCK_UNLOCKED;
@@ -99,7 +99,7 @@
 	 * too soon. */
 	oi->ip_clean_buffer_seq = osb->osb_clean_buffer_seq;
 
-	mlog(0, "(%u) Inode %"MLFu64", seq: %u\n", current->pid,
+	mlog(0, "(%u) Inode %"MLFu64", seq: %lu\n", current->pid,
 	     OCFS2_I(inode)->ip_blkno, oi->ip_clean_buffer_seq);
 }
 
@@ -133,7 +133,8 @@
 
 	spin_lock(&ocfs2_clean_buffer_lock);
 	if (oi->ip_clean_buffer_seq >= OCFS2_MAX_SEQUENCE)
-		mlog(ML_ERROR, "Inode %"MLFu64" has bad sequence: %u\n",
+		mlog(ML_ERROR,
+		     "Inode %"MLFu64" has bad sequence: %lu\n",
 		     oi->ip_blkno, oi->ip_clean_buffer_seq);
 
 	ret = oi->ip_clean_buffer_seq & OCFS2_MAX_SEQUENCE_MASK;