[Ocfs2-commits] jlbec commits r891 - trunk/src

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-05-04 19:12:43 -0500 (Tue, 04 May 2004)
New Revision: 891

Modified:
   trunk/src/journal.c
   trunk/src/lockres.c
   trunk/src/namei.c
   trunk/src/nm.c
Log:

Fix a couple format strings.



Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c	2004-05-04 23:27:54 UTC (rev 890)
+++ trunk/src/journal.c	2004-05-05 00:12:43 UTC (rev 891)
@@ -779,7 +779,7 @@
 {
 	ocfs_journal_lock *lock;
 
-	LOG_ENTRY_ARGS("(id=%u, type=%u, flags=%u, bh=%p)\n", bh->b_blocknr, type, flags, bh);
+	LOG_ENTRY_ARGS("(id=%lu, type=%u, flags=%u, bh=%p)\n", bh->b_blocknr, type, flags, bh);
 
 	lock = ocfs_malloc(sizeof(ocfs_journal_lock));
 	if (lock == NULL) {

Modified: trunk/src/lockres.c
===================================================================
--- trunk/src/lockres.c	2004-05-04 23:27:54 UTC (rev 890)
+++ trunk/src/lockres.c	2004-05-05 00:12:43 UTC (rev 891)
@@ -51,7 +51,7 @@
 	int flags;
 	ocfs_lock_res *lockres = GET_INODE_LOCKRES(inode);
 
-	LOG_ENTRY_ARGS ("(0x%08x, %llu, 0x%08x, 0x%08x, 0x%08x)\n", osb,
+	LOG_ENTRY_ARGS ("(0x%p, %llu, 0x%p, 0x%p, 0x%p)\n", osb,
 			lock_id, lockres, bh, updated);
 
 	b = (bh == NULL) ? &tmpbh : bh;
@@ -124,7 +124,7 @@
 	int status = 0;
 	int cnt = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %d)\n", lockres, timeout);
+	LOG_ENTRY_ARGS ("(0x%p, %u)\n", lockres, timeout);
 
 	mypid = ocfs_getpid ();
 
@@ -178,11 +178,11 @@
  */
 void ocfs_release_lockres (ocfs_lock_res * lockres)
 {
-	LOG_ENTRY_ARGS ("(0x%08x)\n", lockres);
+	LOG_ENTRY_ARGS ("(0x%p)\n", lockres);
 
 	spin_lock (&lockres->lock_mutex);
 	if (lockres->in_use == 0) {
-		LOG_ERROR_ARGS("Releasing lockres with inuse 0: 0x%08x\n", lockres);
+		LOG_ERROR_ARGS("Releasing lockres with inuse 0: 0x%p\n", lockres);
 		BUG();
 	} else {
 		if (lockres->thread_id != current->pid)
@@ -208,7 +208,7 @@
 {
 	ocfs_lock_res *lockres = GET_INODE_LOCKRES(inode);
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x)\n", osb, lockres);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p)\n", osb, lockres);
 
 	lockres->lock_type = OCFS_DLM_NO_LOCK;
 	lockres->master_node_num = OCFS_INVALID_NODE_NUM;

Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c	2004-05-04 23:27:54 UTC (rev 890)
+++ trunk/src/namei.c	2004-05-05 00:12:43 UTC (rev 891)
@@ -798,7 +798,7 @@
 	}
 
 	up(&journal->commit_sem);
-bail:
+
 	LOG_EXIT_STATUS(status);
 	return(status);
 }

Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c	2004-05-04 23:27:54 UTC (rev 890)
+++ trunk/src/nm.c	2004-05-05 00:12:43 UTC (rev 891)
@@ -1343,9 +1343,7 @@
 	ocfs_super *osb = ctxt->osb;
 	ocfs_lock_res *lockres = ctxt->lockres;
 	struct inode *inode = ctxt->inode;
-	__u64 map;
 	int status = 0;
-	siginfo_t info;
 	bool yield = ctxt->yield;
 
 	if (yield) {