From 1eba9812f2fe8d302548e55fb9a1dd0c32ad311e Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Fri, 28 Jun 2019 09:52:40 +0900 Subject: [PATCH] iscsi: Simplify include relationships to avoid cyclic inclusion Including tgt_node.h in iscsi.h will prevent us from including iscsi.h in tgt_node.h. Subsequent patches will require tgt_node.h to refer the macro constants in iscsi.h. Hence - remove inclusion of tgt_node.h from iscsi.h, - add inclusion of spdk/scsi.h to iscsi.h, and - remove inclusion of spdk/scsi.h from tgt_node.h Signed-off-by: Shuhei Matsumoto Change-Id: I5ac808a83754c157e4140bcd2a83c4d210e30d91 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459704 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Changpeng Liu Reviewed-by: Darek Stojaczyk --- lib/iscsi/iscsi.h | 2 +- lib/iscsi/iscsi_subsystem.c | 1 + lib/iscsi/tgt_node.h | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/iscsi/iscsi.h b/lib/iscsi/iscsi.h index 7057f02ce..2b967c5ad 100644 --- a/lib/iscsi/iscsi.h +++ b/lib/iscsi/iscsi.h @@ -42,8 +42,8 @@ #include "spdk/event.h" #include "spdk/thread.h" +#include "spdk/scsi.h" #include "iscsi/param.h" -#include "iscsi/tgt_node.h" #include "spdk/assert.h" #include "spdk/dif.h" diff --git a/lib/iscsi/iscsi_subsystem.c b/lib/iscsi/iscsi_subsystem.c index c1662f7ff..d70382a58 100644 --- a/lib/iscsi/iscsi_subsystem.c +++ b/lib/iscsi/iscsi_subsystem.c @@ -43,6 +43,7 @@ #include "iscsi/portal_grp.h" #include "iscsi/conn.h" #include "iscsi/task.h" +#include "iscsi/tgt_node.h" #include "spdk_internal/event.h" #include "spdk_internal/log.h" diff --git a/lib/iscsi/tgt_node.h b/lib/iscsi/tgt_node.h index 9002e8351..b6485045c 100644 --- a/lib/iscsi/tgt_node.h +++ b/lib/iscsi/tgt_node.h @@ -37,8 +37,6 @@ #include "spdk/stdinc.h" -#include "spdk/scsi.h" - struct spdk_iscsi_conn; struct spdk_iscsi_init_grp; struct spdk_iscsi_portal_grp;