Whamcloud - gitweb
LU-5128 obdclass: fix a race in recovery
[fs/lustre-release.git] / lustre / target / tgt_lastrcvd.c
index b5d2831..fa9ff1c 100644 (file)
@@ -162,8 +162,9 @@ int tgt_client_data_update(const struct lu_env *env, struct obd_export *exp)
        if (IS_ERR(th))
                RETURN(PTR_ERR(th));
 
+       tti_buf_lcd(tti);
        rc = dt_declare_record_write(env, tgt->lut_last_rcvd,
-                                    sizeof(struct lsd_client_data),
+                                    &tti->tti_buf,
                                     ted->ted_lr_off, th);
        if (rc)
                GOTO(out, rc);
@@ -269,9 +270,9 @@ int tgt_server_data_update(const struct lu_env *env, struct lu_target *tgt,
 
        th->th_sync = sync;
 
+       tti_buf_lsd(tti);
        rc = dt_declare_record_write(env, tgt->lut_last_rcvd,
-                                    sizeof(struct lr_server_data),
-                                    tti->tti_off, th);
+                                    &tti->tti_buf, tti->tti_off, th);
        if (rc)
                GOTO(out, rc);
 
@@ -348,7 +349,7 @@ void tgt_boot_epoch_update(struct lu_target *tgt)
        struct lu_env            env;
        struct ptlrpc_request   *req;
        __u32                    start_epoch;
-       cfs_list_t               client_list;
+       struct list_head         client_list;
        int                      rc;
 
        if (tgt->lut_obd->obd_stopping)
@@ -373,21 +374,21 @@ void tgt_boot_epoch_update(struct lu_target *tgt)
         * with resend requests. Move final list to separate one for processing
         */
        spin_lock(&tgt->lut_obd->obd_recovery_task_lock);
-       cfs_list_splice_init(&tgt->lut_obd->obd_final_req_queue, &client_list);
+       list_splice_init(&tgt->lut_obd->obd_final_req_queue, &client_list);
        spin_unlock(&tgt->lut_obd->obd_recovery_task_lock);
 
        /**
         * go through list of exports participated in recovery and
         * set new epoch for them
         */
-       cfs_list_for_each_entry(req, &client_list, rq_list) {
+       list_for_each_entry(req, &client_list, rq_list) {
                LASSERT(!req->rq_export->exp_delayed);
                if (!req->rq_export->exp_vbr_failed)
                        tgt_client_epoch_update(&env, req->rq_export);
        }
        /** return list back at once */
        spin_lock(&tgt->lut_obd->obd_recovery_task_lock);
-       cfs_list_splice_init(&client_list, &tgt->lut_obd->obd_final_req_queue);
+       list_splice_init(&client_list, &tgt->lut_obd->obd_final_req_queue);
        spin_unlock(&tgt->lut_obd->obd_recovery_task_lock);
        /** update server epoch */
        tgt_server_data_update(&env, tgt, 1);
@@ -452,8 +453,7 @@ int tgt_last_commit_cb_add(struct thandle *th, struct lu_target *tgt,
        dcb = &ccb->llcc_cb;
        dcb->dcb_func = tgt_cb_last_committed;
        CFS_INIT_LIST_HEAD(&dcb->dcb_linkage);
-       strncpy(dcb->dcb_name, "tgt_cb_last_committed", MAX_COMMIT_CB_STR_LEN);
-       dcb->dcb_name[MAX_COMMIT_CB_STR_LEN - 1] = '\0';
+       strlcpy(dcb->dcb_name, "tgt_cb_last_committed", sizeof(dcb->dcb_name));
 
        rc = dt_trans_cb_add(th, dcb);
        if (rc) {
@@ -488,7 +488,12 @@ void tgt_cb_new_client(struct lu_env *env, struct thandle *th,
               ccb->lncc_exp->exp_client_uuid.uuid);
 
        spin_lock(&ccb->lncc_exp->exp_lock);
-       ccb->lncc_exp->exp_need_sync = 0;
+       /* XXX: Currently, we use per-export based sync/async policy for
+        *      the update via OUT RPC, it is coarse-grained policy, and
+        *      will be changed as per-request based by DNE II patches. */
+       if (!ccb->lncc_exp->exp_keep_sync)
+               ccb->lncc_exp->exp_need_sync = 0;
+
        spin_unlock(&ccb->lncc_exp->exp_lock);
        class_export_cb_put(ccb->lncc_exp);
 
@@ -510,8 +515,7 @@ int tgt_new_client_cb_add(struct thandle *th, struct obd_export *exp)
        dcb = &ccb->lncc_cb;
        dcb->dcb_func = tgt_cb_new_client;
        CFS_INIT_LIST_HEAD(&dcb->dcb_linkage);
-       strncpy(dcb->dcb_name, "tgt_cb_new_client", MAX_COMMIT_CB_STR_LEN);
-       dcb->dcb_name[MAX_COMMIT_CB_STR_LEN - 1] = '\0';
+       strlcpy(dcb->dcb_name, "tgt_cb_new_client", sizeof(dcb->dcb_name));
 
        rc = dt_trans_cb_add(th, dcb);
        if (rc) {
@@ -1071,6 +1075,10 @@ int tgt_server_data_init(const struct lu_env *env, struct lu_target *tgt)
                       lsd->lsd_feature_incompat & ~tgt_scd[type].incompat);
                RETURN(-EINVAL);
        }
+
+       if (type == LDD_F_SV_TYPE_MDT)
+               lsd->lsd_feature_incompat |= OBD_INCOMPAT_FID;
+
        if (lsd->lsd_feature_rocompat & ~tgt_scd[type].rocompat) {
                CERROR("%s: unsupported read-only filesystem feature(s) %x\n",
                       tgt_name(tgt),
@@ -1094,8 +1102,6 @@ int tgt_server_data_init(const struct lu_env *env, struct lu_target *tgt)
                lsd->lsd_feature_compat |= OBD_COMPAT_20;
        }
 
-       lsd->lsd_feature_incompat |= OBD_INCOMPAT_FID;
-
        spin_lock(&tgt->lut_translock);
        tgt->lut_last_transno = lsd->lsd_last_transno;
        spin_unlock(&tgt->lut_translock);
@@ -1163,6 +1169,7 @@ int tgt_txn_start_cb(const struct lu_env *env, struct thandle *th,
 {
        struct lu_target        *tgt = cookie;
        struct tgt_session_info *tsi;
+       struct tgt_thread_info  *tti = tgt_th_info(env);
        int                      rc;
 
        /* if there is no session, then this transaction is not result of
@@ -1176,15 +1183,17 @@ int tgt_txn_start_cb(const struct lu_env *env, struct thandle *th,
        if (tsi->tsi_exp == NULL)
                return 0;
 
+       tti_buf_lcd(tti);
        rc = dt_declare_record_write(env, tgt->lut_last_rcvd,
-                                    sizeof(struct lsd_client_data),
+                                    &tti->tti_buf,
                                     tsi->tsi_exp->exp_target_data.ted_lr_off,
                                     th);
        if (rc)
                return rc;
 
+       tti_buf_lsd(tti);
        rc = dt_declare_record_write(env, tgt->lut_last_rcvd,
-                                    sizeof(struct lr_server_data), 0, th);
+                                    &tti->tti_buf, 0, th);
        if (rc)
                return rc;