[Ocfs2-commits] mfasheh commits r2312 - in trunk/fs/ocfs2: . cluster

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: manish
Date: 2005-05-24 13:42:30 -0500 (Tue, 24 May 2005)
New Revision: 2312

Modified:
   trunk/fs/ocfs2/alloc.c
   trunk/fs/ocfs2/cluster/masklog.h
Log:
* use mlog_entry_void when appropriate.

* some compile fixes for mlog()

Taken from a patch by Andrew Morton <akpm at osdl.org>

Signed-off-by: manish



Modified: trunk/fs/ocfs2/alloc.c
===================================================================
--- trunk/fs/ocfs2/alloc.c	2005-05-24 18:40:03 UTC (rev 2311)
+++ trunk/fs/ocfs2/alloc.c	2005-05-24 18:42:30 UTC (rev 2312)
@@ -899,7 +899,8 @@
 	ocfs2_dinode *di;
 	ocfs2_truncate_log *tl;
 
-	mlog_entry();
+	mlog_entry("start_blk = %"MLFu64", num_clusters = %u\n", start_blk,
+		   num_clusters);
 
 	BUG_ON(!down_trylock(&tl_inode->i_sem));
 
@@ -973,7 +974,7 @@
 	struct inode *tl_inode = osb->osb_tl_inode;
 	struct buffer_head *tl_bh = osb->osb_tl_bh;
 
-	mlog_entry();
+	mlog_entry_void();
 
 	di = (ocfs2_dinode *) tl_bh->b_data;
 	tl = &di->id2.i_dealloc;
@@ -1046,7 +1047,7 @@
 	ocfs2_dinode *di;
 	ocfs2_truncate_log *tl;
 
-	mlog_entry();
+	mlog_entry_void();
 
 	BUG_ON(!down_trylock(&tl_inode->i_sem));
 
@@ -1128,7 +1129,7 @@
 	int status;
 	ocfs_super *osb = data;
 
-	mlog_entry();
+	mlog_entry_void();
 
 	status = ocfs2_flush_truncate_log(osb);
 	if (status < 0)
@@ -1265,7 +1266,7 @@
 	struct inode *tl_inode = osb->osb_tl_inode;
 	ocfs2_truncate_log *tl;
 
-	mlog_entry();
+	mlog_entry_void();
 
 	if (OCFS2_I(tl_inode)->ip_blkno == tl_copy->i_blkno) {
 		mlog(ML_ERROR, "Asked to recover my own truncate log!\n");
@@ -1320,7 +1321,7 @@
 	int status;
 	struct inode *tl_inode = osb->osb_tl_inode;
 
-	mlog_entry();
+	mlog_entry_void();
 
 	if (tl_inode) {
 		cancel_delayed_work(&osb->osb_truncate_log_wq);
@@ -1343,7 +1344,7 @@
 	struct inode *tl_inode = NULL;
 	struct buffer_head *tl_bh = NULL;
 
-	mlog_entry();
+	mlog_entry_void();
 
 	status = ocfs2_get_truncate_log_info(osb,
 					     osb->slot_num,

Modified: trunk/fs/ocfs2/cluster/masklog.h
===================================================================
--- trunk/fs/ocfs2/cluster/masklog.h	2005-05-24 18:40:03 UTC (rev 2311)
+++ trunk/fs/ocfs2/cluster/masklog.h	2005-05-24 18:42:30 UTC (rev 2312)
@@ -178,10 +178,10 @@
 	if (__mlog_test_u64(__m, mlog_and_bits) &&			\
 	    !__mlog_test_u64(__m, mlog_not_bits)) {			\
 		if (__m & ML_ERROR)					\
-			__mlog_printk(KERN_ERR, "ERROR: "fmt, ##args);	\
+			__mlog_printk(KERN_ERR, "ERROR: "fmt , ##args);	\
 		else if (__m & ML_NOTICE)				\
-			__mlog_printk(KERN_NOTICE, fmt, ##args);	\
-		else __mlog_printk(KERN_INFO, fmt, ##args);		\
+			__mlog_printk(KERN_NOTICE, fmt , ##args);	\
+		else __mlog_printk(KERN_INFO, fmt , ##args);		\
 	}								\
 } while (0)