[v2,07/17] bcache: move bucket related code into read_super_basic()
diff mbox series

Message ID 20200715054612.6349-8-colyli@suse.de
State New
Headers show
Series
  • bcache: extend bucket size to 32bit width
Related show

Commit Message

Coly Li July 15, 2020, 5:46 a.m. UTC
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(-)

Comments

Hannes Reinecke July 15, 2020, 6:44 a.m. UTC | #1
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

Patch
diff mbox series

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;