From 0ed112766c43932524548b2bc686f137426617a2 Mon Sep 17 00:00:00 2001 From: adilger Date: Sat, 20 Mar 2004 04:25:06 +0000 Subject: [PATCH] If we're going to LBUG on referenced lock, we may as well print an error. Dump names of locks in dump instead of number (which changed recently). --- lustre/ldlm/ldlm_lock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c index b5b0e33..7ae1295 100644 --- a/lustre/ldlm/ldlm_lock.c +++ b/lustre/ldlm/ldlm_lock.c @@ -1029,8 +1029,7 @@ void ldlm_lock_cancel(struct ldlm_lock *lock) /* Please do not, no matter how tempting, remove this LBUG without * talking to me first. -phik */ if (lock->l_readers || lock->l_writers) { - LDLM_DEBUG(lock, "lock still has references"); - ldlm_lock_dump(D_OTHER, lock, 0); + LDLM_ERROR(lock, "lock still has references"); LBUG(); } @@ -1165,8 +1164,9 @@ void ldlm_lock_dump(int level, struct ldlm_lock *lock, int pos) CDEBUG(level, " Resource: %p ("LPU64"/"LPU64")\n", lock->l_resource, lock->l_resource->lr_name.name[0], lock->l_resource->lr_name.name[1]); - CDEBUG(level, " Req mode: %d, grant mode: %d, rc: %u, read: %d, " - "write: %d\n", (int)lock->l_req_mode, (int)lock->l_granted_mode, + CDEBUG(level, " Req mode: %s, grant mode: %s, rc: %u, read: %d, " + "write: %d\n", ldlm_lockname[lock->l_req_mode], + ldlm_lockname[lock->l_granted_mode], atomic_read(&lock->l_refc), lock->l_readers, lock->l_writers); if (lock->l_resource->lr_type == LDLM_EXTENT) CDEBUG(level, " Extent: "LPU64" -> "LPU64 -- 1.8.3.1