[Ocfs2-commits] manish commits r2418 - in trunk/fs/ocfs2: . dlm

[svn-commits at oss.oracle.com]

Author: manish
Signed-off-by: mfasheh
Date: 2005-06-22 01:07:38 -0500 (Wed, 22 Jun 2005)
New Revision: 2418

Modified:
   trunk/fs/ocfs2/dlm/dlmconvert.c
   trunk/fs/ocfs2/file.c
   trunk/fs/ocfs2/journal.c
Log:
Fix some more format string confusion

Signed-off-by: mfasheh


Modified: trunk/fs/ocfs2/dlm/dlmconvert.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmconvert.c	2005-06-22 05:51:17 UTC (rev 2417)
+++ trunk/fs/ocfs2/dlm/dlmconvert.c	2005-06-22 06:07:38 UTC (rev 2418)
@@ -279,7 +279,7 @@
 	if (lock->ml.convert_type != LKM_IVMODE) {
 		__dlm_print_one_lock_resource(res);
 		mlog(ML_ERROR, "converting a remote lock that is already "
-		     "converting! (cookie=%llu, conv=%d)\n",
+		     "converting! (cookie=%"MLFu64", conv=%d)\n",
 		     lock->ml.cookie, lock->ml.convert_type);
 		status = DLM_DENIED;
 		goto denied;

Modified: trunk/fs/ocfs2/file.c
===================================================================
--- trunk/fs/ocfs2/file.c	2005-06-22 05:51:17 UTC (rev 2417)
+++ trunk/fs/ocfs2/file.c	2005-06-22 06:07:38 UTC (rev 2418)
@@ -468,7 +468,7 @@
 			"Inode %"MLFu64", inode i_size = %lld != di "
 			"i_size = %"MLFu64", i_flags = 0x%x\n",
 			OCFS2_I(inode)->ip_blkno,
-			(long long) i_size_read(inode),
+			i_size_read(inode),
 			fe->i_size, fe->i_flags);
 
 	if (new_i_size > fe->i_size) {

Modified: trunk/fs/ocfs2/journal.c
===================================================================
--- trunk/fs/ocfs2/journal.c	2005-06-22 05:51:17 UTC (rev 2417)
+++ trunk/fs/ocfs2/journal.c	2005-06-22 06:07:38 UTC (rev 2418)
@@ -531,13 +531,13 @@
 	di = (ocfs2_dinode *)bh->b_data;
 
 	if (inode->i_size <  OCFS2_MIN_JOURNAL_SIZE) {
-		mlog(ML_ERROR, "Journal file size (%"MLFu64") is too small!\n",
+		mlog(ML_ERROR, "Journal file size (%lld) is too small!\n",
 		     inode->i_size);
 		status = -EINVAL;
 		goto done;
 	}
 
-	mlog(0, "inode->i_size = %"MLFu64"\n", inode->i_size);
+	mlog(0, "inode->i_size = %lld\n", inode->i_size);
 	mlog(0, "inode->i_blocks = %lu\n", inode->i_blocks);
 	mlog(0, "inode->ip_clusters = %u\n", OCFS2_I(inode)->ip_clusters);