LU-9202 lfsck: skip unavailable targets when sync failures

[fs/lustre-release.git] / lustre / mdt / mdt_mds.c

diff --git a/lustre/mdt/mdt_mds.c b/lustre/mdt/mdt_mds.c
index 1e84321..1105242 100644 (file)
--- a/lustre/mdt/mdt_mds.c
+++ b/lustre/mdt/mdt_mds.c
@@ -68,12 +68,8 @@ struct mds_device {
 };
 
 /*
- *  * 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");
@@ -84,20 +80,24 @@ MODULE_PARM_DESC(mds_num_cpts, "CPU partitions MDS threads should run on");
 
 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)
@@ -471,8 +471,13 @@ static struct lu_device *mds_device_free(const struct lu_env *env,
 LPROC_SEQ_FOPS_RO_TYPE(mds, uuid);
 
 static struct lprocfs_vars lprocfs_mds_obd_vars[] = {
-       { "uuid",       &mds_uuid_fops  },
-       { NULL }
+       {
+               .name   = "uuid",
+               .fops   = &mds_uuid_fops
+       },
+       {
+               .name   = NULL
+       }
 };
 
 static struct lu_device *mds_device_alloc(const struct lu_env *env,
@@ -566,13 +571,6 @@ static struct obd_ops mds_obd_device_ops = {
 
 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);
 }