From 8a12e2e715a13d30a8c921c48e7ce67704c37044 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Fri, 7 May 2021 17:36:23 +0000 Subject: [PATCH] scsi: don't include bdev_module.h The library itself doesn't need it. The unit tests do need it, so just include it there. Signed-off-by: Jim Harris Change-Id: I9aefd303ae12928d45141029436509f185105bd3 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7812 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Michal Berger Reviewed-by: Changpeng Liu Reviewed-by: Aleksey Marchuk Reviewed-by: Shuhei Matsumoto --- lib/scsi/scsi_bdev.c | 6 ------ test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/scsi/scsi_bdev.c b/lib/scsi/scsi_bdev.c index 127391eca..e135296e0 100644 --- a/lib/scsi/scsi_bdev.c +++ b/lib/scsi/scsi_bdev.c @@ -34,12 +34,6 @@ #include "scsi_internal.h" -/* - * TODO: move bdev SCSI error code translation tests to bdev unit test - * and remove this include. - */ -#include "spdk/bdev_module.h" - #include "spdk/env.h" #include "spdk/bdev.h" #include "spdk/endian.h" 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 3e1705477..195ed8be9 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 @@ -40,6 +40,7 @@ #include "spdk_cunit.h" #include "spdk_internal/mock.h" +#include "spdk/bdev_module.h" SPDK_LOG_REGISTER_COMPONENT(scsi)