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

bdev/ocssd: Rename the local and member variables ocssd_ioch by ocssd_ch

Browse Source 
This change follows the standard nvme bdev.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I83486712d23668e2688e0f1353519cea6dd6fef7
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4689
Community-CI: Broadcom CI
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Shuhei Matsumoto 2020-10-14 21:51:04 +09:00 committed by Tomasz Zawadzki
parent 69884770ec
commit 37cc052a6c
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
module/bdev/nvme/bdev_ocssd.c
View File

@ -703,16 +703,16 @@ bdev_ocssd_poll_pending(void *ctx)
{ {
struct spdk_io_channel *ch = ctx; struct spdk_io_channel *ch = ctx;
struct nvme_io_channel *nvme_ch; struct nvme_io_channel *nvme_ch;
struct ocssd_io_channel *ocssd_ioch; struct ocssd_io_channel *ocssd_ch;
struct spdk_bdev_io *bdev_io; struct spdk_bdev_io *bdev_io;
TAILQ_HEAD(, spdk_bdev_io) pending_requests; TAILQ_HEAD(, spdk_bdev_io) pending_requests;
int num_requests = 0; int num_requests = 0;
nvme_ch = spdk_io_channel_get_ctx(ch); nvme_ch = spdk_io_channel_get_ctx(ch);
ocssd_ioch = nvme_ch->ocssd_ioch; ocssd_ch = nvme_ch->ocssd_ch;
TAILQ_INIT(&pending_requests); TAILQ_INIT(&pending_requests);
TAILQ_SWAP(&ocssd_ioch->pending_requests, &pending_requests, spdk_bdev_io, module_link); TAILQ_SWAP(&ocssd_ch->pending_requests, &pending_requests, spdk_bdev_io, module_link);
while ((bdev_io = TAILQ_FIRST(&pending_requests))) { while ((bdev_io = TAILQ_FIRST(&pending_requests))) {
TAILQ_REMOVE(&pending_requests, bdev_io, module_link); TAILQ_REMOVE(&pending_requests, bdev_io, module_link);
@ -720,8 +720,8 @@ bdev_ocssd_poll_pending(void *ctx)
num_requests++; num_requests++;
} }
if (TAILQ_EMPTY(&ocssd_ioch->pending_requests)) { if (TAILQ_EMPTY(&ocssd_ch->pending_requests)) {
spdk_poller_pause(ocssd_ioch->pending_poller); spdk_poller_pause(ocssd_ch->pending_poller);
} }
return num_requests; return num_requests;
@ -731,10 +731,10 @@ static void
bdev_ocssd_delay_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io) bdev_ocssd_delay_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
{ {
struct nvme_io_channel *nvme_ch = spdk_io_channel_get_ctx(ch); struct nvme_io_channel *nvme_ch = spdk_io_channel_get_ctx(ch);
struct ocssd_io_channel *ocssd_ioch = nvme_ch->ocssd_ioch; struct ocssd_io_channel *ocssd_ch = nvme_ch->ocssd_ch;
TAILQ_INSERT_TAIL(&ocssd_ioch->pending_requests, bdev_io, module_link); TAILQ_INSERT_TAIL(&ocssd_ch->pending_requests, bdev_io, module_link);
spdk_poller_resume(ocssd_ioch->pending_poller); spdk_poller_resume(ocssd_ch->pending_poller);
} }
static int static int
@ -1440,26 +1440,26 @@ bdev_ocssd_depopulate_namespace(struct nvme_bdev_ns *ns)
int int
bdev_ocssd_create_io_channel(struct nvme_io_channel *nvme_ch) bdev_ocssd_create_io_channel(struct nvme_io_channel *nvme_ch)
{ {
struct ocssd_io_channel *ocssd_ioch; struct ocssd_io_channel *ocssd_ch;
ocssd_ioch = calloc(1, sizeof(*ocssd_ioch)); ocssd_ch = calloc(1, sizeof(*ocssd_ch));
if (ocssd_ioch == NULL) { if (ocssd_ch == NULL) {
return -ENOMEM; return -ENOMEM;
} }
ocssd_ioch->pending_poller = SPDK_POLLER_REGISTER(bdev_ocssd_poll_pending, ocssd_ch->pending_poller = SPDK_POLLER_REGISTER(bdev_ocssd_poll_pending,
spdk_io_channel_from_ctx(nvme_ch), 0); spdk_io_channel_from_ctx(nvme_ch), 0);
if (ocssd_ioch->pending_poller == NULL) { if (ocssd_ch->pending_poller == NULL) {
SPDK_ERRLOG("Failed to register pending requests poller\n"); SPDK_ERRLOG("Failed to register pending requests poller\n");
free(ocssd_ioch); free(ocssd_ch);
return -ENOMEM; return -ENOMEM;
} }
/* Start the poller paused and only resume it once there are pending requests */ /* Start the poller paused and only resume it once there are pending requests */
spdk_poller_pause(ocssd_ioch->pending_poller); spdk_poller_pause(ocssd_ch->pending_poller);
TAILQ_INIT(&ocssd_ioch->pending_requests); TAILQ_INIT(&ocssd_ch->pending_requests);
nvme_ch->ocssd_ioch = ocssd_ioch; nvme_ch->ocssd_ch = ocssd_ch;
return 0; return 0;
} }
@ -1467,8 +1467,8 @@ bdev_ocssd_create_io_channel(struct nvme_io_channel *nvme_ch)
void void
bdev_ocssd_destroy_io_channel(struct nvme_io_channel *nvme_ch) bdev_ocssd_destroy_io_channel(struct nvme_io_channel *nvme_ch)
{ {
spdk_poller_unregister(&nvme_ch->ocssd_ioch->pending_poller); spdk_poller_unregister(&nvme_ch->ocssd_ch->pending_poller);
free(nvme_ch->ocssd_ioch); free(nvme_ch->ocssd_ch);
} }
int int

2
module/bdev/nvme/common.h
View File

@ -148,7 +148,7 @@ struct nvme_io_channel {
struct spdk_nvme_qpair *qpair; struct spdk_nvme_qpair *qpair;
struct nvme_bdev_poll_group *group; struct nvme_bdev_poll_group *group;
TAILQ_HEAD(, spdk_bdev_io) pending_resets; TAILQ_HEAD(, spdk_bdev_io) pending_resets;
struct ocssd_io_channel *ocssd_ioch; struct ocssd_io_channel *ocssd_ch;
}; };
void nvme_ctrlr_populate_namespace_done(struct nvme_async_probe_ctx *ctx, void nvme_ctrlr_populate_namespace_done(struct nvme_async_probe_ctx *ctx,