block: simplify set_init_blocksize
authorChristoph Hellwig <hch@lst.de>
Fri, 26 Jun 2020 08:01:54 +0000 (10:01 +0200)
committerJens Axboe <axboe@kernel.dk>
Wed, 1 Jul 2020 14:08:17 +0000 (08:08 -0600)
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 <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/block_dev.c

index 0e0d43d..8b7a9c7 100644 (file)
@@ -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);
 }