LU-12616 obclass: fix MDS start/stop race

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

diff --git a/lustre/ofd/ofd_obd.c b/lustre/ofd/ofd_obd.c
index b717ad4..478854c 100644 (file)
--- a/lustre/ofd/ofd_obd.c
+++ b/lustre/ofd/ofd_obd.c
@@ -546,8 +546,6 @@ static int ofd_init_export(struct obd_export *exp)
 {
        int rc;
 
-       spin_lock_init(&exp->exp_target_data.ted_fmd_lock);
-       INIT_LIST_HEAD(&exp->exp_target_data.ted_fmd_list);
        atomic_set(&exp->exp_filter_data.fed_soft_sync_count, 0);
        spin_lock(&exp->exp_lock);
        exp->exp_connecting = 1;
@@ -596,8 +594,6 @@ static int ofd_destroy_export(struct obd_export *exp)
        ldlm_destroy_export(exp);
        tgt_client_free(exp);
 
-       ofd_fmd_cleanup(exp);
-
        /*
         * discard grants once we're sure no more
         * interaction with the client is possible
@@ -963,7 +959,7 @@ out:
                res = ldlm_resource_get(ns, NULL, &info->fti_resid,
                                        LDLM_EXTENT, 0);
                if (!IS_ERR(res)) {
-                       ldlm_res_lvbo_update(env, res, NULL, 0);
+                       ldlm_res_lvbo_update(res, NULL, 0);
                        ldlm_resource_putref(res);
                }
        }
@@ -1405,26 +1401,6 @@ static int ofd_precleanup(struct obd_device *obd)
 }
 
 /**
- * Implementation of obd_ops::o_ping.
- *
- * This is OFD-specific part of OBD_PING request handling.
- * It controls Filter Modification Data (FMD) expiration each time PING is
- * received.
- *
- * \see  ofd_fmd_expire() and ofd_fmd.c for details
- *
- * \param[in] env      execution environment
- * \param[in] exp      OBD export of client
- *
- * \retval             0
- */
-static int ofd_ping(const struct lu_env *env, struct obd_export *exp)
-{
-       ofd_fmd_expire(exp);
-       return 0;
-}
-
-/**
  * Implementation of obd_ops::o_health_check.
  *
  * This function checks the OFD device health - ability to respond on
@@ -1516,7 +1492,6 @@ struct obd_ops ofd_obd_ops = {
        .o_getattr              = ofd_echo_getattr,
        .o_iocontrol            = ofd_iocontrol,
        .o_precleanup           = ofd_precleanup,
-       .o_ping                 = ofd_ping,
        .o_health_check         = ofd_health_check,
        .o_set_info_async       = ofd_set_info_async,
        .o_get_info             = ofd_get_info,