[Ocfs2-commits] mfasheh commits r1737 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2005-01-03 16:17:07 -0600 (Mon, 03 Jan 2005)
New Revision: 1737

Modified:
   trunk/src/dlmglue.c
Log:
* more tracing

* fix a bug in ocfs2_build_lock_name



Modified: trunk/src/dlmglue.c
===================================================================
--- trunk/src/dlmglue.c	2004-12-31 00:47:47 UTC (rev 1736)
+++ trunk/src/dlmglue.c	2005-01-03 22:17:07 UTC (rev 1737)
@@ -280,7 +280,7 @@
 	}
 	memset(name, 0, OCFS2_LOCK_ID_MAX_LEN);
 
-	len = snprintf(name, OCFS2_LOCK_ID_MAX_LEN - 1, "%c%s%016llx%08x", 
+	len = snprintf(name, OCFS2_LOCK_ID_MAX_LEN, "%c%s%016llx%08x", 
 		       ocfs2_lock_type_char[type], OCFS2_LOCK_ID_PAD, blkno, 
 		       generation);
 
@@ -623,7 +623,7 @@
 	osb = OCFS2_SB(inode->i_sb);
 
 #ifdef VERBOSE_LOCKING_TRACE
-	printk("(%u) BAST fired for inode %llu, blocking = %d, level = %d"
+	printk("(%u) BAST fired for inode %llu, blocking = %d, level = %d "
 	       "type = %s\n", current->pid, OCFS_I(inode)->ip_blkno, level,
 	       lockres->l_level, 
 	       (lockres->l_type == OCFS_TYPE_META) ? "Meta" : "Data");
@@ -2031,6 +2031,11 @@
 	OCFS_ASSERT(lockres->l_ops);
 	OCFS_ASSERT(lockres->l_ops->unblock);
 
+#ifdef VERBOSE_LOCKING_TRACE
+	printk("(%u) ocfs2_process_blocked_lock: lockres %s blocked.\n",
+	       current->pid, lockres->l_name);
+#endif
+
 	status = lockres->l_ops->unblock(lockres, &requeue);
 	if (status < 0)
 		LOG_ERROR_STATUS(status);
@@ -2038,6 +2043,11 @@
 	if (requeue)
 		ocfs2_schedule_blocked_lock(osb, lockres);
 
+#ifdef VERBOSE_LOCKING_TRACE
+	printk("(%u) ocfs2_process_blocked_lock: lockres %s, requeue = %s.\n",
+	       current->pid, lockres->l_name, requeue ? "yes" : "no");
+#endif
+
 	LOG_EXIT();
 }