From 7707df48a33734342faebb3f67e9740d99a73d15 Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Thu, 26 Mar 2020 22:54:50 +0800 Subject: [PATCH] nvme/opal: remove the unnecessary geometry information Also remove the unused ctx and a function declaration. Change-Id: I2f76d5c4795a0bfa3c075a5be83a7be434df6a64 Signed-off-by: Changpeng Liu Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1475 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto --- lib/nvme/nvme_opal.c | 7 ------- lib/nvme/nvme_opal_internal.h | 3 --- 2 files changed, 10 deletions(-) diff --git a/lib/nvme/nvme_opal.c b/lib/nvme/nvme_opal.c index 3c69eacb6b..6fd19df63a 100644 --- a/lib/nvme/nvme_opal.c +++ b/lib/nvme/nvme_opal.c @@ -39,8 +39,6 @@ typedef int (*spdk_opal_cb)(struct spdk_opal_dev *dev, void *ctx); -static int opal_parse_and_check_status(struct spdk_opal_dev *dev, void *data); - static int opal_send_cmd(struct spdk_opal_dev *dev) { @@ -759,11 +757,6 @@ static void opal_check_geometry(struct spdk_opal_dev *dev, const void *data) { const struct spdk_opal_d0_geo_feat *geo = data; - uint64_t align = from_be64(&geo->alignment_granularity); - uint64_t lowest_lba = from_be64(&geo->lowest_aligned_lba); - - dev->align = align; - dev->lowest_lba = lowest_lba; dev->feat_info.geo = *geo; } diff --git a/lib/nvme/nvme_opal_internal.h b/lib/nvme/nvme_opal_internal.h index b3fac07ef4..d6c483eaf5 100644 --- a/lib/nvme/nvme_opal_internal.h +++ b/lib/nvme/nvme_opal_internal.h @@ -275,8 +275,6 @@ struct spdk_opal_dev { uint16_t comid; uint32_t hsn; uint32_t tsn; - uint64_t align; - uint64_t lowest_lba; size_t cmd_pos; uint8_t cmd[IO_BUFFER_LENGTH]; @@ -291,7 +289,6 @@ struct spdk_opal_dev { struct spdk_opal_locking_range_info locking_ranges[SPDK_OPAL_MAX_LOCKING_RANGE]; pthread_mutex_t mutex_lock; /* some structs are accessed by current thread only */ - void *ctx; /* user context data */ }; #endif