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

bdev/ocssd: Rename the local variable ioch by ch

Browse Source 
This changes follows the standard nvme bdev.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I8306fef00489b36b57065bde78ccf9d852b5cba9
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4688
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: John Kariuki <John.K.Kariuki@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Community-CI: Broadcom CI
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Shuhei Matsumoto 2020-10-14 21:48:23 +09:00 committed by Tomasz Zawadzki
parent 350df1c6fe
commit 69884770ec
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -378,11 +378,11 @@ bdev_ocssd_read_cb(void *ctx, const struct spdk_nvme_cpl *cpl)
} }
static int static int
bdev_ocssd_read(struct spdk_io_channel *ioch, struct spdk_bdev_io *bdev_io) bdev_ocssd_read(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
{ {
struct ocssd_bdev *ocssd_bdev = bdev_io->bdev->ctxt; struct ocssd_bdev *ocssd_bdev = bdev_io->bdev->ctxt;
struct nvme_bdev *nvme_bdev = &ocssd_bdev->nvme_bdev; struct nvme_bdev *nvme_bdev = &ocssd_bdev->nvme_bdev;
struct nvme_io_channel *nvme_ch = spdk_io_channel_get_ctx(ioch); struct nvme_io_channel *nvme_ch = spdk_io_channel_get_ctx(ch);
struct bdev_ocssd_io *ocdev_io = (struct bdev_ocssd_io *)bdev_io->driver_ctx; struct bdev_ocssd_io *ocdev_io = (struct bdev_ocssd_io *)bdev_io->driver_ctx;
const size_t zone_size = nvme_bdev->disk.zone_size; const size_t zone_size = nvme_bdev->disk.zone_size;
uint64_t lba; uint64_t lba;
@ -425,11 +425,11 @@ bdev_ocssd_write_cb(void *ctx, const struct spdk_nvme_cpl *cpl)
} }
static int static int
bdev_ocssd_write(struct spdk_io_channel *ioch, struct spdk_bdev_io *bdev_io) bdev_ocssd_write(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
{ {
struct ocssd_bdev *ocssd_bdev = bdev_io->bdev->ctxt; struct ocssd_bdev *ocssd_bdev = bdev_io->bdev->ctxt;
struct nvme_bdev *nvme_bdev = &ocssd_bdev->nvme_bdev; struct nvme_bdev *nvme_bdev = &ocssd_bdev->nvme_bdev;
struct nvme_io_channel *nvme_ch = spdk_io_channel_get_ctx(ioch); struct nvme_io_channel *nvme_ch = spdk_io_channel_get_ctx(ch);
struct bdev_ocssd_io *ocdev_io = (struct bdev_ocssd_io *)bdev_io->driver_ctx; struct bdev_ocssd_io *ocdev_io = (struct bdev_ocssd_io *)bdev_io->driver_ctx;
const size_t zone_size = nvme_bdev->disk.zone_size; const size_t zone_size = nvme_bdev->disk.zone_size;
uint64_t lba; uint64_t lba;
@ -463,11 +463,11 @@ bdev_ocssd_write(struct spdk_io_channel *ioch, struct spdk_bdev_io *bdev_io)
} }
static int static int
bdev_ocssd_zone_append(struct spdk_io_channel *ioch, struct spdk_bdev_io *bdev_io) bdev_ocssd_zone_append(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
{ {
struct ocssd_bdev *ocssd_bdev = bdev_io->bdev->ctxt; struct ocssd_bdev *ocssd_bdev = bdev_io->bdev->ctxt;
struct nvme_bdev *nvme_bdev = &ocssd_bdev->nvme_bdev; struct nvme_bdev *nvme_bdev = &ocssd_bdev->nvme_bdev;
struct nvme_io_channel *nvme_ch = spdk_io_channel_get_ctx(ioch); struct nvme_io_channel *nvme_ch = spdk_io_channel_get_ctx(ch);
struct bdev_ocssd_io *ocdev_io = (struct bdev_ocssd_io *)bdev_io->driver_ctx; struct bdev_ocssd_io *ocdev_io = (struct bdev_ocssd_io *)bdev_io->driver_ctx;
struct bdev_ocssd_zone *zone; struct bdev_ocssd_zone *zone;
uint64_t lba; uint64_t lba;
@ -509,7 +509,7 @@ out:
} }
static void static void
bdev_ocssd_io_get_buf_cb(struct spdk_io_channel *ioch, struct spdk_bdev_io *bdev_io, bool success) bdev_ocssd_io_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io, bool success)
{ {
int rc; int rc;
@ -518,7 +518,7 @@ bdev_ocssd_io_get_buf_cb(struct spdk_io_channel *ioch, struct spdk_bdev_io *bdev
return; return;
} }
rc = bdev_ocssd_read(ioch, bdev_io); rc = bdev_ocssd_read(ch, bdev_io);
if (spdk_likely(rc != 0)) { if (spdk_likely(rc != 0)) {
if (rc == -ENOMEM) { if (rc == -ENOMEM) {
spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_NOMEM); spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_NOMEM);
@ -540,12 +540,12 @@ bdev_ocssd_reset_zone_cb(void *ctx, const struct spdk_nvme_cpl *cpl)
} }
static int static int
bdev_ocssd_reset_zone(struct spdk_io_channel *ioch, struct spdk_bdev_io *bdev_io, bdev_ocssd_reset_zone(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io,
uint64_t slba, size_t num_zones) uint64_t slba, size_t num_zones)
{ {
struct ocssd_bdev *ocssd_bdev = bdev_io->bdev->ctxt; struct ocssd_bdev *ocssd_bdev = bdev_io->bdev->ctxt;
struct nvme_bdev *nvme_bdev = &ocssd_bdev->nvme_bdev; struct nvme_bdev *nvme_bdev = &ocssd_bdev->nvme_bdev;
struct nvme_io_channel *nvme_ch = spdk_io_channel_get_ctx(ioch); struct nvme_io_channel *nvme_ch = spdk_io_channel_get_ctx(ch);
struct bdev_ocssd_io *ocdev_io = (struct bdev_ocssd_io *)bdev_io->driver_ctx; struct bdev_ocssd_io *ocdev_io = (struct bdev_ocssd_io *)bdev_io->driver_ctx;
uint64_t offset, zone_size = nvme_bdev->disk.zone_size; uint64_t offset, zone_size = nvme_bdev->disk.zone_size;
int rc; int rc;
@ -685,30 +685,30 @@ bdev_ocssd_get_zone_info(struct spdk_bdev_io *bdev_io)
} }
static int static int
bdev_ocssd_zone_management(struct spdk_io_channel *ioch, struct spdk_bdev_io *bdev_io) bdev_ocssd_zone_management(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
{ {
switch (bdev_io->u.zone_mgmt.zone_action) { switch (bdev_io->u.zone_mgmt.zone_action) {
case SPDK_BDEV_ZONE_RESET: case SPDK_BDEV_ZONE_RESET:
return bdev_ocssd_reset_zone(ioch, bdev_io, bdev_io->u.zone_mgmt.zone_id, return bdev_ocssd_reset_zone(ch, bdev_io, bdev_io->u.zone_mgmt.zone_id,
bdev_io->u.zone_mgmt.num_zones); bdev_io->u.zone_mgmt.num_zones);
default: default:
return -EINVAL; return -EINVAL;
} }
} }
static void bdev_ocssd_submit_request(struct spdk_io_channel *ioch, struct spdk_bdev_io *bdev_io); static void bdev_ocssd_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io);
static int static int
bdev_ocssd_poll_pending(void *ctx) bdev_ocssd_poll_pending(void *ctx)
{ {
struct spdk_io_channel *ioch = 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_ioch;
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(ioch); nvme_ch = spdk_io_channel_get_ctx(ch);
ocssd_ioch = nvme_ch->ocssd_ioch; ocssd_ioch = nvme_ch->ocssd_ioch;
TAILQ_INIT(&pending_requests); TAILQ_INIT(&pending_requests);
@ -716,7 +716,7 @@ bdev_ocssd_poll_pending(void *ctx)
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);
bdev_ocssd_submit_request(ioch, bdev_io); bdev_ocssd_submit_request(ch, bdev_io);
num_requests++; num_requests++;
} }
@ -728,9 +728,9 @@ bdev_ocssd_poll_pending(void *ctx)
} }
static void static void
bdev_ocssd_delay_request(struct spdk_io_channel *ioch, 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(ioch); 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_ioch = nvme_ch->ocssd_ioch;
TAILQ_INSERT_TAIL(&ocssd_ioch->pending_requests, bdev_io, module_link); TAILQ_INSERT_TAIL(&ocssd_ioch->pending_requests, bdev_io, module_link);
@ -738,7 +738,7 @@ bdev_ocssd_delay_request(struct spdk_io_channel *ioch, struct spdk_bdev_io *bdev
} }
static int static int
_bdev_ocssd_submit_request(struct spdk_io_channel *ioch, struct spdk_bdev_io *bdev_io) _bdev_ocssd_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
{ {
switch (bdev_io->type) { switch (bdev_io->type) {
case SPDK_BDEV_IO_TYPE_READ: case SPDK_BDEV_IO_TYPE_READ:
@ -747,16 +747,16 @@ _bdev_ocssd_submit_request(struct spdk_io_channel *ioch, struct spdk_bdev_io *bd
return 0; return 0;
case SPDK_BDEV_IO_TYPE_WRITE: case SPDK_BDEV_IO_TYPE_WRITE:
return bdev_ocssd_write(ioch, bdev_io); return bdev_ocssd_write(ch, bdev_io);
case SPDK_BDEV_IO_TYPE_ZONE_MANAGEMENT: case SPDK_BDEV_IO_TYPE_ZONE_MANAGEMENT:
return bdev_ocssd_zone_management(ioch, bdev_io); return bdev_ocssd_zone_management(ch, bdev_io);
case SPDK_BDEV_IO_TYPE_GET_ZONE_INFO: case SPDK_BDEV_IO_TYPE_GET_ZONE_INFO:
return bdev_ocssd_get_zone_info(bdev_io); return bdev_ocssd_get_zone_info(bdev_io);
case SPDK_BDEV_IO_TYPE_ZONE_APPEND: case SPDK_BDEV_IO_TYPE_ZONE_APPEND:
return bdev_ocssd_zone_append(ioch, bdev_io); return bdev_ocssd_zone_append(ch, bdev_io);
default: default:
return -EINVAL; return -EINVAL;
@ -766,9 +766,9 @@ _bdev_ocssd_submit_request(struct spdk_io_channel *ioch, struct spdk_bdev_io *bd
} }
static void static void
bdev_ocssd_submit_request(struct spdk_io_channel *ioch, struct spdk_bdev_io *bdev_io) bdev_ocssd_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
{ {
int rc = _bdev_ocssd_submit_request(ioch, bdev_io); int rc = _bdev_ocssd_submit_request(ch, bdev_io);
if (spdk_unlikely(rc != 0)) { if (spdk_unlikely(rc != 0)) {
switch (rc) { switch (rc) {
@ -776,7 +776,7 @@ bdev_ocssd_submit_request(struct spdk_io_channel *ioch, struct spdk_bdev_io *bde
spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_NOMEM); spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_NOMEM);
break; break;
case -EAGAIN: case -EAGAIN:
bdev_ocssd_delay_request(ioch, bdev_io); bdev_ocssd_delay_request(ch, bdev_io);
break; break;
default: default:
spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED); spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);