LU-15644 llog: don't replace llog error with -ENOTDIR

[fs/lustre-release.git] / lustre / mdc / mdc_batch.c

diff --git a/lustre/mdc/mdc_batch.c b/lustre/mdc/mdc_batch.c
index c2ebd17..33d935d 100644 (file)
--- a/lustre/mdc/mdc_batch.c
+++ b/lustre/mdc/mdc_batch.c
@@ -126,7 +126,7 @@ static int mdc_batch_getattr_pack(struct batch_update_head *head,
        easize = MAX_MD_SIZE_OLD; /* obd->u.cli.cl_default_mds_easize; */
 
        /* pack the intended request */
-       mdc_getattr_pack(&pill, valid, it->it_flags, op_data, easize);
+       mdc_getattr_pack(&pill, valid, it->it_open_flags, op_data, easize);
 
        item->mop_lock_flags |= LDLM_FL_HAS_INTENT;
        rc = mdc_ldlm_lock_pack(head->buh_exp, &pill, &policy,
@@ -185,6 +185,7 @@ static int mdc_batch_getattr_interpret(struct ptlrpc_request *req,
        struct batch_update_head *head = ouc->ouc_head;
        struct obd_export *exp = head->buh_exp;
        struct req_capsule *pill = item->mop_pill;
+       struct ldlm_reply *lockrep;
 
        req_capsule_subreq_init(pill, &RQF_BUT_GETATTR, req,
                                NULL, repmsg, RCL_CLIENT);
@@ -194,6 +195,12 @@ static int mdc_batch_getattr_interpret(struct ptlrpc_request *req,
        if (rc)
                GOTO(out, rc);
 
+       lockrep = req_capsule_server_get(pill, &RMF_DLM_REP);
+       LASSERT(lockrep != NULL);
+
+       lockrep->lock_policy_res2 =
+               ptlrpc_status_ntoh(lockrep->lock_policy_res2);
+
        rc = mdc_finish_enqueue(exp, pill, einfo, &item->mop_it,
                                &item->mop_lockh, rc);
 out: