Commit cbbf4c0b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

iomap: move iomap_read_inline_data around 



iomap_read_inline_data ended up being placed in the middle of the bio
based read I/O completion handling, which tends to confuse the heck out
of me whenever I follow the code.  Move it to a more suitable place.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent df0db3ec

fs/iomap.c

+20 −20
Original line number Original line Diff line number Diff line
@@ -240,26 +240,6 @@ iomap_read_page_end_io(struct bio_vec *bvec, int error) 
	iomap_read_finish(iop, page);

	iomap_read_finish(iop, page);

}

}





static void

iomap_read_inline_data(struct inode *inode, struct page *page,

		struct iomap *iomap)

{

	size_t size = i_size_read(inode);

	void *addr;



	if (PageUptodate(page))

		return;



	BUG_ON(page->index);

	BUG_ON(size > PAGE_SIZE - offset_in_page(iomap->inline_data));



	addr = kmap_atomic(page);

	memcpy(addr, iomap->inline_data, size);

	memset(addr + size, 0, PAGE_SIZE - size);

	kunmap_atomic(addr);

	SetPageUptodate(page);

}



static void

static void

iomap_read_end_io(struct bio *bio)

iomap_read_end_io(struct bio *bio)

{

{
@@ -281,6 +261,26 @@ struct iomap_readpage_ctx { 
	struct list_head	*pages;

	struct list_head	*pages;

};

};





static void

iomap_read_inline_data(struct inode *inode, struct page *page,

		struct iomap *iomap)

{

	size_t size = i_size_read(inode);

	void *addr;



	if (PageUptodate(page))

		return;



	BUG_ON(page->index);

	BUG_ON(size > PAGE_SIZE - offset_in_page(iomap->inline_data));



	addr = kmap_atomic(page);

	memcpy(addr, iomap->inline_data, size);

	memset(addr + size, 0, PAGE_SIZE - size);

	kunmap_atomic(addr);

	SetPageUptodate(page);

}



static loff_t

static loff_t

iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data,

iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data,

		struct iomap *iomap)

		struct iomap *iomap)

CRA Git | Maintained and supported by SUSTech CRA and CCSE