diff --git a/kmod/src/options.c b/kmod/src/options.c index 362a5792..332b1cda 100644 --- a/kmod/src/options.c +++ b/kmod/src/options.c @@ -28,7 +28,6 @@ static const match_table_t tokens = { {Opt_server_addr, "server_addr=%s"}, - {Opt_uniq_name, "uniq_name=%s"}, {Opt_err, NULL} }; @@ -96,7 +95,7 @@ int scoutfs_parse_options(struct super_block *sb, char *options, { char ipstr[INET_ADDRSTRLEN + 1]; substring_t args[MAX_OPT_ARGS]; - int token, len; + int token; char *p; int ret; @@ -116,12 +115,6 @@ int scoutfs_parse_options(struct super_block *sb, char *options, if (ret < 0) return ret; break; - case Opt_uniq_name: - len = match_strlcpy(parsed->uniq_name, args, - SCOUTFS_UNIQUE_NAME_MAX_BYTES); - if (len == 0 || len > SCOUTFS_UNIQUE_NAME_MAX_BYTES) - return -EINVAL; - break; default: scoutfs_err(sb, "Unknown or malformed option, \"%s\"", p); @@ -129,11 +122,6 @@ int scoutfs_parse_options(struct super_block *sb, char *options, } } - if (parsed->uniq_name[0] == '\0') { - scoutfs_err(sb, "must provide a uniq_name option"); - return -EINVAL; - } - return 0; } diff --git a/kmod/src/options.h b/kmod/src/options.h index 74ae5fa4..0078dca2 100644 --- a/kmod/src/options.h +++ b/kmod/src/options.h @@ -12,13 +12,11 @@ enum { */ Opt_btree_force_tiny_blocks, Opt_server_addr, - Opt_uniq_name, Opt_err, }; struct mount_options { struct sockaddr_in server_addr; - char uniq_name[SCOUTFS_UNIQUE_NAME_MAX_BYTES]; }; int scoutfs_parse_options(struct super_block *sb, char *options, diff --git a/kmod/src/super.c b/kmod/src/super.c index 1ac127ff..c5a8aeef 100644 --- a/kmod/src/super.c +++ b/kmod/src/super.c @@ -139,7 +139,6 @@ static int scoutfs_show_options(struct seq_file *seq, struct dentry *root) struct mount_options *opts = &SCOUTFS_SB(sb)->opts; seq_printf(seq, ",server_addr="SIN_FMT, SIN_ARG(&opts->server_addr)); - seq_printf(seq, ",uniq_name=%s", opts->uniq_name); return 0; } @@ -155,19 +154,8 @@ static ssize_t server_addr_show(struct kobject *kobj, } SCOUTFS_ATTR_RO(server_addr); -static ssize_t uniq_name_show(struct kobject *kobj, - struct kobj_attribute *attr, char *buf) -{ - struct super_block *sb = SCOUTFS_SYSFS_ATTRS_SB(kobj); - struct mount_options *opts = &SCOUTFS_SB(sb)->opts; - - return snprintf(buf, PAGE_SIZE, "%s\n", opts->uniq_name); -} -SCOUTFS_ATTR_RO(uniq_name); - static struct attribute *mount_options_attrs[] = { SCOUTFS_ATTR_PTR(server_addr), - SCOUTFS_ATTR_PTR(uniq_name), NULL, };