LU-12321 mdc: allow ELC for DOM file unlink

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

diff --git a/lustre/mdc/mdc_reint.c b/lustre/mdc/mdc_reint.c
index 79473e8..f32d2fb 100644 (file)
--- a/lustre/mdc/mdc_reint.c
+++ b/lustre/mdc/mdc_reint.c
@@ -46,9 +46,9 @@ static int mdc_reint(struct ptlrpc_request *request, int level)
 
         request->rq_send_state = level;
 
-       mdc_get_mod_rpc_slot(request, NULL);
+       ptlrpc_get_mod_rpc_slot(request);
        rc = ptlrpc_queue_wait(request);
-       mdc_put_mod_rpc_slot(request, NULL);
+       ptlrpc_put_mod_rpc_slot(request);
         if (rc)
                 CDEBUG(D_INFO, "error in handling %d\n", rc);
         else if (!req_capsule_server_get(&request->rq_pill, &RMF_MDT_BODY)) {
@@ -294,10 +294,13 @@ int mdc_unlink(struct obd_export *exp, struct md_op_data *op_data,
                                                MDS_INODELOCK_UPDATE);
        if ((op_data->op_flags & MF_MDC_CANCEL_FID3) &&
            (fid_is_sane(&op_data->op_fid3)))
-               /* don't cancel DoM lock which may cause data flush */
+               /* cancel DOM lock only if it has no data to flush */
                count += mdc_resource_get_unused(exp, &op_data->op_fid3,
                                                 &cancels, LCK_EX,
-                                                MDS_INODELOCK_ELC);
+                                                op_data->op_cli_flags &
+                                                CLI_DIRTY_DATA ?
+                                                MDS_INODELOCK_ELC :
+                                                MDS_INODELOCK_FULL);
         req = ptlrpc_request_alloc(class_exp2cliimp(exp),
                                    &RQF_MDS_REINT_UNLINK);
         if (req == NULL) {
@@ -503,7 +506,7 @@ int mdc_file_resync(struct obd_export *exp, struct md_op_data *op_data)
                RETURN(rc);
        }
 
-       CLASSERT(sizeof(*rec) == sizeof(struct mdt_rec_reint));
+       BUILD_BUG_ON(sizeof(*rec) != sizeof(struct mdt_rec_reint));
        rec = req_capsule_client_get(&req->rq_pill, &RMF_REC_REINT);
        rec->rs_opcode  = REINT_RESYNC;
        rec->rs_fsuid   = op_data->op_fsuid;