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

bdev/ocssd: Remove range from struct ocssd_bdev

Browse Source 
Remove range instance from struct bdev_ocssd_range, and additionally
remove range pointer from struct bdev_ocssd_create_ctx.

Then remove the definition of struct bdev_ocssd_range.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I5cb38d17ff2ec852878b481b8974983922fe25d2
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6225
Community-CI: Broadcom CI
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
This commit is contained in:
Shuhei Matsumoto 2021-02-01 20:21:44 +09:00 committed by Tomasz Zawadzki
parent 56d8cc8d72
commit 9772b58082
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,6 @@ struct ocssd_io_channel {
struct ocssd_bdev { struct ocssd_bdev {
struct nvme_bdev nvme_bdev; struct nvme_bdev nvme_bdev;
struct bdev_ocssd_zone *zones; struct bdev_ocssd_zone *zones;
struct bdev_ocssd_range range;
}; };
struct bdev_ocssd_ns { struct bdev_ocssd_ns {
@ -1061,7 +1060,6 @@ struct bdev_ocssd_create_ctx {
struct nvme_bdev_ns *nvme_ns; struct nvme_bdev_ns *nvme_ns;
bdev_ocssd_create_cb cb_fn; bdev_ocssd_create_cb cb_fn;
void *cb_arg; void *cb_arg;
const struct bdev_ocssd_range *range;
uint64_t chunk_offset; uint64_t chunk_offset;
uint64_t end_chunk_offset; uint64_t end_chunk_offset;
uint64_t num_chunks; uint64_t num_chunks;
@ -1183,7 +1181,6 @@ static int
bdev_ocssd_init_zones(struct bdev_ocssd_create_ctx *create_ctx) bdev_ocssd_init_zones(struct bdev_ocssd_create_ctx *create_ctx)
{ {
struct ocssd_bdev *ocssd_bdev = create_ctx->ocssd_bdev; struct ocssd_bdev *ocssd_bdev = create_ctx->ocssd_bdev;
struct bdev_ocssd_ns *ocssd_ns = bdev_ocssd_get_ns_from_nvme(create_ctx->nvme_ns);
uint64_t offset, num_zones; uint64_t offset, num_zones;
num_zones = bdev_ocssd_num_zones(ocssd_bdev); num_zones = bdev_ocssd_num_zones(ocssd_bdev);
@ -1193,8 +1190,8 @@ bdev_ocssd_init_zones(struct bdev_ocssd_create_ctx *create_ctx)
return -ENOMEM; return -ENOMEM;
} }
create_ctx->chunk_offset = ocssd_bdev->range.begin * ocssd_ns->geometry.num_chk; create_ctx->chunk_offset = 0;
create_ctx->end_chunk_offset = create_ctx->chunk_offset + num_zones; create_ctx->end_chunk_offset = num_zones;
/* Mark all zones as busy and clear it as their info is filled */ /* Mark all zones as busy and clear it as their info is filled */
for (offset = 0; offset < num_zones; ++offset) { for (offset = 0; offset < num_zones; ++offset) {
@ -1275,15 +1272,11 @@ bdev_ocssd_create_bdev(const char *ctrlr_name, const char *bdev_name, uint32_t n
create_ctx->nvme_ns = nvme_ns; create_ctx->nvme_ns = nvme_ns;
create_ctx->cb_fn = cb_fn; create_ctx->cb_fn = cb_fn;
create_ctx->cb_arg = cb_arg; create_ctx->cb_arg = cb_arg;
create_ctx->range = NULL;
nvme_bdev = &ocssd_bdev->nvme_bdev; nvme_bdev = &ocssd_bdev->nvme_bdev;
nvme_bdev->nvme_ns = nvme_ns; nvme_bdev->nvme_ns = nvme_ns;
geometry = &ocssd_ns->geometry; geometry = &ocssd_ns->geometry;
ocssd_bdev->range.begin = 0;
ocssd_bdev->range.end = geometry->num_grp * geometry->num_pu - 1;
nvme_bdev->disk.name = strdup(bdev_name); nvme_bdev->disk.name = strdup(bdev_name);
if (!nvme_bdev->disk.name) { if (!nvme_bdev->disk.name) {
rc = -ENOMEM; rc = -ENOMEM;

5
module/bdev/nvme/bdev_ocssd.h
View File

@ -37,11 +37,6 @@
#include "spdk/stdinc.h" #include "spdk/stdinc.h"
#include "common.h" #include "common.h"
struct bdev_ocssd_range {
uint64_t begin;
uint64_t end;
};
typedef void (*bdev_ocssd_create_cb)(const char *bdev_name, int status, void *ctx); typedef void (*bdev_ocssd_create_cb)(const char *bdev_name, int status, void *ctx);
typedef void (*bdev_ocssd_delete_cb)(int status, void *ctx); typedef void (*bdev_ocssd_delete_cb)(int status, void *ctx);