#include "mdt_internal.h"
#include <lustre_quota.h>
#include <lustre_acl.h>
-#include <lustre_param.h>
+#include <uapi/linux/lustre_param.h>
struct mds_device {
/* super-class */
struct ptlrpc_service *mds_mdss_service;
struct ptlrpc_service *mds_fld_service;
struct mutex mds_health_mutex;
+ struct kset *mds_kset;
};
/*
- * * Initialized in mdt_mod_init().
+ * * Initialized in mds_mod_init().
* */
-static unsigned long mdt_num_threads;
-module_param(mdt_num_threads, ulong, 0444);
-MODULE_PARM_DESC(mdt_num_threads, "number of MDS service threads to start (deprecated in favor of mds_num_threads)");
-
static unsigned long mds_num_threads;
module_param(mds_num_threads, ulong, 0444);
MODULE_PARM_DESC(mds_num_threads, "number of MDS service threads to start");
static unsigned long mds_rdpg_num_threads;
module_param(mds_rdpg_num_threads, ulong, 0444);
-MODULE_PARM_DESC(mds_rdpg_num_threads, "number of MDS readpage service threads to start");
+MODULE_PARM_DESC(mds_rdpg_num_threads,
+ "number of MDS readpage service threads to start");
static char *mds_rdpg_num_cpts;
module_param(mds_rdpg_num_cpts, charp, 0444);
-MODULE_PARM_DESC(mds_rdpg_num_cpts, "CPU partitions MDS readpage threads should run on");
+MODULE_PARM_DESC(mds_rdpg_num_cpts,
+ "CPU partitions MDS readpage threads should run on");
/* NB: these two should be removed along with setattr service in the future */
static unsigned long mds_attr_num_threads;
module_param(mds_attr_num_threads, ulong, 0444);
-MODULE_PARM_DESC(mds_attr_num_threads, "number of MDS setattr service threads to start");
+MODULE_PARM_DESC(mds_attr_num_threads,
+ "number of MDS setattr service threads to start");
static char *mds_attr_num_cpts;
module_param(mds_attr_num_cpts, charp, 0444);
-MODULE_PARM_DESC(mds_attr_num_cpts, "CPU partitions MDS setattr threads should run on");
+MODULE_PARM_DESC(mds_attr_num_cpts,
+ "CPU partitions MDS setattr threads should run on");
/* device init/fini methods */
static void mds_stop_ptlrpc_service(struct mds_device *m)
.so_hpreq_handler = ptlrpc_hpreq_handler,
},
};
- m->mds_regular_service = ptlrpc_register_service(&conf, procfs_entry);
+ m->mds_regular_service = ptlrpc_register_service(&conf, m->mds_kset,
+ procfs_entry);
if (IS_ERR(m->mds_regular_service)) {
rc = PTR_ERR(m->mds_regular_service);
CERROR("failed to start regular mdt service: %d\n", rc);
.so_req_printer = target_print_req,
},
};
- m->mds_readpage_service = ptlrpc_register_service(&conf, procfs_entry);
+ m->mds_readpage_service = ptlrpc_register_service(&conf, m->mds_kset,
+ procfs_entry);
if (IS_ERR(m->mds_readpage_service)) {
rc = PTR_ERR(m->mds_readpage_service);
CERROR("failed to start readpage service: %d\n", rc);
.so_hpreq_handler = NULL,
},
};
- m->mds_setattr_service = ptlrpc_register_service(&conf, procfs_entry);
+ m->mds_setattr_service = ptlrpc_register_service(&conf, m->mds_kset,
+ procfs_entry);
if (IS_ERR(m->mds_setattr_service)) {
rc = PTR_ERR(m->mds_setattr_service);
CERROR("failed to start setattr service: %d\n", rc);
.so_hpreq_handler = NULL,
},
};
- m->mds_out_service = ptlrpc_register_service(&conf, procfs_entry);
+ m->mds_out_service = ptlrpc_register_service(&conf, m->mds_kset,
+ procfs_entry);
if (IS_ERR(m->mds_out_service)) {
rc = PTR_ERR(m->mds_out_service);
CERROR("failed to start out service: %d\n", rc);
.so_hpreq_handler = NULL,
},
};
- m->mds_mdsc_service = ptlrpc_register_service(&conf, procfs_entry);
+ m->mds_mdsc_service = ptlrpc_register_service(&conf, m->mds_kset,
+ procfs_entry);
if (IS_ERR(m->mds_mdsc_service)) {
rc = PTR_ERR(m->mds_mdsc_service);
CERROR("failed to start seq controller service: %d\n", rc);
.so_hpreq_handler = NULL,
},
};
- m->mds_mdss_service = ptlrpc_register_service(&conf, procfs_entry);
+ m->mds_mdss_service = ptlrpc_register_service(&conf, m->mds_kset,
+ procfs_entry);
if (IS_ERR(m->mds_mdss_service)) {
rc = PTR_ERR(m->mds_mdss_service);
CERROR("failed to start metadata seq server service: %d\n", rc);
.so_hpreq_handler = NULL,
},
};
- m->mds_fld_service = ptlrpc_register_service(&conf, procfs_entry);
+ m->mds_fld_service = ptlrpc_register_service(&conf, m->mds_kset,
+ procfs_entry);
if (IS_ERR(m->mds_fld_service)) {
rc = PTR_ERR(m->mds_fld_service);
CERROR("failed to start fld service: %d\n", rc);
ENTRY;
mds_stop_ptlrpc_service(m);
- lprocfs_obd_cleanup(obd);
+ lprocfs_kset_unregister(obd, m->mds_kset);
RETURN(NULL);
}
RETURN(NULL);
}
-LPROC_SEQ_FOPS_RO_TYPE(mds, uuid);
-
-static struct lprocfs_vars lprocfs_mds_obd_vars[] = {
- { "uuid", &mds_uuid_fops },
- { NULL }
-};
-
static struct lu_device *mds_device_alloc(const struct lu_env *env,
struct lu_device_type *t,
struct lustre_cfg *cfg)
/* set this lu_device to obd, because error handling need it */
obd->obd_lu_dev = l;
- obd->obd_vars = lprocfs_mds_obd_vars;
- rc = lprocfs_obd_setup(obd);
+ rc = lprocfs_kset_register(obd, &m->mds_kset);
if (rc != 0) {
mds_device_free(env, l);
l = ERR_PTR(rc);
mutex_init(&m->mds_health_mutex);
rc = mds_start_ptlrpc_service(m);
-
if (rc != 0) {
+ lprocfs_kset_unregister(obd, m->mds_kset);
mds_device_free(env, l);
l = ERR_PTR(rc);
return l;
int mds_mod_init(void)
{
- if (mdt_num_threads != 0 && mds_num_threads == 0) {
- LCONSOLE_INFO("mdt_num_threads module parameter is deprecated, "
- "use mds_num_threads instead or unset both for "
- "dynamic thread startup\n");
- mds_num_threads = mdt_num_threads;
- }
-
return class_register_type(&mds_obd_device_ops, NULL, true, NULL,
LUSTRE_MDS_NAME, &mds_device_type);
}