From d7a7ef613ced7c9e88555b84b9f589ababe60585 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Mon, 9 Jul 2018 02:24:26 -0400 Subject: [PATCH] scsi: spdk_bdev_scsi_reset() now returns void SCSI reset function return code is not used, so there is no need for it to have return code. Change-Id: Ib647109c75b1546675d2601fa00004e1ef186024 Signed-off-by: Tomasz Zawadzki Reviewed-on: https://review.gerrithub.io/418615 Tested-by: SPDK Automated Test System Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- lib/scsi/scsi_bdev.c | 5 ++--- lib/scsi/scsi_internal.h | 2 +- test/unit/lib/scsi/lun.c/lun_ut.c | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/scsi/scsi_bdev.c b/lib/scsi/scsi_bdev.c index f34c6bb8c..60cb776b9 100644 --- a/lib/scsi/scsi_bdev.c +++ b/lib/scsi/scsi_bdev.c @@ -2033,11 +2033,10 @@ spdk_bdev_scsi_execute(struct spdk_scsi_task *task) return rc; } -int +void spdk_bdev_scsi_reset(struct spdk_scsi_task *task) { struct spdk_scsi_lun *lun = task->lun; - return spdk_bdev_reset(lun->bdev_desc, lun->io_channel, - spdk_bdev_scsi_task_complete_mgmt, task); + spdk_bdev_reset(lun->bdev_desc, lun->io_channel, spdk_bdev_scsi_task_complete_mgmt, task); } diff --git a/lib/scsi/scsi_internal.h b/lib/scsi/scsi_internal.h index a8151a8fc..b28054dbd 100644 --- a/lib/scsi/scsi_internal.h +++ b/lib/scsi/scsi_internal.h @@ -136,7 +136,7 @@ int spdk_scsi_port_construct(struct spdk_scsi_port *port, uint64_t id, void spdk_scsi_port_destruct(struct spdk_scsi_port *port); int spdk_bdev_scsi_execute(struct spdk_scsi_task *task); -int spdk_bdev_scsi_reset(struct spdk_scsi_task *task); +void spdk_bdev_scsi_reset(struct spdk_scsi_task *task); struct spdk_scsi_globals { pthread_mutex_t mutex; diff --git a/test/unit/lib/scsi/lun.c/lun_ut.c b/test/unit/lib/scsi/lun.c/lun_ut.c index ece7816bc..1381013ab 100644 --- a/test/unit/lib/scsi/lun.c/lun_ut.c +++ b/test/unit/lib/scsi/lun.c/lun_ut.c @@ -159,10 +159,10 @@ void spdk_scsi_dev_delete_lun(struct spdk_scsi_dev *dev, return; } -int +void spdk_bdev_scsi_reset(struct spdk_scsi_task *task) { - return 0; + return; } int