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

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

iomap: refactor iomap_dio_actor 



Split the function up into two helpers for the bio based I/O and hole
case, and a small helper to call the two.  This separates the code a
little better in preparation for supporting I/O to inline data.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent c03cea42

fs/iomap.c

+52 −36
Original line number Original line Diff line number Diff line
@@ -1327,10 +1327,9 @@ iomap_dio_zero(struct iomap_dio *dio, struct iomap *iomap, loff_t pos, 
}

}





static loff_t

static loff_t

iomap_dio_actor(struct inode *inode, loff_t pos, loff_t length,

iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length,

		void *data, struct iomap *iomap)

		struct iomap_dio *dio, struct iomap *iomap)

{

{

	struct iomap_dio *dio = data;

	unsigned int blkbits = blksize_bits(bdev_logical_block_size(iomap->bdev));

	unsigned int blkbits = blksize_bits(bdev_logical_block_size(iomap->bdev));

	unsigned int fs_block_size = i_blocksize(inode), pad;

	unsigned int fs_block_size = i_blocksize(inode), pad;

	unsigned int align = iov_iter_alignment(dio->submit.iter);

	unsigned int align = iov_iter_alignment(dio->submit.iter);
@@ -1344,23 +1343,14 @@ iomap_dio_actor(struct inode *inode, loff_t pos, loff_t length, 
	if ((pos | length | align) & ((1 << blkbits) - 1))

	if ((pos | length | align) & ((1 << blkbits) - 1))

		return -EINVAL;

		return -EINVAL;





	switch (iomap->type) {

	if (iomap->type == IOMAP_UNWRITTEN) {

	case IOMAP_HOLE:

		if (WARN_ON_ONCE(dio->flags & IOMAP_DIO_WRITE))

			return -EIO;

		/*FALLTHRU*/

	case IOMAP_UNWRITTEN:

		if (!(dio->flags & IOMAP_DIO_WRITE)) {

			length = iov_iter_zero(length, dio->submit.iter);

			dio->size += length;

			return length;

		}

		dio->flags |= IOMAP_DIO_UNWRITTEN;

		dio->flags |= IOMAP_DIO_UNWRITTEN;

		need_zeroout = true;

		need_zeroout = true;

		break;

	}

	case IOMAP_MAPPED:



	if (iomap->flags & IOMAP_F_SHARED)

	if (iomap->flags & IOMAP_F_SHARED)

		dio->flags |= IOMAP_DIO_COW;

		dio->flags |= IOMAP_DIO_COW;



	if (iomap->flags & IOMAP_F_NEW) {

	if (iomap->flags & IOMAP_F_NEW) {

		need_zeroout = true;

		need_zeroout = true;

	} else {

	} else {
@@ -1375,11 +1365,6 @@ iomap_dio_actor(struct inode *inode, loff_t pos, loff_t length, 
		    blk_queue_fua(bdev_get_queue(iomap->bdev)))

		    blk_queue_fua(bdev_get_queue(iomap->bdev)))

			use_fua = true;

			use_fua = true;

	}

	}

		break;

	default:

		WARN_ON_ONCE(1);

		return -EIO;

	}





	/*

	/*

	 * Operate on a partial iter trimmed to the extent we were called for.

	 * Operate on a partial iter trimmed to the extent we were called for.
@@ -1457,6 +1442,37 @@ iomap_dio_actor(struct inode *inode, loff_t pos, loff_t length, 
	return copied;

	return copied;

}

}





static loff_t

iomap_dio_hole_actor(loff_t length, struct iomap_dio *dio)

{

	length = iov_iter_zero(length, dio->submit.iter);

	dio->size += length;

	return length;

}



static loff_t

iomap_dio_actor(struct inode *inode, loff_t pos, loff_t length,

		void *data, struct iomap *iomap)

{

	struct iomap_dio *dio = data;



	switch (iomap->type) {

	case IOMAP_HOLE:

		if (WARN_ON_ONCE(dio->flags & IOMAP_DIO_WRITE))

			return -EIO;

		return iomap_dio_hole_actor(length, dio);

	case IOMAP_UNWRITTEN:

		if (!(dio->flags & IOMAP_DIO_WRITE))

			return iomap_dio_hole_actor(length, dio);

		return iomap_dio_bio_actor(inode, pos, length, dio, iomap);

	case IOMAP_MAPPED:

		return iomap_dio_bio_actor(inode, pos, length, dio, iomap);

	default:

		WARN_ON_ONCE(1);

		return -EIO;

	}

}



/*

/*

 * iomap_dio_rw() always completes O_[D]SYNC writes regardless of whether the IO

 * iomap_dio_rw() always completes O_[D]SYNC writes regardless of whether the IO

 * is being issued as AIO or not.  This allows us to optimise pure data writes

 * is being issued as AIO or not.  This allows us to optimise pure data writes