bdev/raid: add io_expected in struct raid_bdev_io

base_bdev_io_expected can be used for the situation
that IO requries multiple and uncertain number of
base bdevs.

Change-Id: I912400f839c02c95606bc94e7c8ad4946e90b6bf
Signed-off-by: Xiaodong Liu <xiaodong.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/c/446009
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Xiaodong Liu 2019-02-25 00:27:50 +08:00 committed by Jim Harris
parent 02a0fc1df1
commit 48b4a2545a
2 changed files with 5 additions and 2 deletions

View File

@ -479,7 +479,6 @@ static void
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;
struct raid_bdev_io *raid_io = (struct raid_bdev_io *)parent_io->driver_ctx;
spdk_bdev_free_io(bdev_io);
@ -489,7 +488,7 @@ raid_bdev_base_io_completion(struct spdk_bdev_io *bdev_io, bool success, void *c
}
raid_io->base_bdev_io_completed++;
if (raid_io->base_bdev_io_completed == raid_bdev->num_base_bdevs) {
if (raid_io->base_bdev_io_completed == raid_io->base_bdev_io_expected) {
spdk_bdev_io_complete(parent_io, raid_io->base_bdev_io_status);
}
}
@ -584,11 +583,14 @@ static void
_raid_bdev_submit_reset_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
{
struct raid_bdev_io *raid_io;
struct raid_bdev *raid_bdev;
raid_bdev = (struct raid_bdev *)bdev_io->bdev->ctxt;
raid_io = (struct raid_bdev_io *)bdev_io->driver_ctx;
raid_io->ch = ch;
raid_io->base_bdev_io_submitted = 0;
raid_io->base_bdev_io_completed = 0;
raid_io->base_bdev_io_expected = raid_bdev->num_base_bdevs;
raid_io->base_bdev_io_status = SPDK_BDEV_IO_STATUS_SUCCESS;
_raid_bdev_submit_reset_request_next(bdev_io);
}

View File

@ -143,6 +143,7 @@ struct raid_bdev_io {
/* 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_expected;
uint8_t base_bdev_io_status;
};