From 49a7346e0a4bc49468e3d141a818a6c4717317f3 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Mon, 1 Feb 2021 20:01:21 +0900 Subject: [PATCH] bdev/ocssd: Remove range parameter from translate_lba() Signed-off-by: Shuhei Matsumoto Change-Id: I0ebed08814ce4011a64a18a832603348c1f5ab08 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6222 Reviewed-by: Ben Walker Reviewed-by: Aleksey Marchuk Reviewed-by: Jim Harris Reviewed-by: Konrad Sztyber Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins --- module/bdev/nvme/bdev_ocssd.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/module/bdev/nvme/bdev_ocssd.c b/module/bdev/nvme/bdev_ocssd.c index c9a1abf4d..35bb51e92 100644 --- a/module/bdev/nvme/bdev_ocssd.c +++ b/module/bdev/nvme/bdev_ocssd.c @@ -239,8 +239,7 @@ bdev_ocssd_destruct(void *ctx) } static void -bdev_ocssd_translate_lba(const struct bdev_ocssd_range *range, - const struct spdk_ocssd_geometry_data *geo, uint64_t lba, +bdev_ocssd_translate_lba(const struct spdk_ocssd_geometry_data *geo, uint64_t lba, uint64_t *grp, uint64_t *pu, uint64_t *chk, uint64_t *lbk) { uint64_t addr_shift, num_punits, punit; @@ -306,8 +305,7 @@ bdev_ocssd_to_disk_lba(struct ocssd_bdev *ocssd_bdev, const struct bdev_ocssd_lba_offsets *offsets = &ocssd_ns->lba_offsets; uint64_t lbk, chk, pu, grp; - bdev_ocssd_translate_lba(&ocssd_bdev->range, &ocssd_ns->geometry, lba, - &grp, &pu, &chk, &lbk); + bdev_ocssd_translate_lba(&ocssd_ns->geometry, lba, &grp, &pu, &chk, &lbk); return (lbk << offsets->lbk) | (chk << offsets->chk) | @@ -322,7 +320,7 @@ bdev_ocssd_to_chunk_info_offset(struct ocssd_bdev *ocssd_bdev, const struct spdk_ocssd_geometry_data *geo = &ocssd_ns->geometry; uint64_t grp, pu, chk, lbk; - bdev_ocssd_translate_lba(&ocssd_bdev->range, geo, lba, &grp, &pu, &chk, &lbk); + bdev_ocssd_translate_lba(geo, lba, &grp, &pu, &chk, &lbk); return grp * geo->num_pu * geo->num_chk + pu * geo->num_chk + chk; }