Commit a91b4367 authored by Jim Harris's avatar Jim Harris
Browse files

bdev: move _bdev_io_set_bounce_buf 



This helps reduce the size of a future patch.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: If5dc2607c91ccb172ee5a27d0a85a7cf6bf3d423
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11530


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 3b1578c8

lib/bdev/bdev.c

+18 −18
Original line number Diff line number Diff line
@@ -850,24 +850,6 @@ bdev_io_get_buf_complete(struct spdk_bdev_io *bdev_io, bool status) 
	}

}



static void

_bdev_io_set_bounce_buf(struct spdk_bdev_io *bdev_io, void *buf, size_t len)

{

	/* save original iovec */

	bdev_io->internal.orig_iovs = bdev_io->u.bdev.iovs;

	bdev_io->internal.orig_iovcnt = bdev_io->u.bdev.iovcnt;

	/* set bounce iov */

	bdev_io->u.bdev.iovs = &bdev_io->internal.bounce_iov;

	bdev_io->u.bdev.iovcnt = 1;

	/* set bounce buffer for this operation */

	bdev_io->u.bdev.iovs[0].iov_base = buf;

	bdev_io->u.bdev.iovs[0].iov_len = len;

	/* if this is write path, copy data from original buffer to bounce buffer */

	if (bdev_io->type == SPDK_BDEV_IO_TYPE_WRITE) {

		_copy_iovs_to_buf(buf, len, bdev_io->internal.orig_iovs, bdev_io->internal.orig_iovcnt);

	}

}



static void

_bdev_io_set_bounce_md_buf(struct spdk_bdev_io *bdev_io, void *md_buf, size_t len)

{
@@ -905,6 +887,24 @@ _bdev_io_set_md_buf(struct spdk_bdev_io *bdev_io) 
	bdev_io_get_buf_complete(bdev_io, true);

}



static void

_bdev_io_set_bounce_buf(struct spdk_bdev_io *bdev_io, void *buf, size_t len)

{

	/* save original iovec */

	bdev_io->internal.orig_iovs = bdev_io->u.bdev.iovs;

	bdev_io->internal.orig_iovcnt = bdev_io->u.bdev.iovcnt;

	/* set bounce iov */

	bdev_io->u.bdev.iovs = &bdev_io->internal.bounce_iov;

	bdev_io->u.bdev.iovcnt = 1;

	/* set bounce buffer for this operation */

	bdev_io->u.bdev.iovs[0].iov_base = buf;

	bdev_io->u.bdev.iovs[0].iov_len = len;

	/* if this is write path, copy data from original buffer to bounce buffer */

	if (bdev_io->type == SPDK_BDEV_IO_TYPE_WRITE) {

		_copy_iovs_to_buf(buf, len, bdev_io->internal.orig_iovs, bdev_io->internal.orig_iovcnt);

	}

}



static void

_bdev_io_set_buf(struct spdk_bdev_io *bdev_io, void *buf, uint64_t len)

{