diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-24 09:02:01 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-31 18:43:53 +0200 |
commit | 13a3c584b49e1a91d825fee3771ce655bf67f1b5 (patch) | |
tree | 00bfe1c05f6c0aa64de984ea8bf2234a1dda72e2 /common/state/backend_storage.c | |
parent | a97f875fecfee91d73f4bba89ca16ad34495f82f (diff) | |
download | barebox-13a3c584b49e1a91d825fee3771ce655bf67f1b5.tar.gz barebox-13a3c584b49e1a91d825fee3771ce655bf67f1b5.tar.xz |
state: backend_storage: Rename variable desired_copies to desired_buckets
We defined what a bucket is, so rename the variable that holds the
number of desired buckets from desired_copies to desired_buckets.
While at it, make locally used variable static.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common/state/backend_storage.c')
-rw-r--r-- | common/state/backend_storage.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/common/state/backend_storage.c b/common/state/backend_storage.c index c29004071b..1310531dd1 100644 --- a/common/state/backend_storage.c +++ b/common/state/backend_storage.c @@ -216,8 +216,8 @@ static int mtd_get_meminfo(const char *path, struct mtd_info_user *meminfo) return ret; } -/* Number of copies that should be allocated */ -const int desired_copies = 3; +/* Number of buckets that should be used */ +static const int desired_buckets = 3; /** * state_storage_mtd_buckets_init - Creates storage buckets for mtd devices @@ -270,7 +270,7 @@ static int state_storage_mtd_buckets_init(struct state_backend_storage *storage, list_add_tail(&bucket->bucket_list, &storage->buckets); ++n_buckets; - if (n_buckets >= desired_copies) + if (n_buckets >= desired_buckets) return 0; } @@ -280,7 +280,7 @@ static int state_storage_mtd_buckets_init(struct state_backend_storage *storage, } dev_warn(storage->dev, "Failed to initialize desired amount of buckets, only %d of %d succeeded\n", - n_buckets, desired_copies); + n_buckets, desired_buckets); return 0; } @@ -306,12 +306,12 @@ static int state_storage_file_buckets_init(struct state_backend_storage *storage return -EINVAL; } - if (max_size && max_size < desired_copies * stridesize) { - dev_err(storage->dev, "device is too small to hold %d copies\n", desired_copies); + if (max_size && max_size < desired_buckets * stridesize) { + dev_err(storage->dev, "device is too small to hold %d copies\n", desired_buckets); return -EINVAL; } - for (n = 0; n < desired_copies; n++) { + for (n = 0; n < desired_buckets; n++) { offset = storage->offset + n * stridesize; ret = state_backend_bucket_direct_create(storage->dev, storage->path, &bucket, offset, @@ -334,9 +334,9 @@ static int state_storage_file_buckets_init(struct state_backend_storage *storage return -EIO; } - if (n_buckets < desired_copies) + if (n_buckets < desired_buckets) dev_warn(storage->dev, "Failed to initialize desired amount of direct buckets, only %d of %d succeeded\n", - n_buckets, desired_copies); + n_buckets, desired_buckets); return 0; } |