Skip to content

Commit e21d057

Browse files
committed
Merge branch 'for-6.11/block' into for-next
* for-6.11/block: block: clean up the check in blkdev_iomap_begin()
2 parents 9c6e1f8 + e269537 commit e21d057

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

block/fops.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,10 +394,11 @@ static int blkdev_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
394394
struct block_device *bdev = I_BDEV(inode);
395395
loff_t isize = i_size_read(inode);
396396

397-
iomap->bdev = bdev;
398-
iomap->offset = ALIGN_DOWN(offset, bdev_logical_block_size(bdev));
399397
if (offset >= isize)
400398
return -EIO;
399+
400+
iomap->bdev = bdev;
401+
iomap->offset = ALIGN_DOWN(offset, bdev_logical_block_size(bdev));
401402
iomap->type = IOMAP_MAPPED;
402403
iomap->addr = iomap->offset;
403404
iomap->length = isize - iomap->offset;

0 commit comments

Comments
 (0)