From: Mikhal Pershin <mike.pershin@intel.com>
Date: Mon, 13 Nov 2017 14:10:52 +0000 (+0300)
Subject: LU-3285 mdt: remove assertion on mdt_pack_size2body()
X-Git-Tag: 2.10.56~32
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F58%2F30058%2F3;p=fs%2Flustre-release.git

LU-3285 mdt: remove assertion on mdt_pack_size2body()

The assertion on result of mdt_pack_size2body() is not
always correct, e.g. in case of resend.

Test-Parameters: mdssizegb=20 testlist=sanity-dom,dom-performance
Signed-off-by: Mikhal Pershin <mike.pershin@intel.com>
Change-Id: Iff2c9723959db591fdd29074b0186d8ddf0752e9
Reviewed-on: https://review.whamcloud.com/30058
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Lai Siyao <lai.siyao@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c
index 2b6ee7d..7ec1c21 100644
--- a/lustre/mdt/mdt_open.c
+++ b/lustre/mdt/mdt_open.c
@@ -1140,12 +1140,9 @@ out_unlock:
 		mdt_object_open_unlock(info, o, lhc, ibits, rc);
 out:
 	mdt_object_put(env, o);
-	if (rc == 0) {
-		rc = mdt_pack_size2body(info, rr->rr_fid2,
-					ibits & MDS_INODELOCK_DOM);
-		LASSERT(ergo(ibits & MDS_INODELOCK_DOM, !rc));
-		rc = 0;
-	}
+	if (rc == 0)
+		mdt_pack_size2body(info, rr->rr_fid2,
+				   ibits & MDS_INODELOCK_DOM);
 out_parent_put:
 	if (parent != NULL)
 		mdt_object_put(env, parent);
@@ -1602,12 +1599,8 @@ out_child_unlock:
 		mdt_object_open_unlock(info, child, lhc, ibits, result);
 out_child:
 	mdt_object_put(info->mti_env, child);
-	if (result == 0) {
-		rc = mdt_pack_size2body(info, child_fid,
-					ibits & MDS_INODELOCK_DOM);
-		LASSERT(ergo(ibits & MDS_INODELOCK_DOM, !rc));
-		rc = 0;
-	}
+	if (result == 0)
+		mdt_pack_size2body(info, child_fid, ibits & MDS_INODELOCK_DOM);
 out_parent:
 	mdt_object_unlock_put(info, parent, lh, result || !created);
 out: