Commit d523ec4c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a45a7db9 f1bd37a4

fs/iomap/direct-io.c

+1 −2
Original line number Diff line number Diff line
@@ -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;