[Ocfs2-commits] khackel commits r2531 - trunk/fs/ocfs2/dlm

[svn-commits at oss.oracle.com]

Author: khackel
Signed-off-by: mfasheh
Date: 2005-08-18 20:09:10 -0500 (Thu, 18 Aug 2005)
New Revision: 2531

Modified:
   trunk/fs/ocfs2/dlm/dlmmaster.c
Log:
* remove noisy dlm_print_one_mle in dlm_wait_for_lock_mastery
* remove dead code (dlm_lockres_asts_flushed)

Signed-off-by: mfasheh



Modified: trunk/fs/ocfs2/dlm/dlmmaster.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmmaster.c	2005-08-19 00:39:10 UTC (rev 2530)
+++ trunk/fs/ocfs2/dlm/dlmmaster.c	2005-08-19 01:09:10 UTC (rev 2531)
@@ -845,7 +845,6 @@
 		m = dlm->node_num;
 		mlog(0, "about to master %.*s here, this=%u\n",
 		     res->lockname.len, res->lockname.name, m);
-		dlm_print_one_mle(mle);
 		ret = dlm_do_assert_master(dlm, res->lockname.name,
 					   res->lockname.len, mle->vote_map, 0);
 		if (ret) {
@@ -1912,32 +1911,6 @@
 	return ret;
 }
 
-static int dlm_lockres_asts_flushed(struct dlm_ctxt *dlm,
-				    struct dlm_lock_resource *res)
-{
-	int ret = 1;
-	int i;
-	struct list_head *queue, *iter;
-	struct dlm_lock *lock;
-
-	spin_lock(&res->spinlock);
-
-	for (i=DLM_GRANTED_LIST; i<=DLM_BLOCKED_LIST; i++) {
-		queue = dlm_list_idx_to_ptr(res, i);
-		list_for_each(iter, queue) {
-			lock = list_entry(iter, struct dlm_lock, list);
-			if (!list_empty(&lock->ast_list) ||
-			    !list_empty(&lock->bast_list)) {
-				ret = 0;
-				goto leave;
-			}
-		}
-	}	
-leave:
-	spin_unlock(&res->spinlock);
-	return ret;
-}
-
 static int dlm_migration_can_proceed(struct dlm_ctxt *dlm,
 				     struct dlm_lock_resource *res,
 				     u8 mig_target)