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

bdev/ocssd: Use cached pointers geometry_cb() for readability 



Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Iff1db8002258947eba1bd9a312edd6a8ab781a80
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5133


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>
parent 26ae3d66

module/bdev/nvme/bdev_ocssd.c

+6 −7
Original line number Diff line number Diff line
@@ -1408,6 +1408,8 @@ bdev_ocssd_geometry_cb(void *_ctx, const struct spdk_nvme_cpl *cpl) 
	struct nvme_async_probe_ctx *nvme_ctx = ctx->nvme_ctx;

	struct nvme_bdev_ns *nvme_ns = ctx->nvme_ns;

	struct bdev_ocssd_ns *ocssd_ns = bdev_ocssd_get_ns_from_nvme(nvme_ns);

	const struct spdk_ocssd_geometry_data *geometry = &ocssd_ns->geometry;

	struct bdev_ocssd_lba_offsets *offsets = &ocssd_ns->lba_offsets;

	int rc = 0;



	free(ctx);
@@ -1418,13 +1420,10 @@ bdev_ocssd_geometry_cb(void *_ctx, const struct spdk_nvme_cpl *cpl) 
		nvme_ns->type_ctx = NULL;

		rc = -EIO;

	} else {

		ocssd_ns->lba_offsets.lbk = 0;

		ocssd_ns->lba_offsets.chk = ocssd_ns->lba_offsets.lbk +

					    ocssd_ns->geometry.lbaf.lbk_len;

		ocssd_ns->lba_offsets.pu  = ocssd_ns->lba_offsets.chk +

					    ocssd_ns->geometry.lbaf.chk_len;

		ocssd_ns->lba_offsets.grp = ocssd_ns->lba_offsets.pu +

					    ocssd_ns->geometry.lbaf.pu_len;

		offsets->lbk = 0;

		offsets->chk = offsets->lbk + geometry->lbaf.lbk_len;

		offsets->pu  = offsets->chk + geometry->lbaf.chk_len;

		offsets->grp = offsets->pu  + geometry->lbaf.pu_len;

		ocssd_ns->chunk_notify_pending = true;

	}