/****************** prototypes *********************/
-/* obd_mount.c */
-int server_name2fsname(const char *svname, char *fsname, const char **endptr);
-#endif /* HAVE_SERVER_SUPPORT */
+/* obd_mount_server.c */
+int server_fill_super(struct super_block *sb);
+struct lustre_mount_info *server_get_mount(const char *name);
+int server_put_mount(const char *name, bool dereg_mnt);
+struct mgs_target_info;
+int server_mti_print(const char *title, struct mgs_target_info *mti);
+void server_calc_timeout(struct lustre_sb_info *lsi, struct obd_device *obd);
+/* obd_mount.c */
int server_name2svname(const char *label, char *svname, const char **endptr,
size_t svsize);
-void obdname2fsname(const char *tgt, char *fsname, size_t buflen);
-#ifdef HAVE_SERVER_SUPPORT
int server_name_is_ost(const char *svname);
int target_name2index(const char *svname, u32 *idx, const char **endptr);
char *s1, char *s2, char *s3, char *s4);
int lustre_start_mgc(struct super_block *sb);
#endif /* HAVE_SERVER_SUPPORT */
+int server_name2fsname(const char *svname, char *fsname, const char **endptr);
+void obdname2fsname(const char *tgt, char *fsname, size_t fslen);
+
void lustre_register_client_fill_super(int (*cfs)(struct super_block *sb,
struct vfsmount *mnt));
void lustre_register_kill_super_cb(void (*cfs)(struct super_block *sb));
int lustre_common_put_super(struct super_block *sb);
-# ifdef HAVE_SERVER_SUPPORT
-/* obd_mount_server.c */
-int server_fill_super(struct super_block *sb);
-struct lustre_mount_info *server_get_mount(const char *name);
-int server_put_mount(const char *name, bool dereg_mnt);
-struct mgs_target_info;
-int server_mti_print(const char *title, struct mgs_target_info *mti);
-void server_calc_timeout(struct lustre_sb_info *lsi, struct obd_device *obd);
-# endif
-
int mgc_fsname2resid(char *fsname, struct ldlm_res_id *res_id, int type);
int mgc_logname2resid(char *fsname, struct ldlm_res_id *res_id, int type);
* find one through the target name in the record inside conf_lock;
* otherwise means caller already hold conf_lock.
*/
-static int __sptlrpc_process_config(struct lustre_cfg *lcfg,
- struct sptlrpc_conf *conf)
+static int __sptlrpc_process_config(char *target, const char *fsname,
+ struct sptlrpc_rule *rule,
+ struct sptlrpc_conf *conf)
{
- char *target, *param;
- char fsname[MTI_NAME_MAXLEN];
- struct sptlrpc_rule rule;
- int rc;
+ int rc;
ENTRY;
- print_lustre_cfg(lcfg);
-
- target = lustre_cfg_string(lcfg, 1);
- if (target == NULL) {
- CERROR("missing target name\n");
- RETURN(-EINVAL);
- }
-
- param = lustre_cfg_string(lcfg, 2);
- if (param == NULL) {
- CERROR("missing parameter\n");
- RETURN(-EINVAL);
- }
-
- CDEBUG(D_SEC, "processing rule: %s.%s\n", target, param);
-
- /* parse rule to make sure the format is correct */
- if (strncmp(param, PARAM_SRPC_FLVR, sizeof(PARAM_SRPC_FLVR) - 1) != 0) {
- CERROR("Invalid sptlrpc parameter: %s\n", param);
- RETURN(-EINVAL);
- }
- param += sizeof(PARAM_SRPC_FLVR) - 1;
-
- rc = sptlrpc_parse_rule(param, &rule);
- if (rc)
- RETURN(-EINVAL);
-
- if (conf == NULL) {
- obdname2fsname(target, fsname, sizeof(fsname));
+ if (!conf) {
+ if (!fsname)
+ return -ENODEV;
mutex_lock(&sptlrpc_conf_lock);
- conf = sptlrpc_conf_get(fsname, 0);
- if (conf == NULL) {
- CERROR("can't find conf\n");
- rc = -ENOMEM;
- } else {
- rc = sptlrpc_conf_merge_rule(conf, target, &rule);
- }
+ conf = sptlrpc_conf_get(fsname, 0);
+ if (!conf) {
+ CERROR("can't find conf\n");
+ rc = -ENOMEM;
+ } else {
+ rc = sptlrpc_conf_merge_rule(conf, target, rule);
+ }
mutex_unlock(&sptlrpc_conf_lock);
- } else {
+ } else {
LASSERT(mutex_is_locked(&sptlrpc_conf_lock));
- rc = sptlrpc_conf_merge_rule(conf, target, &rule);
- }
+ rc = sptlrpc_conf_merge_rule(conf, target, rule);
+ }
- if (rc == 0)
- conf->sc_modified++;
+ if (!rc)
+ conf->sc_modified++;
- RETURN(rc);
+ RETURN(rc);
}
int sptlrpc_process_config(struct lustre_cfg *lcfg)
{
- return __sptlrpc_process_config(lcfg, NULL);
+ char fsname[MTI_NAME_MAXLEN];
+ struct sptlrpc_rule rule;
+ char *target, *param;
+ int rc;
+
+ print_lustre_cfg(lcfg);
+
+ target = lustre_cfg_string(lcfg, 1);
+ if (!target) {
+ CERROR("missing target name\n");
+ return -EINVAL;
+ }
+
+ param = lustre_cfg_string(lcfg, 2);
+ if (!param) {
+ CERROR("missing parameter\n");
+ return -EINVAL;
+ }
+
+ /* parse rule to make sure the format is correct */
+ if (strncmp(param, PARAM_SRPC_FLVR,
+ sizeof(PARAM_SRPC_FLVR) - 1) != 0) {
+ CERROR("Invalid sptlrpc parameter: %s\n", param);
+ return -EINVAL;
+ }
+ param += sizeof(PARAM_SRPC_FLVR) - 1;
+
+ CDEBUG(D_SEC, "processing rule: %s.%s\n", target, param);
+
+ /*
+ * Three types of targets exist for sptlrpc using conf_param
+ * 1. '_mgs' which targets mgc srpc settings. Treat it as
+ * as a special file system name.
+ * 2. target is a device which can be fsname-MDTXXXX or
+ * fsname-OSTXXXX. This can be verified by the function
+ * server_name2fsname.
+ * 3. If both above conditions are not meet then the target
+ * is a actual filesystem.
+ */
+ if (server_name2fsname(target, fsname, NULL))
+ strlcpy(fsname, target, sizeof(target));
+
+ rc = sptlrpc_parse_rule(param, &rule);
+ if (rc)
+ return rc;
+
+ return __sptlrpc_process_config(target, fsname, &rule, NULL);
}
EXPORT_SYMBOL(sptlrpc_process_config);