[Ocfs2-commits] manish commits r2414 - trunk/fs/ocfs2

[svn-commits at oss.oracle.com]

Author: manish
Signed-off-by: jlbec
Date: 2005-06-20 17:21:17 -0500 (Mon, 20 Jun 2005)
New Revision: 2414

Modified:
   trunk/fs/ocfs2/dlmglue.c
   trunk/fs/ocfs2/file.c
Log:
Fix up some mlog formats

Signed-off-by: jlbec


Modified: trunk/fs/ocfs2/dlmglue.c
===================================================================
--- trunk/fs/ocfs2/dlmglue.c	2005-06-20 20:35:00 UTC (rev 2413)
+++ trunk/fs/ocfs2/dlmglue.c	2005-06-20 22:21:17 UTC (rev 2414)
@@ -1118,7 +1118,7 @@
 
 	mlog_entry_void();
 
-	mlog(0, "Inode %llu\n", OCFS2_I(inode)->ip_blkno);
+	mlog(0, "Inode %"MLFu64"\n", OCFS2_I(inode)->ip_blkno);
 
 	/* NOTE: That we don't increment any of the holder counts, nor
 	 * do we add anything to a journal handle. Since this is

Modified: trunk/fs/ocfs2/file.c
===================================================================
--- trunk/fs/ocfs2/file.c	2005-06-20 20:35:00 UTC (rev 2413)
+++ trunk/fs/ocfs2/file.c	2005-06-20 22:21:17 UTC (rev 2414)
@@ -322,7 +322,7 @@
 	int ret;
 	struct inode *inode = in_file->f_mapping->host;
 
-	mlog_entry("inode %"MLFu64", ppos %"MLFu64", count = %u\n",
+	mlog_entry("inode %"MLFu64", ppos %lld, count = %u\n",
 		   OCFS2_I(inode)->ip_blkno, (long long) *ppos,
 		   (unsigned int) count);
 
@@ -465,9 +465,10 @@
 	fe = (ocfs2_dinode *) fe_bh->b_data;
 	OCFS2_BUG_ON_INVALID_DINODE(fe);
 	mlog_bug_on_msg(fe->i_size != i_size_read(inode),
-			"Inode %"MLFu64", inode i_size = %"MLFu64" != di "
+			"Inode %"MLFu64", inode i_size = %lld != di "
 			"i_size = %"MLFu64", i_flags = 0x%x\n",
-			OCFS2_I(inode)->ip_blkno, i_size_read(inode),
+			OCFS2_I(inode)->ip_blkno,
+			(long long) i_size_read(inode),
 			fe->i_size, fe->i_flags);
 
 	if (new_i_size > fe->i_size) {