Subject: afs/fs/cachefs vjournal.c,1.2,1.3

From: [email-masked]
Date: Thu, 05 Jun 2003 09:27:42 +0100

Update of /home/cvs/afs/fs/cachefs
In directory phoenix.infradead.org:/tmp/cvs-serv12630/fs/cachefs

Modified Files:
	vjournal.c 
Log Message:
cut down on debugging output

Index: vjournal.c
===================================================================
RCS file: /home/cvs/afs/fs/cachefs/vjournal.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vjournal.c	23 May 2003 14:07:31 -0000	1.2
+++ vjournal.c	5 Jun 2003 08:27:39 -0000	1.3
@@ -29,13 +29,13 @@
 	cachefs_blockix_t bix;
 	int slot, ret;
 
-	kenter("");
+	_enter("");
 
 	super = trans->super;
 
 	vjentry = kmalloc(sizeof(*vjentry),GFP_KERNEL);
 	if (!vjentry) {
-		kleave(" = -ENOMEM");
+		_leave(" = -ENOMEM");
 		return -ENOMEM;
 	}
 
@@ -76,7 +76,7 @@
 	spin_unlock(&super->vjnl_lock);
 
 	/* got a slot - now find the block and page holding it */
-	kdebug("VJ slot %d",slot);
+	_debug("VJ slot %d",slot);
 
 	vjentry->vslot	= slot;
 	vjentry->ventry	= slot % CACHEFS_ONDISC_VJNL_ENTPERPAGE;
@@ -93,7 +93,7 @@
 	cachefs_trans_affects_block(trans,vjentry->vblock,vjentry->ventry,
 				    sizeof(struct cachefs_ondisc_validity_journal));
 
-	kleave(" = 0");
+	_leave(" = 0");
 	return 0;
 
  error_clearbit:
@@ -104,7 +104,7 @@
  error_free:
 	spin_unlock(&super->vjnl_lock);
 	kfree(vjentry);
-	kleave(" = %d",ret);
+	_leave(" = %d",ret);
 	return ret;
 
 } /* end cachefs_vj_alloc() */
@@ -116,7 +116,7 @@
  */
 void cachefs_vj_release(struct cachefs_super *super, struct cachefs_vj_entry *vjentry)
 {
-	kenter("");
+	_enter("");
 
 	spin_lock(&super->vjnl_lock);
 	clear_bit(vjentry->vslot,super->vjnl_map);
@@ -129,7 +129,7 @@
 	cachefs_block_put(vjentry->vblock);
 	kfree(vjentry);
 
-	kleave("");
+	_leave("");
 } /* end cachefs_vj_release() */
 
 /*****************************************************************************/
@@ -141,7 +141,7 @@
 	struct cachefs_vj_entry *vjentry = block->vjentry;
 	struct cachefs_super *super;
 
-	kenter("{vs=%u pg={%u}+%u up={%u}+%u",
+	_enter("{vs=%u pg={%u}+%u up={%u}+%u",
 	       vjentry->vslot,vjentry->ino,vjentry->pgnum,vjentry->upblock,vjentry->upentry);
 
 	block->vjentry = NULL;
@@ -153,7 +153,7 @@
 
 	wake_up(&super->dmn_sleepq);
 
-	kleave("");
+	_leave("");
 } /* end cachefs_vj_write_complete() */
 
 /*****************************************************************************/
@@ -164,7 +164,7 @@
 {
 	struct cachefs_super *super;
 
-	kenter("{vs=%u pg={%u}+%u up={%u}+%u",
+	_enter("{vs=%u pg={%u}+%u up={%u}+%u",
 	       vjentry->vslot,vjentry->ino,vjentry->pgnum,vjentry->upblock,vjentry->upentry);
 
 	super = vjentry->vblock->super;
@@ -175,7 +175,7 @@
 
 	wake_up(&super->dmn_sleepq);
 
-	kleave("");
+	_leave("");
 } /* end cachefs_vj_cancel() */
 
 /*****************************************************************************/
@@ -189,7 +189,7 @@
 	struct cachefs_vj_entry *vjentry;
 	int ret;
 
-	kenter("");
+	_enter("");
 
 	BUG_ON(list_empty(&super->vjnl_writtenq));
 
@@ -227,12 +227,12 @@
 	spin_unlock(&super->vjnl_lock);
 
 	cachefs_vj_release(super,vjentry);
-	kleave("");
+	_leave("");
 	return;
 
  error_free:
 	cachefs_trans_put(trans);
  error:
-	kleave(" [error %d]",ret);
+	_leave(" [error %d]",ret);
 
 } /* end cachefs_vj_note_write_completion() */