LU-12616 obclass: fix MDS start/stop race

[fs/lustre-release.git] / lustre / ofd / ofd_dev.c

diff --git a/lustre/ofd/ofd_dev.c b/lustre/ofd/ofd_dev.c
index e63a8d7..843abca 100644 (file)
--- a/lustre/ofd/ofd_dev.c
+++ b/lustre/ofd/ofd_dev.c
@@ -1355,7 +1355,7 @@ out:
                res = ldlm_resource_get(ofd->ofd_namespace, NULL,
                                        &tsi->tsi_resid, LDLM_EXTENT, 0);
                if (!IS_ERR(res)) {
-                       ldlm_res_lvbo_update(tsi->tsi_env, res, NULL, 0);
+                       ldlm_res_lvbo_update(res, NULL, 0);
                        ldlm_resource_putref(res);
                }
        }
@@ -1645,23 +1645,19 @@ static int ofd_create_hdl(struct tgt_session_info *tsi)
                 * in place of an old one at the same index.  Instead of
                 * precreating potentially millions of deleted old objects
                 * (possibly filling the OST), only precreate the last batch.
-                * LFSCK will eventually clean up any orphans. LU-14
-                * 500000 is a theoretical maximum number of objects that could
-                * be created(but not stored on disk in case of failover)
-                * during default journal commit interval - 5 seconds. */
-               if (diff > 500000) {
+                * LFSCK will eventually clean up any orphans. LU-14 */
+               if (diff > 5 * OST_MAX_PRECREATE) {
                        diff = OST_MAX_PRECREATE / 2;
                        LCONSOLE_WARN("%s: Too many FIDs to precreate "
-                                     "precreate FID"DOSTID" LAST_ID"DOSTID
                                      "OST replaced or reformatted: "
-                                     "LFSCK will clean up\n",
-                                     ofd_name(ofd), POSTID(&oa->o_oi),
-                                     POSTID(&oseq->os_oi));
+                                     "LFSCK will clean up",
+                                     ofd_name(ofd));
 
-                       CDEBUG(D_HA, "%s: precreate FID "DOSTID" is over 500000"
-                              "larger than the LAST_ID "DOSTID", only "
+                       CDEBUG(D_HA, "%s: precreate FID "DOSTID" is over "
+                              "%u larger than the LAST_ID "DOSTID", only "
                               "precreating the last %lld objects.\n",
                               ofd_name(ofd), POSTID(&oa->o_oi),
+                              5 * OST_MAX_PRECREATE,
                               POSTID(&oseq->os_oi), diff);
                        ofd_seq_last_oid_set(oseq, ostid_id(&oa->o_oi) - diff);
                }
@@ -2032,7 +2028,7 @@ out:
                if (!IS_ERR(res)) {
                        struct ost_lvb *res_lvb;
 
-                       ldlm_res_lvbo_update(tsi->tsi_env, res, NULL, 0);
+                       ldlm_res_lvbo_update(res, NULL, 0);
                        res_lvb = res->lr_lvb_data;
                        repbody->oa.o_valid |= OBD_MD_FLBLOCKS;
                        repbody->oa.o_blocks = res_lvb->lvb_blocks;