[Ocfs2-commits] mfasheh commits r2621 - branches/ocfs2-1.2/fs/ocfs2

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: zab
Date: 2005-09-27 19:36:33 -0500 (Tue, 27 Sep 2005)
New Revision: 2621

Modified:
   branches/ocfs2-1.2/fs/ocfs2/dlmglue.c
Log:
* backport trunk revisions 2598 and 2620:
	-mlog levels are 64 bits, fixes truncation with 32bit longs
	-Don't call ocfs2_lvb_is_trustable() in ocfs2_dump_meta_lvb_info()

Signed-off-by: zab



Modified: branches/ocfs2-1.2/fs/ocfs2/dlmglue.c
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/dlmglue.c	2005-09-28 00:32:04 UTC (rev 2620)
+++ branches/ocfs2-1.2/fs/ocfs2/dlmglue.c	2005-09-28 00:36:33 UTC (rev 2621)
@@ -2588,7 +2588,7 @@
 }
 
 /* This aids in debugging situations where a bad LVB might be involved. */
-void ocfs2_dump_meta_lvb_info(unsigned long level,
+void ocfs2_dump_meta_lvb_info(u64 level,
 			      const char *function,
 			      unsigned int line,
 			      struct ocfs2_lock_res *lockres)
@@ -2597,10 +2597,10 @@
 
 	mlog(level, "LVB information for %s (called from %s:%u):\n",
 	     lockres->l_name, function, line);
-	mlog(level, "trustable: %s, seq: %u, size_off: %u, clusters: %u\n",
-	     ocfs2_lvb_is_trustable(lockres) ? "yes" : "no",
-	     be32_to_cpu(lvb->lvb.lvb_seq), be32_to_cpu(lvb->lvb_isize_off),
-	     be32_to_cpu(lvb->lvb_iclusters));
+	mlog(level, "Lockres local seq: %u, seq: %u, size_off: %u, "
+	     "clusters: %u\n",
+	     lockres->l_local_seq, be32_to_cpu(lvb->lvb.lvb_seq),
+	     be32_to_cpu(lvb->lvb_isize_off),  be32_to_cpu(lvb->lvb_iclusters));
 	mlog(level, "trunc clusters %u, uid %u, gid %u, mode 0x%x\n",
 	     be32_to_cpu(lvb->lvb_trunc_clusters), be32_to_cpu(lvb->lvb_iuid),
 	     be32_to_cpu(lvb->lvb_igid), be16_to_cpu(lvb->lvb_imode));