Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19fe5f64 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Theodore Ts'o
Browse files

iomap: Switch from blkno to disk offset 



Replace iomap->blkno, the sector number, with iomap->addr, the disk
offset in bytes.  For invalid disk offsets, use the special value
IOMAP_NULL_ADDR instead of IOMAP_NULL_BLOCK.

This allows to use iomap for mappings which are not block aligned, such
as inline data on ext4.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>  # iomap, xfs
Reviewed-by: default avatarJan Kara <jack@suse.cz>
parent 9e66317d

fs/buffer.c

+2 −2
Original line number Diff line number Diff line
@@ -1978,8 +1978,8 @@ iomap_to_bh(struct inode *inode, sector_t block, struct buffer_head *bh, 
	case IOMAP_MAPPED:

		if (offset >= i_size_read(inode))

			set_buffer_new(bh);

		bh->b_blocknr = (iomap->blkno >> (inode->i_blkbits - 9)) +

				((offset - iomap->offset) >> inode->i_blkbits);

		bh->b_blocknr = (iomap->addr + offset - iomap->offset) >>

				inode->i_blkbits;

		set_buffer_mapped(bh);

		break;

	}

fs/dax.c

+1 −1
Original line number Diff line number Diff line
@@ -938,7 +938,7 @@ EXPORT_SYMBOL_GPL(__dax_zero_page_range); 


static sector_t dax_iomap_sector(struct iomap *iomap, loff_t pos)

{

	return iomap->blkno + (((pos & PAGE_MASK) - iomap->offset) >> 9);

	return (iomap->addr + (pos & PAGE_MASK) - iomap->offset) >> 9;

}



static loff_t

fs/ext2/inode.c

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

	}

fs/ext4/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -3472,7 +3472,7 @@ static int ext4_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 = (u64)map.m_len << blkbits;

	} else {

		if (map.m_flags & EXT4_MAP_MAPPED) {
@@ -3483,7 +3483,7 @@ static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length, 
			WARN_ON_ONCE(1);

			return -EIO;

		}

		iomap->blkno = (sector_t)map.m_pblk << (blkbits - 9);

		iomap->addr = (u64)map.m_pblk << blkbits;

		iomap->length = (u64)map.m_len << blkbits;

	}

fs/iomap.c

+5 −6
Original line number Diff line number Diff line
@@ -350,8 +350,8 @@ static int iomap_zero(struct inode *inode, loff_t pos, unsigned offset, 
static int iomap_dax_zero(loff_t pos, unsigned offset, unsigned bytes,

		struct iomap *iomap)

{

	sector_t sector = iomap->blkno +

		(((pos & ~(PAGE_SIZE - 1)) - iomap->offset) >> 9);

	sector_t sector = (iomap->addr +

			   (pos & PAGE_MASK) - iomap->offset) >> 9;



	return __dax_zero_page_range(iomap->bdev, iomap->dax_dev, sector,

			offset, bytes);
@@ -512,9 +512,8 @@ static int iomap_to_fiemap(struct fiemap_extent_info *fi, 
		flags |= FIEMAP_EXTENT_SHARED;



	return fiemap_fill_next_extent(fi, iomap->offset,

			iomap->blkno != IOMAP_NULL_BLOCK ? iomap->blkno << 9: 0,

			iomap->addr != IOMAP_NULL_ADDR ? iomap->addr : 0,

			iomap->length, flags);



}



static loff_t
@@ -823,7 +822,7 @@ iomap_dio_zero(struct iomap_dio *dio, struct iomap *iomap, loff_t pos, 
	bio = bio_alloc(GFP_KERNEL, 1);

	bio_set_dev(bio, iomap->bdev);

	bio->bi_iter.bi_sector =

		iomap->blkno + ((pos - iomap->offset) >> 9);

		(iomap->addr + pos - iomap->offset) >> 9;

	bio->bi_private = dio;

	bio->bi_end_io = iomap_dio_bio_end_io;
@@ -902,7 +901,7 @@ iomap_dio_actor(struct inode *inode, loff_t pos, loff_t length, 
		bio = bio_alloc(GFP_KERNEL, nr_pages);

		bio_set_dev(bio, iomap->bdev);

		bio->bi_iter.bi_sector =

			iomap->blkno + ((pos - iomap->offset) >> 9);

			(iomap->addr + pos - iomap->offset) >> 9;

		bio->bi_write_hint = dio->iocb->ki_hint;

		bio->bi_private = dio;

		bio->bi_end_io = iomap_dio_bio_end_io;