From: Yang Sheng Date: Fri, 27 Nov 2020 14:57:51 +0000 (+0800) Subject: LU-14155 mdc: avoid easize set to 0 X-Git-Tag: 2.13.57~8 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=ff35e27da4c76bc93c7641ef54d425d77e821e9f;hp=fc61ddc252156cef5a21cefd82362bcdd77f3a51 LU-14155 mdc: avoid easize set to 0 The cl_default_mds_easize could be set to 0 in some case. Then check it before package. Fixes: 3ec712bd183a ("LU-11868 osd: Set max ea size to XATTR_SIZE_MAX") Signed-off-by: Yang Sheng Change-Id: Icc045bfba345a61dd7904bfc7772930fd737334e Reviewed-on: https://review.whamcloud.com/40785 Tested-by: jenkins Reviewed-by: Andreas Dilger Reviewed-by: Mike Pershin Tested-by: Maloo --- diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c index 496110b..e9c794e 100644 --- a/lustre/mdc/mdc_locks.c +++ b/lustre/mdc/mdc_locks.c @@ -560,7 +560,10 @@ mdc_intent_getattr_pack(struct obd_export *exp, struct lookup_intent *it, lit = req_capsule_client_get(&req->rq_pill, &RMF_LDLM_INTENT); lit->opc = (__u64)it->it_op; - easize = obd->u.cli.cl_default_mds_easize; + if (obd->u.cli.cl_default_mds_easize > 0) + easize = obd->u.cli.cl_default_mds_easize; + else + easize = obd->u.cli.cl_max_mds_easize; /* pack the intended request */ mdc_getattr_pack(req, valid, it->it_flags, op_data, easize);