bcache: add more accurate error information in read_super_common() (c557a5f7) · Commits · 戴 / test

The improperly set bucket or block size will trigger error in read_super_common(). For large bucket size, a more accurate error message for invalid bucket or block size is necessary. This patch disassembles the combined if() checks into multiple single if() check, and provide more accurate error message for each check failure condition. Signed-off-by:

Coly Li <colyli@suse.de> Reviewed-by:

Hannes Reinecke <hare@suse.de> Signed-off-by:

Jens Axboe <axboe@kernel.dk>

drivers/md/bcache/super.c

+14 −5

Original line number	Diff line number	Diff line
		@@ -79,11 +79,20 @@ static const char read_super_common(struct cache_sb sb, struct block_device *
		if (sb->nbuckets < 1 << 7)
		goto err;

		err = "Bad block/bucket size";
		if (!is_power_of_2(sb->block_size) \|\|
		sb->block_size > PAGE_SECTORS \|\|
		!is_power_of_2(sb->bucket_size) \|\|
		sb->bucket_size < PAGE_SECTORS)
		err = "Bad block size (not power of 2)";
		if (!is_power_of_2(sb->block_size))
		goto err;

		err = "Bad block size (larger than page size)";
		if (sb->block_size > PAGE_SECTORS)
		goto err;

		err = "Bad bucket size (not power of 2)";
		if (!is_power_of_2(sb->bucket_size))
		goto err;

		err = "Bad bucket size (smaller than page size)";
		if (sb->bucket_size < PAGE_SECTORS)
		goto err;

		err = "Invalid superblock: device too small";

Admin message