From 7cd12b5e4867b7eb36b691f14443324195573ddf Mon Sep 17 00:00:00 2001 From: Mikhal Pershin Date: Mon, 13 Nov 2017 17:10:52 +0300 Subject: [PATCH] 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 Change-Id: Iff2c9723959db591fdd29074b0186d8ddf0752e9 Reviewed-on: https://review.whamcloud.com/30058 Tested-by: Jenkins Reviewed-by: Andreas Dilger Tested-by: Maloo Reviewed-by: Lai Siyao Reviewed-by: Oleg Drokin --- lustre/mdt/mdt_open.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) 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: -- 1.8.3.1