On 2018/5/5 4:49 AM, Andy Shevchenko wrote:
> There is couple of functions that are used exclusively in sysfs.c.
> Move it to there and make them static.
>
> Besides above, it will allow further clean up.
>
> No functional change intended.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Looks good to me, add it in my for-test patches.
Thanks.
Coly Li
> ---
> drivers/md/bcache/sysfs.c | 35 +++++++++++++++++++++++++++++++++++
> drivers/md/bcache/util.c | 35 -----------------------------------
> drivers/md/bcache/util.h | 5 -----
> 3 files changed, 35 insertions(+), 40 deletions(-)
>
> diff --git a/drivers/md/bcache/sysfs.c b/drivers/md/bcache/sysfs.c
> index 0275450a0da9..36f4396dbd63 100644
> --- a/drivers/md/bcache/sysfs.c
> +++ b/drivers/md/bcache/sysfs.c
> @@ -132,6 +132,41 @@ rw_attribute(btree_shrinker_disabled);
> rw_attribute(copy_gc_enabled);
> rw_attribute(size);
>
> +static ssize_t bch_snprint_string_list(char *buf, size_t size, const char * const list[],
> + size_t selected)
> +{
> + char *out = buf;
> + size_t i;
> +
> + for (i = 0; list[i]; i++)
> + out += snprintf(out, buf + size - out,
> + i == selected ? "[%s] " : "%s ", list[i]);
> +
> + out[-1] = '\n';
> + return out - buf;
> +}
> +
> +static ssize_t bch_read_string_list(const char *buf, const char * const list[])
> +{
> + size_t i;
> + char *s, *d = kstrndup(buf, PAGE_SIZE - 1, GFP_KERNEL);
> + if (!d)
> + return -ENOMEM;
> +
> + s = strim(d);
> +
> + for (i = 0; list[i]; i++)
> + if (!strcmp(list[i], s))
> + break;
> +
> + kfree(d);
> +
> + if (!list[i])
> + return -EINVAL;
> +
> + return i;
> +}
> +
> SHOW(__bch_cached_dev)
> {
> struct cached_dev *dc = container_of(kobj, struct cached_dev,
> diff --git a/drivers/md/bcache/util.c b/drivers/md/bcache/util.c
> index cdf822c0ac1b..f912c372978c 100644
> --- a/drivers/md/bcache/util.c
> +++ b/drivers/md/bcache/util.c
> @@ -120,41 +120,6 @@ ssize_t bch_hprint(char *buf, int64_t v)
> return sprintf(buf, "%llu.%i%c", q, t * 10 / 1024, units[u]);
> }
>
> -ssize_t bch_snprint_string_list(char *buf, size_t size, const char * const list[],
> - size_t selected)
> -{
> - char *out = buf;
> - size_t i;
> -
> - for (i = 0; list[i]; i++)
> - out += snprintf(out, buf + size - out,
> - i == selected ? "[%s] " : "%s ", list[i]);
> -
> - out[-1] = '\n';
> - return out - buf;
> -}
> -
> -ssize_t bch_read_string_list(const char *buf, const char * const list[])
> -{
> - size_t i;
> - char *s, *d = kstrndup(buf, PAGE_SIZE - 1, GFP_KERNEL);
> - if (!d)
> - return -ENOMEM;
> -
> - s = strim(d);
> -
> - for (i = 0; list[i]; i++)
> - if (!strcmp(list[i], s))
> - break;
> -
> - kfree(d);
> -
> - if (!list[i])
> - return -EINVAL;
> -
> - return i;
> -}
> -
> bool bch_is_zero(const char *p, size_t n)
> {
> size_t i;
> diff --git a/drivers/md/bcache/util.h b/drivers/md/bcache/util.h
> index bd70f1c6a176..091b4bf7cfc2 100644
> --- a/drivers/md/bcache/util.h
> +++ b/drivers/md/bcache/util.h
> @@ -366,11 +366,6 @@ ssize_t bch_hprint(char *buf, int64_t v);
> bool bch_is_zero(const char *p, size_t n);
> int bch_parse_uuid(const char *s, char *uuid);
>
> -ssize_t bch_snprint_string_list(char *buf, size_t size, const char * const list[],
> - size_t selected);
> -
> -ssize_t bch_read_string_list(const char *buf, const char * const list[]);
> -
> struct time_stats {
> spinlock_t lock;
> /*
>
--
To unsubscribe from this list: send the line "unsubscribe linux-bcache" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
