From 1a5af9305fae1ac717b52188a6437a69c2aab4a7 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Tue, 2 May 2023 10:32:13 +0900 Subject: [PATCH] bdev: Small clean up for copy command fallback As name suffix, _done has been used more often than _complete for fallback function names. 100 chars per line is suggested implicitly. Do these small clean up in this patch. Signed-off-by: Shuhei Matsumoto Change-Id: Id14dd3f09be8fd49b947b7a8f8b87108fb56c346 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17900 Reviewed-by: Aleksey Marchuk Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Community-CI: Mellanox Build Bot --- lib/bdev/bdev.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index a03706ba8..b6fe36d7c 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -9603,14 +9603,15 @@ spdk_bdev_for_each_channel(struct spdk_bdev *bdev, spdk_bdev_for_each_channel_ms } static void -bdev_copy_do_write_complete(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg) +bdev_copy_do_write_done(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg) { struct spdk_bdev_io *parent_io = cb_arg; + spdk_bdev_free_io(bdev_io); + /* Check return status of write */ parent_io->internal.status = success ? SPDK_BDEV_IO_STATUS_SUCCESS : SPDK_BDEV_IO_STATUS_FAILED; parent_io->internal.cb(parent_io, success, parent_io->internal.caller_ctx); - spdk_bdev_free_io(bdev_io); } static void @@ -9621,9 +9622,10 @@ bdev_copy_do_write(void *_bdev_io) /* Write blocks */ rc = spdk_bdev_write_blocks_with_md(bdev_io->internal.desc, - spdk_io_channel_from_ctx(bdev_io->internal.ch), bdev_io->u.bdev.iovs[0].iov_base, + spdk_io_channel_from_ctx(bdev_io->internal.ch), + bdev_io->u.bdev.iovs[0].iov_base, bdev_io->u.bdev.md_buf, bdev_io->u.bdev.offset_blocks, - bdev_io->u.bdev.num_blocks, bdev_copy_do_write_complete, bdev_io); + bdev_io->u.bdev.num_blocks, bdev_copy_do_write_done, bdev_io); if (rc == -ENOMEM) { bdev_queue_io_wait_with_cb(bdev_io, bdev_copy_do_write); @@ -9634,20 +9636,19 @@ bdev_copy_do_write(void *_bdev_io) } static void -bdev_copy_do_read_complete(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg) +bdev_copy_do_read_done(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg) { struct spdk_bdev_io *parent_io = cb_arg; + spdk_bdev_free_io(bdev_io); + /* Check return status of read */ if (!success) { parent_io->internal.status = SPDK_BDEV_IO_STATUS_FAILED; parent_io->internal.cb(parent_io, false, parent_io->internal.caller_ctx); - spdk_bdev_free_io(bdev_io); return; } - spdk_bdev_free_io(bdev_io); - /* Do write */ bdev_copy_do_write(parent_io); } @@ -9660,9 +9661,10 @@ bdev_copy_do_read(void *_bdev_io) /* Read blocks */ rc = spdk_bdev_read_blocks_with_md(bdev_io->internal.desc, - spdk_io_channel_from_ctx(bdev_io->internal.ch), bdev_io->u.bdev.iovs[0].iov_base, + spdk_io_channel_from_ctx(bdev_io->internal.ch), + bdev_io->u.bdev.iovs[0].iov_base, bdev_io->u.bdev.md_buf, bdev_io->u.bdev.copy.src_offset_blocks, - bdev_io->u.bdev.num_blocks, bdev_copy_do_read_complete, bdev_io); + bdev_io->u.bdev.num_blocks, bdev_copy_do_read_done, bdev_io); if (rc == -ENOMEM) { bdev_queue_io_wait_with_cb(bdev_io, bdev_copy_do_read);