On 2018/5/5 4:49 AM, Andy Shevchenko wrote:
> There is couple of string arrays 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/bcache.h | 2 --
> drivers/md/bcache/super.c | 18 ------------------
> drivers/md/bcache/sysfs.c | 18 ++++++++++++++++++
> 3 files changed, 18 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h
> index 61e87bee5a65..1519c33bc1f8 100644
> --- a/drivers/md/bcache/bcache.h
> +++ b/drivers/md/bcache/bcache.h
> @@ -952,8 +952,6 @@ void bch_prio_write(struct cache *);
> void bch_write_bdev_super(struct cached_dev *, struct closure *);
>
> extern struct workqueue_struct *bcache_wq;
> -extern const char * const bch_cache_modes[];
> -extern const char * const bch_stop_on_failure_modes[];
> extern struct mutex bch_register_lock;
> extern struct list_head bch_cache_sets;
>
> diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
> index c328f410c21e..21de269d6d31 100644
> --- a/drivers/md/bcache/super.c
> +++ b/drivers/md/bcache/super.c
> @@ -37,24 +37,6 @@ static const char invalid_uuid[] = {
> 0xc8, 0x50, 0xfc, 0x5e, 0xcb, 0x16, 0xcd, 0x99
> };
>
> -/* Default is -1; we skip past it for struct cached_dev's cache mode */
> -const char * const bch_cache_modes[] = {
> - "default",
> - "writethrough",
> - "writeback",
> - "writearound",
> - "none",
> - NULL
> -};
> -
> -/* Default is -1; we skip past it for stop_when_cache_set_failed */
> -const char * const bch_stop_on_failure_modes[] = {
> - "default",
> - "auto",
> - "always",
> - NULL
> -};
> -
> static struct kobject *bcache_kobj;
> struct mutex bch_register_lock;
> LIST_HEAD(bch_cache_sets);
> diff --git a/drivers/md/bcache/sysfs.c b/drivers/md/bcache/sysfs.c
> index dfeef583ee50..0275450a0da9 100644
> --- a/drivers/md/bcache/sysfs.c
> +++ b/drivers/md/bcache/sysfs.c
> @@ -16,6 +16,24 @@
> #include <linux/sort.h>
> #include <linux/sched/clock.h>
>
> +/* Default is -1; we skip past it for struct cached_dev's cache mode */
> +static const char * const bch_cache_modes[] = {
> + "default",
> + "writethrough",
> + "writeback",
> + "writearound",
> + "none",
> + NULL
> +};
> +
> +/* Default is -1; we skip past it for stop_when_cache_set_failed */
> +static const char * const bch_stop_on_failure_modes[] = {
> + "default",
> + "auto",
> + "always",
> + NULL
> +};
> +
> static const char * const cache_replacement_policies[] = {
> "lru",
> "fifo",
>
--
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
