dd_kobj);
struct lu_device *lu = dt2lu_dev(dt);
struct obd_device *obd = lu->ld_obd;
- struct obd_import *imp;
+ struct obd_import *imp, *imp0;
bool val;
int rc;
if (rc)
return rc;
- with_imp_locked(obd, imp, rc) {
- /* opposite senses */
- if (obd->u.cli.cl_import->imp_deactive == val)
- rc = ptlrpc_set_import_active(imp, val);
- else
- CDEBUG(D_CONFIG,
- "activate %u: ignoring repeat request\n",
- (unsigned int)val);
- }
+ with_imp_locked(obd, imp0, rc)
+ imp = class_import_get(imp0);
+ if (rc)
+ return rc;
+ /* opposite senses */
+ if (imp->imp_deactive == val)
+ rc = ptlrpc_set_import_active(imp, val);
+ else
+ CDEBUG(D_CONFIG, "activate %u: ignoring repeat request\n",
+ (unsigned int)val);
+
+ class_import_put(imp);
return rc ?: count;
}
dd_kobj);
struct lu_device *lu = dt2lu_dev(dt);
struct obd_device *obd = lu->ld_obd;
- struct obd_import *imp;
int rc;
- with_imp_locked(obd, imp, rc)
- rc = ptlrpc_obd_ping(obd);
+ rc = ptlrpc_obd_ping(obd);
return rc;
}
LDEBUGFS_SEQ_FOPS_RO_TYPE(osp, server_uuid);
LDEBUGFS_SEQ_FOPS_RO_TYPE(osp, timeouts);
-LPROC_SEQ_FOPS_RW_TYPE(osp, import);
+LDEBUGFS_SEQ_FOPS_RW_TYPE(osp, import);
LDEBUGFS_SEQ_FOPS_RO_TYPE(osp, state);
/**
}
LUSTRE_WO_ATTR(force_sync);
-static struct lprocfs_vars lprocfs_osp_obd_vars[] = {
+static struct ldebugfs_vars ldebugfs_osp_obd_vars[] = {
{ .name = "connect_flags",
.fops = &osp_connect_flags_fops },
{ .name = "ost_server_uuid",
{ NULL }
};
-static struct lprocfs_vars lprocfs_osp_md_vars[] = {
+static struct ldebugfs_vars ldebugfs_osp_md_vars[] = {
{ .name = "connect_flags",
.fops = &osp_connect_flags_fops },
{ .name = "mdt_server_uuid",
if (osp->opd_connect_mdt) {
osp->opd_dt_dev.dd_ktype.default_attrs = osp_md_attrs;
- obd->obd_vars = lprocfs_osp_md_vars;
+ obd->obd_debugfs_vars = ldebugfs_osp_md_vars;
} else {
osp->opd_dt_dev.dd_ktype.default_attrs = osp_obd_attrs;
- obd->obd_vars = lprocfs_osp_obd_vars;
+ obd->obd_debugfs_vars = ldebugfs_osp_obd_vars;
}
rc = dt_tunables_init(&osp->opd_dt_dev, obd->obd_type, obd->obd_name,
*/
obd->obd_debugfs_entry = debugfs_create_dir(
obd->obd_name, obd->obd_type->typ_debugfs_entry);
- ldebugfs_add_vars(obd->obd_debugfs_entry, obd->obd_vars, obd);
+ ldebugfs_add_vars(obd->obd_debugfs_entry, obd->obd_debugfs_vars, obd);
sptlrpc_lprocfs_cliobd_attach(obd);
ptlrpc_lprocfs_register_obd(obd);