Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[mirror_ubuntu-bionic-kernel.git] / fs / ext2 / inode.c

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 1442a4c734c8f7b20ffbaf5b37312a94113d95c8..9b2ac55ac34f0c7d1ccab9d95bedd7e482da66fd 100644 (file)
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -821,11 +821,11 @@ static int ext2_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
 
        if (ret == 0) {
                iomap->type = IOMAP_HOLE;
-               iomap->blkno = IOMAP_NULL_BLOCK;
+               iomap->addr = IOMAP_NULL_ADDR;
                iomap->length = 1 << blkbits;
        } else {
                iomap->type = IOMAP_MAPPED;
-               iomap->blkno = (sector_t)bno << (blkbits - 9);
+               iomap->addr = (u64)bno << blkbits;
                iomap->length = (u64)ret << blkbits;
                iomap->flags |= IOMAP_F_MERGED;
        }