Skip to content

Commit

Permalink
bcache: use sysfs_match_string() instead of __sysfs_match_string()
Browse files Browse the repository at this point in the history
The arrays (of strings) that are passed to __sysfs_match_string() are
static, so use sysfs_match_string() which does an implicit ARRAY_SIZE()
over these arrays.

Functionally, this doesn't change anything.
The change is more cosmetic.

It only shrinks the static arrays by 1 byte each.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Signed-off-by: Coly Li <colyli@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
commodo authored and axboe committed Jun 28, 2019
1 parent f960fac commit 89e0341
Showing 1 changed file with 8 additions and 12 deletions.
20 changes: 8 additions & 12 deletions drivers/md/bcache/sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,24 @@ static const char * const bch_cache_modes[] = {
"writethrough",
"writeback",
"writearound",
"none",
NULL
"none"
};

/* Default is 0 ("auto") */
static const char * const bch_stop_on_failure_modes[] = {
"auto",
"always",
NULL
"always"
};

static const char * const cache_replacement_policies[] = {
"lru",
"fifo",
"random",
NULL
"random"
};

static const char * const error_actions[] = {
"unregister",
"panic",
NULL
"panic"
};

write_attribute(attach);
Expand Down Expand Up @@ -333,7 +329,7 @@ STORE(__cached_dev)
bch_cached_dev_run(dc);

if (attr == &sysfs_cache_mode) {
v = __sysfs_match_string(bch_cache_modes, -1, buf);
v = sysfs_match_string(bch_cache_modes, buf);
if (v < 0)
return v;

Expand All @@ -344,7 +340,7 @@ STORE(__cached_dev)
}

if (attr == &sysfs_stop_when_cache_set_failed) {
v = __sysfs_match_string(bch_stop_on_failure_modes, -1, buf);
v = sysfs_match_string(bch_stop_on_failure_modes, buf);
if (v < 0)
return v;

Expand Down Expand Up @@ -799,7 +795,7 @@ STORE(__bch_cache_set)
0, UINT_MAX);

if (attr == &sysfs_errors) {
v = __sysfs_match_string(error_actions, -1, buf);
v = sysfs_match_string(error_actions, buf);
if (v < 0)
return v;

Expand Down Expand Up @@ -1063,7 +1059,7 @@ STORE(__bch_cache)
}

if (attr == &sysfs_cache_replacement_policy) {
v = __sysfs_match_string(cache_replacement_policies, -1, buf);
v = sysfs_match_string(cache_replacement_policies, buf);
if (v < 0)
return v;

Expand Down

0 comments on commit 89e0341

Please sign in to comment.