}
}
-int osp_disconnect(struct osp_device *d)
+static int osp_disconnect(struct osp_device *d)
{
struct obd_import *imp;
int rc = 0;
int rc = 0;
ENTRY;
- if (is_osp_for_connection(d->opd_obd->obd_name)) {
- rc = osp_disconnect(d);
- RETURN(rc);
- }
-
LASSERT(env);
/* release last_used file */
if (!d->opd_connect_mdt)
switch (lcfg->lcfg_command) {
case LCFG_CLEANUP:
- if (!is_osp_for_connection(d->opd_obd->obd_name))
- lu_dev_del_linkage(dev->ld_site, dev);
+ lu_dev_del_linkage(dev->ld_site, dev);
rc = osp_shutdown(env, d);
break;
case LCFG_PARAM:
l = osp2lu_dev(m);
dt_device_init(&m->opd_dt_dev, t);
- if (is_osp_for_connection(lustre_cfg_string(lcfg, 0)))
- rc = osp_init_for_ost(env, m, t, lcfg);
- else
- rc = osp_init0(env, m, t, lcfg);
+ rc = osp_init0(env, m, t, lcfg);
if (rc != 0) {
osp_device_free(env, l);
l = ERR_PTR(rc);
if (m->opd_storage_exp)
obd_disconnect(m->opd_storage_exp);
- if (is_osp_for_connection(m->opd_obd->obd_name))
- osp_fini_for_ost(m);
-
imp = m->opd_obd->u.cli.cl_import;
if (imp->imp_rq_pool) {
RETURN(rc);
*exp = class_conn2export(&conn);
- osp->opd_exp = *exp;
-
/* Why should there ever be more than 1 connect? */
osp->opd_connects++;
LASSERT(osp->opd_connects == 1);
LASSERT(data->ocd_connect_flags & OBD_CONNECT_INDEX);
ocd = &imp->imp_connect_data;
*ocd = *data;
- if (is_osp_for_connection(osp->opd_obd->obd_name))
- ocd->ocd_connect_flags |= OBD_CONNECT_LIGHTWEIGHT;
imp->imp_connect_flags_orig = ocd->ocd_connect_flags;
ptlrpc_pinger_add_import(imp);
- if (osp->opd_connect_mdt && data->ocd_index == 0 &&
- !is_osp_for_connection(obd->obd_name)) {
+ 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);
}
}
/* destroy the device */
- if (!is_osp_for_connection(obd->obd_name))
- class_manual_cleanup(obd);
+ class_manual_cleanup(obd);
RETURN(rc);
}
return rc;
}
+ lprocfs_lwp_init_vars(&lvars);
+
+ rc = class_register_type(&lwp_obd_device_ops, NULL, lvars.module_vars,
+ LUSTRE_LWP_NAME, &lwp_device_type);
+ if (rc != 0) {
+ class_unregister_type(LUSTRE_OSP_NAME);
+ lu_kmem_fini(osp_caches);
+ return rc;
+ }
+
/* Note: add_rec/delcare_add_rec will be only used by catalogs */
osp_mds_ost_orig_logops = llog_osd_ops;
osp_mds_ost_orig_logops.lop_add = llog_cat_add_rec;
{
lprocfs_try_remove_proc_entry("osc", proc_lustre_root);
+ class_unregister_type(LUSTRE_LWP_NAME);
class_unregister_type(LUSTRE_OSP_NAME);
lu_kmem_fini(osp_caches);
}