[03/12] iomap: get logical block size directly

Commit Message

Keith Busch June 30, 2022, 8:42 p.m. UTC

From: Keith Busch <[e-mail]>

Don't transform the logical block size to a bit shift only to shift it
back out to the size. Just use the size.

Signed-off-by: Keith Busch <[e-mail]>
---
 fs/iomap/direct-io.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c
index 5d478a95efdf..40cbf2025386 100644
--- a/fs/iomap/direct-io.c
+++ b/fs/iomap/direct-io.c
@@ -241,7 +241,7 @@  static loff_t iomap_dio_bio_iter(const struct iomap_iter *iter,
 	const struct iomap *iomap = &iter->iomap;
 	struct inode *inode = iter->inode;
 	struct block_device *bdev = iomap->bdev;
-	unsigned int blkbits = blksize_bits(bdev_logical_block_size(bdev));
+	unsigned int blksz = bdev_logical_block_size(bdev);
 	unsigned int fs_block_size = i_blocksize(inode), pad;
 	loff_t length = iomap_length(iter);
 	loff_t pos = iter->pos;
@@ -253,7 +253,7 @@  static loff_t iomap_dio_bio_iter(const struct iomap_iter *iter,
 	size_t copied = 0;
 	size_t orig_count;
 
-	if ((pos | length) & ((1 << blkbits) - 1) ||
+	if ((pos | length) & (blksz - 1) ||
 	    !bdev_iter_is_aligned(bdev, dio->submit.iter))
 		return -EINVAL;