bcachefs: kill bch2_read_string_list()

4 files changed, 3 insertions, 23 deletions

diff --git a/fs/bcachefs/opts.c b/fs/bcachefs/opts.c
index 8db8096e5ed4..8e655bc167ed 100644
--- a/fs/bcachefs/opts.c
+++ b/fs/bcachefs/opts.c
@@ -218,7 +218,7 @@ int bch2_opt_parse(struct bch_fs *c, const struct bch_option *opt,
 			return -ERANGE;
 		break;
 	case BCH_OPT_STR:
-		ret = bch2_read_string_list(val, opt->choices);
+		ret = match_string(opt->choices, -1, val);
 		if (ret < 0)
 			return ret;
 
diff --git a/fs/bcachefs/sysfs.c b/fs/bcachefs/sysfs.c
index 5e341a712cdf..66b5b9f933bc 100644
--- a/fs/bcachefs/sysfs.c
+++ b/fs/bcachefs/sysfs.c
@@ -921,7 +921,7 @@ STORE(bch2_dev)
 	}
 
 	if (attr == &sysfs_cache_replacement_policy) {
-		ssize_t v = bch2_read_string_list(buf, bch2_cache_replacement_policies);
+		ssize_t v = __sysfs_match_string(bch2_cache_replacement_policies, -1, buf);
 
 		if (v < 0)
 			return v;
diff --git a/fs/bcachefs/util.c b/fs/bcachefs/util.c
index 60e1f1ff44eb..e263dd205409 100644
--- a/fs/bcachefs/util.c
+++ b/fs/bcachefs/util.c
@@ -126,24 +126,6 @@ ssize_t bch2_scnprint_string_list(char *buf, size_t size,
 	return out - buf;
 }
 
-ssize_t bch2_read_string_list(const char *buf, const char * const list[])
-{
-	size_t i, len;
-
-	buf = skip_spaces(buf);
-
-	len = strlen(buf);
-	while (len && isspace(buf[len - 1]))
-		--len;
-
-	for (i = 0; list[i]; i++)
-		if (strlen(list[i]) == len &&
-		    !memcmp(buf, list[i], len))
-			break;
-
-	return list[i] ? i : -EINVAL;
-}
-
 ssize_t bch2_scnprint_flag_list(char *buf, size_t size,
 				const char * const list[], u64 flags)
 {
@@ -178,7 +160,7 @@ u64 bch2_read_flag_list(char *opt, const char * const list[])
 	s = strim(d);
 
 	while ((p = strsep(&s, ","))) {
-		int flag = bch2_read_string_list(p, list);
+		int flag = match_string(list, -1, p);
 		if (flag < 0) {
 			ret = -1;
 			break;
diff --git a/fs/bcachefs/util.h b/fs/bcachefs/util.h
index 184915593e86..0ca3ade0f8ec 100644
--- a/fs/bcachefs/util.h
+++ b/fs/bcachefs/util.h
@@ -359,8 +359,6 @@ bool bch2_is_zero(const void *, size_t);
 
 ssize_t bch2_scnprint_string_list(char *, size_t, const char * const[], size_t);
 
-ssize_t bch2_read_string_list(const char *, const char * const[]);
-
 ssize_t bch2_scnprint_flag_list(char *, size_t, const char * const[], u64);
 u64 bch2_read_flag_list(char *, const char * const[]);