diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-13 10:29:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-13 10:29:22 -0800 |
| commit | d523ec4c6af4314575d6ab8b52629ae3e2039a50 (patch) | |
| tree | 00c39170e420398f761a00ab6314c987b5dc7ac3 | |
| parent | a45a7db9bc7b9e36f213330dcb13356b86a5633a (diff) | |
| parent | f1bd37a4735286585751dbd9db330b48525cb193 (diff) | |
| download | linux-d523ec4c6af4314575d6ab8b52629ae3e2039a50.tar.gz | |
Merge tag 'iomap-6.2-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull iomap update from Darrick Wong:
- Minor code cleanup to eliminate unnecessary bit shifting
* tag 'iomap-6.2-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
iomap: directly use logical block size
| -rw-r--r-- | fs/iomap/direct-io.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c index 4eb559a16c9ed..9804714b17518 100644 --- a/fs/iomap/direct-io.c +++ b/fs/iomap/direct-io.c @@ -240,7 +240,6 @@ 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 fs_block_size = i_blocksize(inode), pad; loff_t length = iomap_length(iter); loff_t pos = iter->pos; @@ -252,7 +251,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) & (bdev_logical_block_size(iomap->bdev) - 1) || !bdev_iter_is_aligned(iomap->bdev, dio->submit.iter)) return -EINVAL; |