From: tappro <tappro>
Date: Sat, 23 Sep 2006 14:36:34 +0000 (+0000)
Subject: - fix unlock without lock issue
X-Git-Tag: v1_8_0_110~486^2~850
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=c595947c31e3c78a5e77c4116f87f28b91309b9c;p=fs%2Flustre-release.git

- fix unlock without lock issue
---

diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c
index 9f9603c..1b95dbf 100644
--- a/lustre/mdt/mdt_reint.c
+++ b/lustre/mdt/mdt_reint.c
@@ -515,6 +515,7 @@ out_unlock_tgt:
 out_unlock_tgtdir:
         mdt_object_unlock_put(info, mtgtdir, lh_tgtdir, rc);
 out:
+        mdt_shrink_reply(info, REPLY_REC_OFF + 1);
         return rc;
 }
 
@@ -625,7 +626,7 @@ static int mdt_reint_rename(struct mdt_thread_info *info,
         if (rc == 1) {
         /* if (rr->rr_name[0] == 0) {*/
                 rc = mdt_reint_rename_tgt(info);
-                GOTO(out, rc);
+                RETURN(rc);
         }
 
         rc = mdt_rename_lock(info, &rename_lh);