Skip to contentSkip to conversation

iomap: directly use logical block size

PATCH Superseded Keith Busch 5 participants 5 messages Oct 26, 2022 – Oct 30, 2022

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iomap: directly use logical block size

From: Keith Busch <[email protected]>

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.

---
 fs/iomap/direct-io.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
fs/iomap/direct-io.c +2 -2
index 4eb559a16c9e..503b97e5a115 100644
@@ -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;
 
Signature · 1 line
2.30.2
Reviewed-by on v1 1/1
#2 lore raw
In reply to Keith Busch
Quoted 15 lines · Keith Busch

From: Keith Busch <[email protected]>

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.

---
 fs/iomap/direct-io.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
fs/iomap/direct-io.c +0 -0
index 4eb559a16c9e..503b97e5a115 100644

fs/iomap/direct-io.c static loff_t iomap_dio_bio_iter(const struct iomap_iter *iter, · line 243

Quoted 5 lines
fs/iomap/direct-io.c +1 -1
@@ -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);

/me looks at what blksize_bits does (assumes block size > 256) and rolls his eyes.

Regardless, this looks correct to me, so

--D

Quoted 15 lines
fs/iomap/direct-io.c +1 -1
 	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;
 
Signature · 1 line
2.30.2
Reviewed-by on v1 1/1
#3 lore raw
In reply to Keith Busch
Quoted 24 lines · Keith Busch

From: Keith Busch <[email protected]>

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.

---
  fs/iomap/direct-io.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
fs/iomap/direct-io.c +1 -1
index 4eb559a16c9e..503b97e5a115 100644
@@ -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;

fs/iomap/direct-io.c static loff_t iomap_dio_bio_iter(const struct iomap_iter *iter, · line 257

Quoted 7 lines
fs/iomap/direct-io.c +1 -1
@@ -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;
#4 lore raw
In reply to Keith Busch
Quoted 4 lines · Keith Busch

From: Keith Busch <[email protected]>

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.

This looks reasonable. But given that the blksz variable is only used once, why not open code the bdev_logical_block_size in the conditional?