Commit 786f847f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba
Browse files

iomap: add per-iomap_iter private data 



Allow the file system to keep state for all iterations.  For now only
wire it up for direct I/O as there is an immediate need for it there.

Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 908c5490

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -8167,7 +8167,7 @@ static const struct iomap_dio_ops btrfs_dio_ops = { 
ssize_t btrfs_dio_rw(struct kiocb *iocb, struct iov_iter *iter, size_t done_before)

{

	return iomap_dio_rw(iocb, iter, &btrfs_dio_iomap_ops, &btrfs_dio_ops,

			    IOMAP_DIO_PARTIAL, done_before);

			    IOMAP_DIO_PARTIAL, NULL, done_before);

}



static int btrfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,

fs/erofs/data.c

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static ssize_t erofs_file_read_iter(struct kiocb *iocb, struct iov_iter *to) 


		if (!err)

			return iomap_dio_rw(iocb, to, &erofs_iomap_ops,

					    NULL, 0, 0);

					    NULL, 0, NULL, 0);

		if (err < 0)

			return err;

	}

fs/ext4/file.c

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static ssize_t ext4_dio_read_iter(struct kiocb *iocb, struct iov_iter *to) 
		return generic_file_read_iter(iocb, to);

	}



	ret = iomap_dio_rw(iocb, to, &ext4_iomap_ops, NULL, 0, 0);

	ret = iomap_dio_rw(iocb, to, &ext4_iomap_ops, NULL, 0, NULL, 0);

	inode_unlock_shared(inode);



	file_accessed(iocb->ki_filp);
@@ -565,7 +565,7 @@ static ssize_t ext4_dio_write_iter(struct kiocb *iocb, struct iov_iter *from) 
		iomap_ops = &ext4_iomap_overwrite_ops;

	ret = iomap_dio_rw(iocb, from, iomap_ops, &ext4_dio_write_ops,

			   (unaligned_io || extend) ? IOMAP_DIO_FORCE_WAIT : 0,

			   0);

			   NULL, 0);

	if (ret == -ENOTBLK)

		ret = 0;

fs/f2fs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -4309,7 +4309,7 @@ static ssize_t f2fs_dio_read_iter(struct kiocb *iocb, struct iov_iter *to) 
	 */

	inc_page_count(sbi, F2FS_DIO_READ);

	dio = __iomap_dio_rw(iocb, to, &f2fs_iomap_ops,

			     &f2fs_iomap_dio_read_ops, 0, 0);

			     &f2fs_iomap_dio_read_ops, 0, NULL, 0);

	if (IS_ERR_OR_NULL(dio)) {

		ret = PTR_ERR_OR_ZERO(dio);

		if (ret != -EIOCBQUEUED)
@@ -4527,7 +4527,7 @@ static ssize_t f2fs_dio_write_iter(struct kiocb *iocb, struct iov_iter *from, 
	if (pos + count > inode->i_size)

		dio_flags |= IOMAP_DIO_FORCE_WAIT;

	dio = __iomap_dio_rw(iocb, from, &f2fs_iomap_ops,

			     &f2fs_iomap_dio_write_ops, dio_flags, 0);

			     &f2fs_iomap_dio_write_ops, dio_flags, NULL, 0);

	if (IS_ERR_OR_NULL(dio)) {

		ret = PTR_ERR_OR_ZERO(dio);

		if (ret == -ENOTBLK)

fs/gfs2/file.c

+2 −2
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ static ssize_t gfs2_file_direct_read(struct kiocb *iocb, struct iov_iter *to, 
	pagefault_disable();

	to->nofault = true;

	ret = iomap_dio_rw(iocb, to, &gfs2_iomap_ops, NULL,

			   IOMAP_DIO_PARTIAL, read);

			   IOMAP_DIO_PARTIAL, NULL, read);

	to->nofault = false;

	pagefault_enable();

	if (ret <= 0 && ret != -EFAULT)
@@ -898,7 +898,7 @@ static ssize_t gfs2_file_direct_write(struct kiocb *iocb, struct iov_iter *from, 


	from->nofault = true;

	ret = iomap_dio_rw(iocb, from, &gfs2_iomap_ops, NULL,

			   IOMAP_DIO_PARTIAL, written);

			   IOMAP_DIO_PARTIAL, NULL, written);

	from->nofault = false;

	if (ret <= 0) {

		if (ret == -ENOTBLK)