From 31c528414fb3ed2afa1e409b106df4afe47ae345 Mon Sep 17 00:00:00 2001 From: Xiaodong Liu Date: Mon, 21 Jan 2019 21:09:15 +0800 Subject: [PATCH] bdev/raid: change related names for base_bdev involved The elements and functions which are used for raid reset io, can also be used for other potential raid IO requests which need multiple base_bdev involved. Change-Id: Ide7ea190fdbd29da9f9fa22862a0a7c162509697 Signed-off-by: Xiaodong Liu Reviewed-on: https://review.gerrithub.io/c/441308 Reviewed-by: wuzhouhui Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto Reviewed-by: Changpeng Liu Tested-by: SPDK CI Jenkins --- lib/bdev/raid/bdev_raid.c | 32 ++++++++++++++++---------------- lib/bdev/raid/bdev_raid.h | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/bdev/raid/bdev_raid.c b/lib/bdev/raid/bdev_raid.c index 297826cad..004b8096e 100644 --- a/lib/bdev/raid/bdev_raid.c +++ b/lib/bdev/raid/bdev_raid.c @@ -467,16 +467,16 @@ raid_bdev_start_rw_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev /* * brief: - * raid_bdev_reset_completion is the completion callback for member disk resets + * raid_bdev_base_io_completion is the completion callback for member disk requests * params: - * bdev_io - pointer to member disk reset bdev_io - * success - true if reset was successful, false if unsuccessful - * cb_arg - callback argument (parent reset bdev_io) + * bdev_io - pointer to member disk requested bdev_io + * success - true if successful, false if unsuccessful + * cb_arg - callback argument (parent raid bdev_io) * returns: * none */ static void -raid_bdev_reset_completion(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg) +raid_bdev_base_io_completion(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg) { struct spdk_bdev_io *parent_io = cb_arg; struct raid_bdev *raid_bdev = (struct raid_bdev *)parent_io->bdev->ctxt; @@ -485,12 +485,12 @@ raid_bdev_reset_completion(struct spdk_bdev_io *bdev_io, bool success, void *cb_ spdk_bdev_free_io(bdev_io); if (!success) { - raid_io->base_bdev_reset_status = SPDK_BDEV_IO_STATUS_FAILED; + raid_io->base_bdev_io_status = SPDK_BDEV_IO_STATUS_FAILED; } - raid_io->base_bdev_reset_completed++; - if (raid_io->base_bdev_reset_completed == raid_bdev->num_base_bdevs) { - spdk_bdev_io_complete(parent_io, raid_io->base_bdev_reset_status); + raid_io->base_bdev_io_completed++; + if (raid_io->base_bdev_io_completed == raid_bdev->num_base_bdevs) { + spdk_bdev_io_complete(parent_io, raid_io->base_bdev_io_status); } } @@ -518,13 +518,13 @@ _raid_bdev_submit_reset_request_next(void *_bdev_io) raid_io = (struct raid_bdev_io *)bdev_io->driver_ctx; raid_ch = spdk_io_channel_get_ctx(raid_io->ch); - while (raid_io->base_bdev_reset_submitted < raid_bdev->num_base_bdevs) { - i = raid_io->base_bdev_reset_submitted; + while (raid_io->base_bdev_io_submitted < raid_bdev->num_base_bdevs) { + i = raid_io->base_bdev_io_submitted; ret = spdk_bdev_reset(raid_bdev->base_bdev_info[i].desc, raid_ch->base_channel[i], - raid_bdev_reset_completion, bdev_io); + raid_bdev_base_io_completion, bdev_io); if (ret == 0) { - raid_io->base_bdev_reset_submitted++; + raid_io->base_bdev_io_submitted++; } else if (ret == -ENOMEM) { raid_io->waitq_entry.bdev = raid_bdev->base_bdev_info[i].bdev; raid_io->waitq_entry.cb_fn = _raid_bdev_submit_reset_request_next; @@ -558,9 +558,9 @@ _raid_bdev_submit_reset_request(struct spdk_io_channel *ch, struct spdk_bdev_io raid_io = (struct raid_bdev_io *)bdev_io->driver_ctx; raid_io->ch = ch; - raid_io->base_bdev_reset_submitted = 0; - raid_io->base_bdev_reset_completed = 0; - raid_io->base_bdev_reset_status = SPDK_BDEV_IO_STATUS_SUCCESS; + raid_io->base_bdev_io_submitted = 0; + raid_io->base_bdev_io_completed = 0; + raid_io->base_bdev_io_status = SPDK_BDEV_IO_STATUS_SUCCESS; _raid_bdev_submit_reset_request_next(bdev_io); } diff --git a/lib/bdev/raid/bdev_raid.h b/lib/bdev/raid/bdev_raid.h index 02290dff8..b016fc111 100644 --- a/lib/bdev/raid/bdev_raid.h +++ b/lib/bdev/raid/bdev_raid.h @@ -140,10 +140,10 @@ struct raid_bdev_io { /* Original channel for this IO, used in queuing logic */ struct spdk_io_channel *ch; - /* Used for tracking progress on resets sent to member disks. */ - uint8_t base_bdev_reset_submitted; - uint8_t base_bdev_reset_completed; - uint8_t base_bdev_reset_status; + /* Used for tracking progress on io requests sent to member disks. */ + uint8_t base_bdev_io_submitted; + uint8_t base_bdev_io_completed; + uint8_t base_bdev_io_status; }; /*