From 074f503d27e814c9b2681602d675f867a0a3b11e Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Sun, 6 Jun 2021 17:27:59 +0900 Subject: [PATCH] scsi: Delete mutex from spdk_scsi_globals This mutex is not used anywhere. After removing mutex from struct spdk_scsi_globals, struct spdk_scsi_globals is empty. Hence then remove struct spdk_scsi_globals. We can create struct spdk_scsi_globals again if it becomes necessary. Signed-off-by: Shuhei Matsumoto Change-Id: I749ae43f7735a7c9383d090eae2093bb52607f17 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8192 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Ziye Yang Reviewed-by: Changpeng Liu Reviewed-by: Tomasz Zawadzki Reviewed-by: Paul Luse --- lib/scsi/scsi.c | 11 ----------- lib/scsi/scsi_internal.h | 6 ------ test/unit/lib/scsi/lun.c/lun_ut.c | 2 -- test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c | 2 -- 4 files changed, 21 deletions(-) diff --git a/lib/scsi/scsi.c b/lib/scsi/scsi.c index 8aa129b7a..90a76e3fd 100644 --- a/lib/scsi/scsi.c +++ b/lib/scsi/scsi.c @@ -34,26 +34,15 @@ #include "scsi_internal.h" -struct spdk_scsi_globals g_scsi; - int spdk_scsi_init(void) { - int rc; - - rc = pthread_mutex_init(&g_scsi.mutex, NULL); - if (rc != 0) { - SPDK_ERRLOG("mutex_init() failed\n"); - return -1; - } - return 0; } void spdk_scsi_fini(void) { - pthread_mutex_destroy(&g_scsi.mutex); } SPDK_TRACE_REGISTER_FN(scsi_trace, "scsi", TRACE_GROUP_SCSI) diff --git a/lib/scsi/scsi_internal.h b/lib/scsi/scsi_internal.h index 44cc4761e..1648e5983 100644 --- a/lib/scsi/scsi_internal.h +++ b/lib/scsi/scsi_internal.h @@ -213,10 +213,4 @@ int scsi2_reserve(struct spdk_scsi_task *task, uint8_t *cdb); int scsi2_release(struct spdk_scsi_task *task); int scsi2_reserve_check(struct spdk_scsi_task *task); -struct spdk_scsi_globals { - pthread_mutex_t mutex; -}; - -extern struct spdk_scsi_globals g_scsi; - #endif /* SPDK_SCSI_INTERNAL_H */ diff --git a/test/unit/lib/scsi/lun.c/lun_ut.c b/test/unit/lib/scsi/lun.c/lun_ut.c index 793ce662e..8acc7654f 100644 --- a/test/unit/lib/scsi/lun.c/lun_ut.c +++ b/test/unit/lib/scsi/lun.c/lun_ut.c @@ -51,8 +51,6 @@ struct spdk_bdev { SPDK_LOG_REGISTER_COMPONENT(scsi) -struct spdk_scsi_globals g_spdk_scsi; - static bool g_lun_execute_fail = false; static int g_lun_execute_status = SPDK_SCSI_TASK_PENDING; static uint32_t g_task_count = 0; diff --git a/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c b/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c index 195ed8be9..1632c6b81 100644 --- a/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c +++ b/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c @@ -44,8 +44,6 @@ SPDK_LOG_REGISTER_COMPONENT(scsi) -struct spdk_scsi_globals g_spdk_scsi; - static uint64_t g_test_bdev_num_blocks; TAILQ_HEAD(, spdk_bdev_io) g_bdev_io_queue;