X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_handler.c;h=3c558ae5fd367bd7be8bee5bbedb393e6cf5d2ef;hp=276ddfdcbea4271f0849fad3b788185b97f6f99d;hb=a1052417b78bc18898161c4ed44d79de4a1a2f23;hpb=7cd460776da349643f53cda4c5d4e927316b666e

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index 276ddfd..3c558ae 100644
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -1329,35 +1329,33 @@ static int mdt_getattr_name_lock(struct mdt_thread_info *info,
          */
         child = mdt_object_find(info->mti_env, info->mti_mdt, child_fid);
 
-        if (unlikely(IS_ERR(child)))
-                GOTO(out_parent, rc = PTR_ERR(child));
-        if (is_resent) {
-                /* Do not take lock for resent case. */
-                lock = ldlm_handle2lock(&lhc->mlh_reg_lh);
-                LASSERTF(lock != NULL, "Invalid lock handle "LPX64"\n",
-                         lhc->mlh_reg_lh.cookie);
-
-                res_id = &lock->l_resource->lr_name;
-                if (!fid_res_name_eq(mdt_object_fid(child),
-                                    &lock->l_resource->lr_name)) {
-                         LASSERTF(fid_res_name_eq(mdt_object_fid(parent),
-                                                 &lock->l_resource->lr_name),
-                                 "Lock res_id: %lu/%lu/%lu, Fid: "DFID".\n",
-                                 (unsigned long)res_id->name[0],
-                                 (unsigned long)res_id->name[1],
-                                 (unsigned long)res_id->name[2],
-                                 PFID(mdt_object_fid(parent)));
-                          CWARN("Although resent, but still not get child lock"
-                                "parent:"DFID" child:"DFID"\n",
-                                PFID(mdt_object_fid(parent)),
-                                PFID(mdt_object_fid(child)));
-                          lustre_msg_clear_flags(req->rq_reqmsg, MSG_RESENT);
-                          LDLM_LOCK_PUT(lock);
-                          GOTO(relock, 0);
-                }
-                LDLM_LOCK_PUT(lock);
-                rc = 0;
-        } else {
+	if (unlikely(IS_ERR(child)))
+		GOTO(out_parent, rc = PTR_ERR(child));
+	if (is_resent) {
+		/* Do not take lock for resent case. */
+		lock = ldlm_handle2lock(&lhc->mlh_reg_lh);
+		LASSERTF(lock != NULL, "Invalid lock handle "LPX64"\n",
+			 lhc->mlh_reg_lh.cookie);
+
+		res_id = &lock->l_resource->lr_name;
+		if (!fid_res_name_eq(mdt_object_fid(child),
+				     &lock->l_resource->lr_name)) {
+			LASSERTF(fid_res_name_eq(mdt_object_fid(parent),
+						 &lock->l_resource->lr_name),
+				 "Lock res_id: "DLDLMRES", fid: "DFID"\n",
+				 PLDLMRES(lock->l_resource),
+				 PFID(mdt_object_fid(parent)));
+			CWARN("Although resent, but still not get child lock"
+			      "parent:"DFID" child:"DFID"\n",
+			      PFID(mdt_object_fid(parent)),
+			      PFID(mdt_object_fid(child)));
+			lustre_msg_clear_flags(req->rq_reqmsg, MSG_RESENT);
+			LDLM_LOCK_PUT(lock);
+			GOTO(relock, 0);
+		}
+		LDLM_LOCK_PUT(lock);
+		rc = 0;
+	} else {
 		bool try_layout = false;
 
 relock:
@@ -1439,17 +1437,15 @@ relock:
         rc = mdt_getattr_internal(info, child, ma_need);
         if (unlikely(rc != 0)) {
                 mdt_object_unlock(info, child, lhc, 1);
-        } else if (lock) {
-                /* Debugging code. */
-                res_id = &lock->l_resource->lr_name;
-                LDLM_DEBUG(lock, "Returning lock to client");
-                LASSERTF(fid_res_name_eq(mdt_object_fid(child),
-                                         &lock->l_resource->lr_name),
-                         "Lock res_id: %lu/%lu/%lu, Fid: "DFID".\n",
-                         (unsigned long)res_id->name[0],
-                         (unsigned long)res_id->name[1],
-                         (unsigned long)res_id->name[2],
-                         PFID(mdt_object_fid(child)));
+	} else if (lock) {
+		/* Debugging code. */
+		res_id = &lock->l_resource->lr_name;
+		LDLM_DEBUG(lock, "Returning lock to client");
+		LASSERTF(fid_res_name_eq(mdt_object_fid(child),
+					 &lock->l_resource->lr_name),
+			 "Lock res_id: "DLDLMRES", fid: "DFID"\n",
+			 PLDLMRES(lock->l_resource),
+			 PFID(mdt_object_fid(child)));
 		if (mdt_object_exists(child) && !mdt_object_remote(child))
 			mdt_pack_size2body(info, child);
         }