block: simplify set_init_blocksize

Christoph Hellwig · axboe · commit 5ff9f19231a0 · 2020-07-01T08:08:17.000-06:00
The loop to increase the initial block size doesn't really make any
sense, as the AND operation won't match for powers of two if it didn't
for the initial block size.

Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
Signed-off-by: Jens Axboe &lt;axboe@kernel.dk&gt;
diff --git a/fs/block_dev.c b/fs/block_dev.c
@@ -106,13 +106,7 @@ EXPORT_SYMBOL(invalidate_bdev);
 static void set_init_blocksize(struct block_device *bdev)
 {
 	unsigned bsize = bdev_logical_block_size(bdev);
-	loff_t size = i_size_read(bdev->bd_inode);
 
-	while (bsize < PAGE_SIZE) {
-		if (size & bsize)
-			break;
-		bsize <<= 1;
-	}
 	bdev->bd_block_size = bsize;
 	bdev->bd_inode->i_blkbits = blksize_bits(bsize);
 }

Original file line number	Diff line number	Diff line change
`@@ -106,13 +106,7 @@ EXPORT_SYMBOL(invalidate_bdev);`
`106`	`106`	`static void set_init_blocksize(struct block_device *bdev)`
`107`	`107`	`{`
`108`	`108`	`unsigned bsize = bdev_logical_block_size(bdev);`
`109`		`- loff_t size = i_size_read(bdev->bd_inode);`
`110`	`109`
`111`		`- while (bsize < PAGE_SIZE) {`
`112`		`- if (size & bsize)`
`113`		`- break;`
`114`		`- bsize <<= 1;`
`115`		`- }`
`116`	`110`	`bdev->bd_block_size = bsize;`
`117`	`111`	`bdev->bd_inode->i_blkbits = blksize_bits(bsize);`
`118`	`112`	`}`