diff options
| author | Keith Busch <kbusch@kernel.org> | 2022-10-27 14:58:48 -0700 |
|---|---|---|
| committer | Darrick J. Wong <djwong@kernel.org> | 2022-11-06 12:36:13 -0800 |
| commit | 73f4b337c8185d901dd9f7142b8b1302b7a5ff2a (patch) | |
| tree | 94a69599dd01fa3e2fdd63e17e5aff956461f3a6 | |
| parent | 77a970d98b24384cb53e4517a95e297b807af161 (diff) | |
iomap: directly use logical block sizeiomap-6.2-merge_2022-11-06
Don't transform the logical block size to a bit shift only to shift it
back to the original block size. Just use the size.
Signed-off-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
| -rw-r--r-- | fs/iomap/direct-io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c index 4eb559a16c9e..503b97e5a115 100644 --- a/fs/iomap/direct-io.c +++ b/fs/iomap/direct-io.c @@ -240,7 +240,7 @@ static loff_t iomap_dio_bio_iter(const struct iomap_iter *iter, { const struct iomap *iomap = &iter->iomap; struct inode *inode = iter->inode; - unsigned int blkbits = blksize_bits(bdev_logical_block_size(iomap->bdev)); + unsigned int blksz = bdev_logical_block_size(iomap->bdev); unsigned int fs_block_size = i_blocksize(inode), pad; loff_t length = iomap_length(iter); loff_t pos = iter->pos; @@ -252,7 +252,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(iomap->bdev, dio->submit.iter)) return -EINVAL; |