Commit c86e5b18 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

bdev/malloc: Extract internal of verify_pi() for code reuse 



Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: Ib4f3f9e038d824ac5a8e4c65a2cff1a3e365a432
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/25418


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Community-CI: Community CI Samsung <spdk.community.ci.samsung@gmail.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
parent 97329b16

module/bdev/malloc/bdev_malloc.c

+16 −6
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ struct malloc_channel { 
};



static int

malloc_verify_pi(struct spdk_bdev_io *bdev_io)

_malloc_verify_pi(struct spdk_bdev_io *bdev_io, struct iovec *iovs, int iovcnt,

		  void *md_buf)

{

	struct spdk_bdev *bdev = bdev_io->bdev;

	struct spdk_dif_ctx dif_ctx;
@@ -63,14 +64,14 @@ malloc_verify_pi(struct spdk_bdev_io *bdev_io) 
	}



	if (spdk_bdev_is_md_interleaved(bdev)) {

		rc = spdk_dif_verify(bdev_io->u.bdev.iovs,

				     bdev_io->u.bdev.iovcnt,

		rc = spdk_dif_verify(iovs,

				     iovcnt,

				     bdev_io->u.bdev.num_blocks,

				     &dif_ctx,

				     &err_blk);

	} else {

		struct iovec md_iov = {

			.iov_base	= bdev_io->u.bdev.md_buf,

			.iov_base	= md_buf,

			.iov_len	= bdev_io->u.bdev.num_blocks * bdev->md_len,

		};
@@ -78,8 +79,8 @@ malloc_verify_pi(struct spdk_bdev_io *bdev_io) 
			return 0;

		}



		rc = spdk_dix_verify(bdev_io->u.bdev.iovs,

				     bdev_io->u.bdev.iovcnt,

		rc = spdk_dix_verify(iovs,

				     iovcnt,

				     &md_iov,

				     bdev_io->u.bdev.num_blocks,

				     &dif_ctx,
@@ -100,6 +101,15 @@ malloc_verify_pi(struct spdk_bdev_io *bdev_io) 
	return rc;

}



static int

malloc_verify_pi(struct spdk_bdev_io *bdev_io)

{

	return _malloc_verify_pi(bdev_io,

				 bdev_io->u.bdev.iovs,

				 bdev_io->u.bdev.iovcnt,

				 bdev_io->u.bdev.md_buf);

}



static int

malloc_unmap_write_zeroes_generate_pi(struct spdk_bdev_io *bdev_io)

{