From: phil <phil>
Date: Sat, 12 Feb 2005 23:15:20 +0000 (+0000)
Subject: brown paper bag bug in the lock cleanups; I'm amazed this passed as many tests
X-Git-Tag: v1_8_0_110~486^5~25
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=464521e859212da27c5776d3a39f31c4c5f5fef3;p=fs%2Flustre-release.git

brown paper bag bug in the lock cleanups; I'm amazed this passed as many tests
as it did, but here we are.
---

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) {