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);
}
struct obd_import *imp;
class_uuid_t uuid;
char *src, *tgt, *mdt, *osdname = NULL;
- int rc, idx;
+ int rc;
+ long idx;
ENTRY;
} else {
/* New OSC name fsname-OSTXXXX-osc-MDTXXXX */
if (strncmp(tgt, "-MDT", 4) != 0 &&
- strncmp(tgt, "-OST", 4) != 0) {
+ strncmp(tgt, "-OST", 4) != 0) {
CERROR("%s: invalid target name %s\n",
m->opd_obd->obd_name, lustre_cfg_string(cfg, 0));
RETURN(-EINVAL);
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);
imp->imp_rq_pool = NULL;
}
- obd_cleanup_client_import(m->opd_obd);
-
if (m->opd_symlink)
lprocfs_remove(&m->opd_symlink);
}
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);
}
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:
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:
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;
d = lu2osp_dev(obd->obd_lu_dev);
LASSERT(d->opd_dt_dev.dd_ops == &osp_dt_ops);
- if (!cfs_try_module_get(THIS_MODULE)) {
+ if (!try_module_get(THIS_MODULE)) {
CERROR("%s: can't get module. Is it alive?", obd->obd_name);
return -EINVAL;
}
break;
default:
CERROR("%s: unrecognized ioctl %#x by %s\n", obd->obd_name,
- cmd, cfs_curproc_comm());
+ cmd, current_comm());
rc = -ENOTTY;
}
- cfs_module_put(THIS_MODULE);
+ module_put(THIS_MODULE);
return rc;
}
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) {
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);