Commit 9772b580 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdev/ocssd: Remove range from struct ocssd_bdev 



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: default avatarShuhei 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: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent 56d8cc8d

module/bdev/nvme/bdev_ocssd.c

+2 −9
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ struct ocssd_io_channel { 
struct ocssd_bdev {

	struct nvme_bdev	nvme_bdev;

	struct bdev_ocssd_zone	*zones;

	struct bdev_ocssd_range	range;

};



struct bdev_ocssd_ns {
@@ -1061,7 +1060,6 @@ struct bdev_ocssd_create_ctx { 
	struct nvme_bdev_ns				*nvme_ns;

	bdev_ocssd_create_cb				cb_fn;

	void						*cb_arg;

	const struct bdev_ocssd_range			*range;

	uint64_t					chunk_offset;

	uint64_t					end_chunk_offset;

	uint64_t					num_chunks;
@@ -1183,7 +1181,6 @@ static int 
bdev_ocssd_init_zones(struct bdev_ocssd_create_ctx *create_ctx)

{

	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;



	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;

	}



	create_ctx->chunk_offset = ocssd_bdev->range.begin * ocssd_ns->geometry.num_chk;

	create_ctx->end_chunk_offset = create_ctx->chunk_offset + num_zones;

	create_ctx->chunk_offset = 0;

	create_ctx->end_chunk_offset = num_zones;



	/* Mark all zones as busy and clear it as their info is filled */

	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->cb_fn = cb_fn;

	create_ctx->cb_arg = cb_arg;

	create_ctx->range = NULL;



	nvme_bdev = &ocssd_bdev->nvme_bdev;

	nvme_bdev->nvme_ns = nvme_ns;

	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);

	if (!nvme_bdev->disk.name) {

		rc = -ENOMEM;

module/bdev/nvme/bdev_ocssd.h

+0 −5
Original line number Diff line number Diff line
@@ -37,11 +37,6 @@ 
#include "spdk/stdinc.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_delete_cb)(int status, void *ctx);