LU-4136 obdclass: use obd_get_info to report network status

[fs/lustre-release.git] / lustre / osp / osp_dev.c

diff --git a/lustre/osp/osp_dev.c b/lustre/osp/osp_dev.c
index 7e9e206..096de6a 100644 (file)
--- a/lustre/osp/osp_dev.c
+++ b/lustre/osp/osp_dev.c
@@ -422,7 +422,7 @@ static int osp_recovery_complete(const struct lu_env *env,
        ENTRY;
        osp->opd_recovery_completed = 1;
        if (!osp->opd_connect_mdt)
-               cfs_waitq_signal(&osp->opd_pre_waitq);
+               wake_up(&osp->opd_pre_waitq);
        RETURN(rc);
 }
 
@@ -745,7 +745,6 @@ out_last_used:
 out_proc:
        ptlrpc_lprocfs_unregister_obd(obd);
        lprocfs_obd_cleanup(obd);
-       obd_cleanup_client_import(obd);
        if (m->opd_symlink)
                lprocfs_remove(&m->opd_symlink);
        client_obd_cleanup(obd);
@@ -825,8 +824,6 @@ static struct lu_device *osp_device_fini(const struct lu_env *env,
                imp->imp_rq_pool = NULL;
        }
 
-       obd_cleanup_client_import(m->opd_obd);
-
        if (m->opd_symlink)
                lprocfs_remove(&m->opd_symlink);
 
@@ -908,15 +905,6 @@ static int osp_obd_connect(const struct lu_env *env, struct obd_export **exp,
        }
 
        ptlrpc_pinger_add_import(imp);
-
-       if (osp->opd_connect_mdt && data->ocd_index == 0) {
-               /* set seq controller export for MDC0 if exists */
-               struct seq_server_site *ss;
-
-               ss = lu_site2seq(osp2lu_dev(osp)->ld_site);
-               ss->ss_control_exp = class_export_get(*exp);
-               ss->ss_server_fld->lsf_control_exp = *exp;
-       }
 out:
        RETURN(rc);
 }
@@ -1027,7 +1015,7 @@ static int osp_import_event(struct obd_device *obd, struct obd_import *imp,
                if (d->opd_connect_mdt)
                        break;
                osp_pre_update_status(d, -ENODEV);
-               cfs_waitq_signal(&d->opd_pre_waitq);
+               wake_up(&d->opd_pre_waitq);
                CDEBUG(D_HA, "got disconnected\n");
                break;
        case IMP_EVENT_INACTIVE:
@@ -1035,7 +1023,7 @@ static int osp_import_event(struct obd_device *obd, struct obd_import *imp,
                if (d->opd_connect_mdt)
                        break;
                osp_pre_update_status(d, -ENODEV);
-               cfs_waitq_signal(&d->opd_pre_waitq);
+               wake_up(&d->opd_pre_waitq);
                CDEBUG(D_HA, "got inactive\n");
                break;
        case IMP_EVENT_ACTIVE:
@@ -1046,7 +1034,7 @@ static int osp_import_event(struct obd_device *obd, struct obd_import *imp,
                d->opd_imp_seen_connected = 1;
                if (d->opd_connect_mdt)
                        break;
-               cfs_waitq_signal(&d->opd_pre_waitq);
+               wake_up(&d->opd_pre_waitq);
                __osp_sync_check_for_work(d);
                CDEBUG(D_HA, "got connected\n");
                break;
@@ -1108,20 +1096,30 @@ static int osp_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
        return rc;
 }
 
-static int osp_obd_health_check(const struct lu_env *env,
-                               struct obd_device *obd)
+static int osp_obd_get_info(const struct lu_env *env, struct obd_export *exp,
+                           __u32 keylen, void *key, __u32 *vallen, void *val,
+                           struct lov_stripe_md *lsm)
 {
-       struct osp_device *d = lu2osp_dev(obd->obd_lu_dev);
+       int rc = -EINVAL;
 
-       ENTRY;
+       if (KEY_IS(KEY_OSP_CONNECTED)) {
+               struct obd_device       *obd = exp->exp_obd;
+               struct osp_device       *osp;
 
-       /*
-        * 1.8/2.0 behaviour is that OST being connected once at least
-        * is considired "healthy". and one "healty" OST is enough to
-        * allow lustre clients to connect to MDS
-        */
-       LASSERT(d);
-       RETURN(!d->opd_imp_seen_connected);
+               if (!obd->obd_set_up || obd->obd_stopping)
+                       RETURN(-EAGAIN);
+
+               osp = lu2osp_dev(obd->obd_lu_dev);
+               LASSERT(osp);
+               /*
+                * 1.8/2.0 behaviour is that OST being connected once at least
+                * is considered "healthy". and one "healthy" OST is enough to
+                * allow lustre clients to connect to MDS
+                */
+               RETURN(!osp->opd_imp_seen_connected);
+       }
+
+       RETURN(rc);
 }
 
 /* context key constructor/destructor: mdt_key_init, mdt_key_fini */
@@ -1178,7 +1176,7 @@ static struct obd_ops osp_obd_device_ops = {
        .o_reconnect    = osp_reconnect,
        .o_connect      = osp_obd_connect,
        .o_disconnect   = osp_obd_disconnect,
-       .o_health_check = osp_obd_health_check,
+       .o_get_info     = osp_obd_get_info,
        .o_import_event = osp_import_event,
        .o_iocontrol    = osp_iocontrol,
        .o_statfs       = osp_obd_statfs,
@@ -1200,8 +1198,11 @@ static int __init osp_mod_init(void)
 
        lprocfs_osp_init_vars(&lvars);
 
-       rc = class_register_type(&osp_obd_device_ops, NULL, lvars.module_vars,
-                                LUSTRE_OSP_NAME, &osp_device_type);
+       rc = class_register_type(&osp_obd_device_ops, NULL, NULL,
+#ifndef HAVE_ONLY_PROCFS_SEQ
+                               lvars.module_vars,
+#endif
+                               LUSTRE_OSP_NAME, &osp_device_type);
 
        /* create "osc" entry in procfs for compatibility purposes */
        if (rc != 0) {
@@ -1211,8 +1212,11 @@ static int __init osp_mod_init(void)
 
        lprocfs_lwp_init_vars(&lvars);
 
-       rc = class_register_type(&lwp_obd_device_ops, NULL, lvars.module_vars,
-                                LUSTRE_LWP_NAME, &lwp_device_type);
+       rc = class_register_type(&lwp_obd_device_ops, NULL, NULL,
+#ifndef HAVE_ONLY_PROCFS_SEQ
+                               lvars.module_vars,
+#endif
+                               LUSTRE_LWP_NAME, &lwp_device_type);
        if (rc != 0) {
                class_unregister_type(LUSTRE_OSP_NAME);
                lu_kmem_fini(osp_caches);