From: huanghua <huanghua>
Date: Fri, 13 Oct 2006 09:42:51 +0000 (+0000)
Subject: remove lock recursion.
X-Git-Tag: v1_8_0_110~486^2~559
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=503388eff73da7190723444b728afcf4d1c52582;p=fs%2Flustre-release.git

remove lock recursion.
---

diff --git a/lustre/mdd/mdd_handler.c b/lustre/mdd/mdd_handler.c
index 3492f60..a49f484 100644
--- a/lustre/mdd/mdd_handler.c
+++ b/lustre/mdd/mdd_handler.c
@@ -1841,8 +1841,7 @@ static int mdd_parent_fid(const struct lu_env *env,
                           struct mdd_object *obj,
                           struct lu_fid *fid)
 {
-        return __mdd_lookup_locked(env, &obj->mod_obj,
-                                   dotdot, fid, 0);
+        return __mdd_lookup(env, &obj->mod_obj, dotdot, fid, 0);
 }
 
 /*
@@ -2575,7 +2574,7 @@ static int mdd_object_create(const struct lu_env *env,
         mdd_write_lock(env, mdd_obj);
         rc = __mdd_object_create(env, mdd_obj, ma, handle);
         if (rc)
-                GOTO (unlock, rc);
+                GOTO(unlock, rc);
 
         if (spec->sp_cr_flags & MDS_CREATE_SLAVE_OBJ) {
                 /* if creating the slave object, set slave EA here */