From 8dabd2140ce60be4a2451db34817e875e4cc9ddc Mon Sep 17 00:00:00 2001
From: vitaly <vitaly>
Date: Thu, 6 Sep 2007 12:51:09 +0000
Subject: [PATCH] Branch b1_6 b=13060 i=huanghua i=tappro

put the lock after unlocking the resource
---
 lustre/ldlm/ldlm_lockd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 15bd1b874e..4145ff4800 100644
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -1507,8 +1507,8 @@ static int ldlm_callback_handler(struct ptlrpc_request *req)
                         LDLM_DEBUG(lock, "callback on lock "
                                    LPX64" - lock disappeared\n",
                                    dlm_req->lock_handle[0].cookie);
-                        LDLM_LOCK_PUT(lock);
                         unlock_res_and_lock(lock);
+                        LDLM_LOCK_PUT(lock);
                         ldlm_callback_reply(req, -EINVAL);
                         RETURN(0);
                 }
-- 
GitLab