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 b8331e6..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)) {
@@ -60,15 +60,16 @@ static int mdc_reint(struct ptlrpc_request *request, int level)
 /* Find and cancel locally locks matched by inode @bits & @mode in the resource
  * found by @fid. Found locks are added into @cancel list. Returns the amount of
  * locks added to @cancels list. */
-int mdc_resource_get_unused(struct obd_export *exp, const struct lu_fid *fid,
-                           struct list_head *cancels, enum ldlm_mode mode,
-                           __u64 bits)
+int mdc_resource_get_unused_res(struct obd_export *exp,
+                               struct ldlm_res_id *res_id,
+                               struct list_head *cancels,
+                               enum ldlm_mode mode, __u64 bits)
 {
        struct ldlm_namespace *ns = exp->exp_obd->obd_namespace;
-       union ldlm_policy_data policy = { {0} };
-       struct ldlm_res_id res_id;
+       union ldlm_policy_data policy = { { 0 } };
        struct ldlm_resource *res;
        int count;
+
        ENTRY;
 
        /* Return, i.e. cancel nothing, only if ELC is supported (flag in
@@ -80,25 +81,33 @@ int mdc_resource_get_unused(struct obd_export *exp, const struct lu_fid *fid,
        if (exp_connect_cancelset(exp) && !ns_connect_cancelset(ns))
                RETURN(0);
 
-       fid_build_reg_res_name(fid, &res_id);
-       res = ldlm_resource_get(exp->exp_obd->obd_namespace,
-                               NULL, &res_id, 0, 0);
+       res = ldlm_resource_get(ns, NULL, res_id, 0, 0);
        if (IS_ERR(res))
                RETURN(0);
        LDLM_RESOURCE_ADDREF(res);
        /* Initialize ibits lock policy. */
        policy.l_inodebits.bits = bits;
-       count = ldlm_cancel_resource_local(res, cancels, &policy,
-                                          mode, 0, 0, NULL);
+       count = ldlm_cancel_resource_local(res, cancels, &policy, mode, 0, 0,
+                                          NULL);
        LDLM_RESOURCE_DELREF(res);
        ldlm_resource_putref(res);
        RETURN(count);
 }
 
+int mdc_resource_get_unused(struct obd_export *exp, const struct lu_fid *fid,
+                           struct list_head *cancels, enum ldlm_mode mode,
+                           __u64 bits)
+{
+       struct ldlm_res_id res_id;
+
+       fid_build_reg_res_name(fid, &res_id);
+       return mdc_resource_get_unused_res(exp, &res_id, cancels, mode, bits);
+}
+
 int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data,
                void *ea, size_t ealen, struct ptlrpc_request **request)
 {
-       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);
         struct ptlrpc_request *req;
         int count = 0, rc;
         __u64 bits;
@@ -160,7 +169,7 @@ int mdc_create(struct obd_export *exp, struct md_op_data *op_data,
         int count, resends = 0;
         struct obd_import *import = exp->exp_obd->u.cli.cl_import;
         int generation = import->imp_generation;
-       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);
         ENTRY;
 
        /* For case if upper layer did not alloc fid, do it now. */
@@ -270,7 +279,7 @@ rebuild:
 int mdc_unlink(struct obd_export *exp, struct md_op_data *op_data,
                struct ptlrpc_request **request)
 {
-       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);
         struct obd_device *obd = class_exp2obd(exp);
         struct ptlrpc_request *req = *request;
         int count = 0, rc;
@@ -285,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) {
@@ -332,7 +344,7 @@ int mdc_unlink(struct obd_export *exp, struct md_op_data *op_data,
 int mdc_link(struct obd_export *exp, struct md_op_data *op_data,
              struct ptlrpc_request **request)
 {
-       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);
         struct ptlrpc_request *req;
         int count = 0, rc;
         ENTRY;
@@ -388,7 +400,7 @@ int mdc_rename(struct obd_export *exp, struct md_op_data *op_data,
                const char *old, size_t oldlen, const char *new, size_t newlen,
                struct ptlrpc_request **request)
 {
-       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);
        struct obd_device *obd = exp->exp_obd;
        struct ptlrpc_request *req;
        int count = 0, rc;
@@ -468,7 +480,7 @@ int mdc_rename(struct obd_export *exp, struct md_op_data *op_data,
 
 int mdc_file_resync(struct obd_export *exp, struct md_op_data *op_data)
 {
-       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);
        struct ptlrpc_request *req;
        struct ldlm_lock *lock;
        struct mdt_rec_resync *rec;
@@ -494,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;