From: Hannes Reinecke <hare@suse.de>
To: Coly Li <colyli@suse.de>, linux-bcache@vger.kernel.org
Cc: linux-block@vger.kernel.org
Subject: Re: [PATCH v2 07/17] bcache: move bucket related code into read_super_basic()
Date: Wed, 15 Jul 2020 08:44:19 +0200 [thread overview]
Message-ID: <a42a88c5-2d00-be36-2adf-bbf4285096f9@suse.de> (raw)
In-Reply-To: <20200715054612.6349-8-colyli@suse.de>
On 7/15/20 7:46 AM, Coly Li wrote:
> Setting sb->first_bucket and checking sb->keys indeed are only for cache
> device, it does not make sense to do them in read_super() for backing
> device too.
>
> This patch moves the related code piece into read_super_basic()
> explicitly for cache device and avoid the confusion.
>
> Signed-off-by: Coly Li <colyli@suse.de>
> ---
> drivers/md/bcache/super.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
> index 071509590e1e..4c97d8c4a878 100644
> --- a/drivers/md/bcache/super.c
> +++ b/drivers/md/bcache/super.c
> @@ -66,12 +66,17 @@ static const char *read_super_basic(struct cache_sb *sb, struct block_device *b
> const char *err;
> unsigned int i;
>
> + sb->first_bucket= le16_to_cpu(s->first_bucket);
> sb->nbuckets = le64_to_cpu(s->nbuckets);
> sb->bucket_size = le16_to_cpu(s->bucket_size);
>
> sb->nr_in_set = le16_to_cpu(s->nr_in_set);
> sb->nr_this_dev = le16_to_cpu(s->nr_this_dev);
>
> + err = "Too many journal buckets";
> + if (sb->keys > SB_JOURNAL_BUCKETS)
> + goto err;
> +
> err = "Too many buckets";
> if (sb->nbuckets > LONG_MAX)
> goto err;
> @@ -155,7 +160,6 @@ static const char *read_super(struct cache_sb *sb, struct block_device *bdev,
> sb->flags = le64_to_cpu(s->flags);
> sb->seq = le64_to_cpu(s->seq);
> sb->last_mount = le32_to_cpu(s->last_mount);
> - sb->first_bucket = le16_to_cpu(s->first_bucket);
> sb->keys = le16_to_cpu(s->keys);
>
> for (i = 0; i < SB_JOURNAL_BUCKETS; i++)
> @@ -172,10 +176,6 @@ static const char *read_super(struct cache_sb *sb, struct block_device *bdev,
> if (memcmp(sb->magic, bcache_magic, 16))
> goto err;
>
> - err = "Too many journal buckets";
> - if (sb->keys > SB_JOURNAL_BUCKETS)
> - goto err;
> -
> err = "Bad checksum";
> if (s->csum != csum_set(s))
> goto err;
>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Cheers,
Hannes
--
Dr. Hannes Reinecke Kernel Storage Architect
hare@suse.de +49 911 74053 688
SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), GF: Felix Imendörffer
next prev parent reply other threads:[~2020-07-15 6:44 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 5:45 [PATCH v2 00/17] bcache: extend bucket size to 32bit width Coly Li
2020-07-15 5:45 ` [PATCH v2 01/17] bcache: add comments to mark member offset of struct cache_sb_disk Coly Li
2020-07-15 6:02 ` Hannes Reinecke
2020-07-15 9:03 ` Coly Li
2020-07-15 9:08 ` Johannes Thumshirn
2020-07-15 10:35 ` Coly Li
2020-07-15 5:45 ` [PATCH v2 02/17] bcache: add read_super_basic() to read major part of super block Coly Li
2020-07-15 6:03 ` Hannes Reinecke
2020-07-15 5:45 ` [PATCH v2 03/17] bcache: add more accurate error information in read_super_basic() Coly Li
2020-07-15 6:04 ` Hannes Reinecke
2020-07-15 5:45 ` [PATCH v2 04/17] bcache: disassemble the big if() checks in bch_cache_set_alloc() Coly Li
2020-07-15 6:08 ` Hannes Reinecke
2020-07-15 5:46 ` [PATCH v2 05/17] bcache: fix super block seq numbers comparision in register_cache_set() Coly Li
2020-07-15 6:10 ` Hannes Reinecke
2020-07-15 5:46 ` [PATCH v2 06/17] bcache: increase super block version for cache device and backing device Coly Li
2020-07-15 6:11 ` Hannes Reinecke
2020-07-15 5:46 ` [PATCH v2 07/17] bcache: move bucket related code into read_super_basic() Coly Li
2020-07-15 6:44 ` Hannes Reinecke [this message]
2020-07-15 5:46 ` [PATCH v2 08/17] bcache: struct cache_sb is only for in-memory super block now Coly Li
2020-07-15 6:45 ` Hannes Reinecke
2020-07-15 5:46 ` [PATCH v2 09/17] bcache: introduce meta_bucket_pages() related helper routines Coly Li
2020-07-15 5:46 ` [PATCH v2 10/17] bcache: handle c->uuids properly for bucket size > 8MB Coly Li
2020-07-15 5:46 ` [PATCH v2 11/17] bcache: handle cache prio_buckets and disk_buckets " Coly Li
2020-07-15 5:46 ` [PATCH v2 12/17] bcache: handle cache set verify_ondisk " Coly Li
2020-07-15 5:46 ` [PATCH v2 13/17] bcache: handle btree node memory allocation " Coly Li
2020-07-15 5:46 ` [PATCH v2 14/17] bcache: add bucket_size_hi into struct cache_sb_disk for large bucket Coly Li
2020-07-15 5:46 ` [PATCH v2 15/17] bcache: add sysfs file to display feature sets information of cache set Coly Li
2020-07-15 5:46 ` [PATCH v2 16/17] bcache: avoid extra memory allocation from mempool c->fill_iter Coly Li
2020-07-15 5:46 ` [PATCH v2 17/17] bcache: avoid extra memory consumption in struct bbio for large bucket size Coly Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a42a88c5-2d00-be36-2adf-bbf4285096f9@suse.de \
--to=hare@suse.de \
--cc=colyli@suse.de \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox