ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdev/raid: rename some of the I/O submission path functions

Browse Source 
These new names are a bit more clear after some of the recent
I/O splitting changes.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: Ibe265ca2f969ee1058316c519e5d679861e03713

Reviewed-on: https://review.gerrithub.io/425321
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Jim Harris 2018-09-11 14:01:57 -07:00
parent f2a9507af6
commit 13c3b147dc
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/bdev/raid/bdev_raid.c
View File

@ -282,7 +282,7 @@ raid_bdev_io_completion(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg
/* /*
* brief: * brief:
* raid_bdev_submit_children function is used to submit I/O to the correct * raid_bdev_submit_rw_request function is used to submit I/O to the correct
* member disk * member disk
* params: * params:
* bdev_io - parent bdev io * bdev_io - parent bdev io
@ -292,7 +292,7 @@ raid_bdev_io_completion(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg
* non zero - failure * non zero - failure
*/ */
static int static int
raid_bdev_submit_children(struct spdk_bdev_io *bdev_io, uint64_t start_strip) raid_bdev_submit_rw_request(struct spdk_bdev_io *bdev_io, uint64_t start_strip)
{ {
struct raid_bdev_io *raid_io = (struct raid_bdev_io *)bdev_io->driver_ctx; struct raid_bdev_io *raid_io = (struct raid_bdev_io *)bdev_io->driver_ctx;
struct raid_bdev_io_channel *raid_ch = spdk_io_channel_get_ctx(raid_io->ch); struct raid_bdev_io_channel *raid_ch = spdk_io_channel_get_ctx(raid_io->ch);
@ -422,7 +422,7 @@ raid_bdev_waitq_io_process(void *ctx)
*/ */
raid_bdev = (struct raid_bdev *)bdev_io->bdev->ctxt; raid_bdev = (struct raid_bdev *)bdev_io->bdev->ctxt;
start_strip = bdev_io->u.bdev.offset_blocks >> raid_bdev->strip_size_shift; start_strip = bdev_io->u.bdev.offset_blocks >> raid_bdev->strip_size_shift;
ret = raid_bdev_submit_children(bdev_io, start_strip); ret = raid_bdev_submit_rw_request(bdev_io, start_strip);
if (ret != 0) { if (ret != 0) {
raid_bdev_io_submit_fail_process(raid_bdev, bdev_io, raid_io, ret); raid_bdev_io_submit_fail_process(raid_bdev, bdev_io, raid_io, ret);
} }
@ -430,7 +430,7 @@ raid_bdev_waitq_io_process(void *ctx)
/* /*
* brief: * brief:
* _raid_bdev_submit_rw_request function is the submit_request function for * raid_bdev_start_rw_request function is the submit_request function for
* read/write requests * read/write requests
* params: * params:
* ch - pointer to raid bdev io channel * ch - pointer to raid bdev io channel
@ -439,7 +439,7 @@ raid_bdev_waitq_io_process(void *ctx)
* none * none
*/ */
static void static void
_raid_bdev_submit_rw_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io) raid_bdev_start_rw_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
{ {
struct raid_bdev_io *raid_io; struct raid_bdev_io *raid_io;
struct raid_bdev *raid_bdev; struct raid_bdev *raid_bdev;
@ -459,7 +459,7 @@ _raid_bdev_submit_rw_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bd
spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED); spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);
return; return;
} }
ret = raid_bdev_submit_children(bdev_io, start_strip); ret = raid_bdev_submit_rw_request(bdev_io, start_strip);
if (ret != 0) { if (ret != 0) {
raid_bdev_io_submit_fail_process(raid_bdev, bdev_io, raid_io, ret); raid_bdev_io_submit_fail_process(raid_bdev, bdev_io, raid_io, ret);
} }
@ -581,15 +581,15 @@ raid_bdev_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_i
switch (bdev_io->type) { switch (bdev_io->type) {
case SPDK_BDEV_IO_TYPE_READ: case SPDK_BDEV_IO_TYPE_READ:
if (bdev_io->u.bdev.iovs[0].iov_base == NULL) { if (bdev_io->u.bdev.iovs[0].iov_base == NULL) {
spdk_bdev_io_get_buf(bdev_io, _raid_bdev_submit_rw_request, spdk_bdev_io_get_buf(bdev_io, raid_bdev_start_rw_request,
bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen); bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen);
} else { } else {
/* Just call it directly if iov_base is already populated. */ /* Just call it directly if iov_base is already populated. */
_raid_bdev_submit_rw_request(ch, bdev_io); raid_bdev_start_rw_request(ch, bdev_io);
} }
break; break;
case SPDK_BDEV_IO_TYPE_WRITE: case SPDK_BDEV_IO_TYPE_WRITE:
_raid_bdev_submit_rw_request(ch, bdev_io); raid_bdev_start_rw_request(ch, bdev_io);
break; break;
case SPDK_BDEV_IO_TYPE_FLUSH: case SPDK_BDEV_IO_TYPE_FLUSH: