Commit fbf1bddc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'iomap-5.14-fixes-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull iomap fixes from Darrick Wong:
 "A handful of bugfixes for the iomap code.

  There's nothing especially exciting here, just fixes for UBSAN (not
  KASAN as I erroneously wrote in the tag message) warnings about
  undefined behavior in the SEEK_DATA/SEEK_HOLE code, and some
  reshuffling of per-page block state info to fix some problems with
  gfs2.

   - Fix KASAN warnings due to integer overflow in SEEK_DATA/SEEK_HOLE

   - Fix assertion errors when using inlinedata files on gfs2"

* tag 'iomap-5.14-fixes-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  iomap: Don't create iomap_page objects in iomap_page_mkwrite_actor
  iomap: Don't create iomap_page objects for inline files
  iomap: Permit pages without an iop to enter writeback
  iomap: remove the length variable in iomap_seek_hole
  iomap: remove the length variable in iomap_seek_data
parents 6750691a 229adf3c

fs/iomap/buffered-io.c

+4 −4
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ iomap_read_inline_data(struct inode *inode, struct page *page, 
	if (PageUptodate(page))

		return;



	BUG_ON(page_has_private(page));

	BUG_ON(page->index);

	BUG_ON(size > PAGE_SIZE - offset_in_page(iomap->inline_data));
@@ -239,7 +240,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, 
{

	struct iomap_readpage_ctx *ctx = data;

	struct page *page = ctx->cur_page;

	struct iomap_page *iop = iomap_page_create(inode, page);

	struct iomap_page *iop;

	bool same_page = false, is_contig = false;

	loff_t orig_pos = pos;

	unsigned poff, plen;
@@ -252,6 +253,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, 
	}



	/* zero post-eof blocks as the page may be mapped */

	iop = iomap_page_create(inode, page);

	iomap_adjust_read_range(inode, iop, &pos, length, &poff, &plen);

	if (plen == 0)

		goto done;
@@ -967,7 +969,6 @@ iomap_page_mkwrite_actor(struct inode *inode, loff_t pos, loff_t length, 
		block_commit_write(page, 0, length);

	} else {

		WARN_ON_ONCE(!PageUptodate(page));

		iomap_page_create(inode, page);

		set_page_dirty(page);

	}
@@ -1304,14 +1305,13 @@ iomap_writepage_map(struct iomap_writepage_ctx *wpc, 
		struct writeback_control *wbc, struct inode *inode,

		struct page *page, u64 end_offset)

{

	struct iomap_page *iop = to_iomap_page(page);

	struct iomap_page *iop = iomap_page_create(inode, page);

	struct iomap_ioend *ioend, *next;

	unsigned len = i_blocksize(inode);

	u64 file_offset; /* file offset of page */

	int error = 0, count = 0, i;

	LIST_HEAD(submit_list);



	WARN_ON_ONCE(i_blocks_per_page(inode, page) > 1 && !iop);

	WARN_ON_ONCE(iop && atomic_read(&iop->write_bytes_pending) != 0);



	/*

fs/iomap/seek.c

+9 −16
Original line number Diff line number Diff line
@@ -35,23 +35,20 @@ loff_t 
iomap_seek_hole(struct inode *inode, loff_t offset, const struct iomap_ops *ops)

{

	loff_t size = i_size_read(inode);

	loff_t length = size - offset;

	loff_t ret;



	/* Nothing to be found before or beyond the end of the file. */

	if (offset < 0 || offset >= size)

		return -ENXIO;



	while (length > 0) {

		ret = iomap_apply(inode, offset, length, IOMAP_REPORT, ops,

				  &offset, iomap_seek_hole_actor);

	while (offset < size) {

		ret = iomap_apply(inode, offset, size - offset, IOMAP_REPORT,

				  ops, &offset, iomap_seek_hole_actor);

		if (ret < 0)

			return ret;

		if (ret == 0)

			break;



		offset += ret;

		length -= ret;

	}



	return offset;
@@ -83,27 +80,23 @@ loff_t 
iomap_seek_data(struct inode *inode, loff_t offset, const struct iomap_ops *ops)

{

	loff_t size = i_size_read(inode);

	loff_t length = size - offset;

	loff_t ret;



	/* Nothing to be found before or beyond the end of the file. */

	if (offset < 0 || offset >= size)

		return -ENXIO;



	while (length > 0) {

		ret = iomap_apply(inode, offset, length, IOMAP_REPORT, ops,

				  &offset, iomap_seek_data_actor);

	while (offset < size) {

		ret = iomap_apply(inode, offset, size - offset, IOMAP_REPORT,

				  ops, &offset, iomap_seek_data_actor);

		if (ret < 0)

			return ret;

		if (ret == 0)

			break;



			return offset;

		offset += ret;

		length -= ret;

	}



	if (length <= 0)

	/* We've reached the end of the file without finding data */

	return -ENXIO;

	return offset;

}

EXPORT_SYMBOL_GPL(iomap_seek_data);