[Ocfs2-commits] mfasheh commits r1604 - branches/dlm-glue/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-10-28 20:33:20 -0500 (Thu, 28 Oct 2004)
New Revision: 1604

Modified:
   branches/dlm-glue/src/dlmglue.c
Log:
* remove a pair of incorrect asserts.

* put the printks inside of a debug define for now.



Modified: branches/dlm-glue/src/dlmglue.c
===================================================================
--- branches/dlm-glue/src/dlmglue.c	2004-10-28 23:02:46 UTC (rev 1603)
+++ branches/dlm-glue/src/dlmglue.c	2004-10-29 01:33:20 UTC (rev 1604)
@@ -231,8 +231,9 @@
 
 	OCFS_ASSERT(len = (OCFS2_LOCK_ID_MAX_LEN - 1));
 
+#ifdef OCFS2_VERBOSE_LOCKING_TRACE
 	printk("built lock resource with name: %s\n", name);
-
+#endif
 	*ret = name;
 bail:
 	LOG_EXIT();
@@ -427,7 +428,9 @@
 	struct inode *inode = lockres->lr_inode;
 	dlm_lockstatus *lksb;
 
+#ifdef OCFS2_VERBOSE_LOCKING_TRACE
 	printk("AST fired for inode %llu\n", OCFS_I(inode)->ip_blkno);
+#endif
 	OCFS_ASSERT(lock == &lockres->lr_meta || 
 		    lock == &lockres->lr_data);
 	OCFS_ASSERT(lock->l_type == OCFS_TYPE_META ||
@@ -472,7 +475,9 @@
 	struct inode *inode = lockres->lr_inode;
 	ocfs_super *osb = OCFS2_SB(inode->i_sb);
 
+#ifdef OCFS2_VERBOSE_LOCKING_TRACE
 	printk("BAST fired for inode %llu\n", OCFS_I(inode)->ip_blkno);
+#endif
 	spin_lock(&lockres->lr_lock);
 	lock->l_flags |= OCFS2_LOCK_BLOCKED;
 	if (level > lock->l_blocking)
@@ -928,8 +933,10 @@
 		ocfs_refresh_inode(inode, fe);
 	}
 
+#ifdef OCFS2_VERBOSE_LOCKING_TRACE
 	printk("inode %llu, I can only trust %u clusters\n",
 	       OCFS_I(inode)->ip_blkno, trustable_clusters);
+#endif
 
 	ocfs2_extent_map_trunc(inode, trustable_clusters);
 
@@ -1120,8 +1127,6 @@
 	dlm_status status;
 
 	spin_lock(&lockres->lr_lock);
-	OCFS_ASSERT(!lock->l_ex_holders);
-	OCFS_ASSERT(!lock->l_ro_holders);
 
 	if (lock->l_flags & OCFS2_LOCK_BUSY)
 		printk("ocfs2: destroying busy lock!\n");
@@ -1537,23 +1542,16 @@
 		}
 		spin_unlock(&osb->vote_task_lock);
 
-//#define OCFS2_VOTE_THREAD_TIMEOUT (HZ >> 1)
-//		wait_event_interruptible_timeout(osb->vote_event,
-//						 atomic_read(
-//							 &osb->wake_vote_task),
-//						 OCFS2_VOTE_THREAD_TIMEOUT);
 		wait_event_interruptible(osb->vote_event,
 					 atomic_read(&osb->wake_vote_task));
 
 		atomic_set(&osb->wake_vote_task, 0);
-
+#ifdef OCFS2_VERBOSE_LOCKING_TRACE
 		printk("(%u) vote_thread: awoken\n", current->pid);
-
+#endif
 		ocfs2_vote_thread_do_work(osb);
-
 		spin_lock(&osb->vote_task_lock);
 	}
-	printk("(%u) vote_thread: exiting\n", current->pid);
 
 	osb->vote_task = NULL;
 	spin_unlock(&osb->vote_task_lock);