Branch b1_6

b=13060
i=huanghua
i=tappro

put the lock after unlocking the resource

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 15bd1b8..4145ff4 100644 (file)
--- 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);
                 }