From 464521e859212da27c5776d3a39f31c4c5f5fef3 Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 12 Feb 2005 23:15:20 +0000 Subject: [PATCH] brown paper bag bug in the lock cleanups; I'm amazed this passed as many tests as it did, but here we are. --- lustre/ldlm/ldlm_lock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c index ad3cb9a..9f18891 100644 --- a/lustre/ldlm/ldlm_lock.c +++ b/lustre/ldlm/ldlm_lock.c @@ -1022,12 +1022,12 @@ void ldlm_lock_cancel(struct ldlm_lock *lock) struct ldlm_namespace *ns; ENTRY; - l_lock(&ns->ns_lock); - ldlm_del_waiting_lock(lock); - res = lock->l_resource; ns = res->lr_namespace; + l_lock(&ns->ns_lock); + ldlm_del_waiting_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) { -- 1.8.3.1