diff options
Diffstat (limited to 'drivers')
35 files changed, 43 insertions, 102 deletions
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index 8599545cdf9e..f74a62d46eea 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c | |||
| @@ -27,8 +27,7 @@ | |||
| 27 | #include <scsi/scsi_device.h> | 27 | #include <scsi/scsi_device.h> |
| 28 | #include <scsi/iscsi_proto.h> | 28 | #include <scsi/iscsi_proto.h> |
| 29 | #include <target/target_core_base.h> | 29 | #include <target/target_core_base.h> |
| 30 | #include <target/target_core_tmr.h> | 30 | #include <target/target_core_fabric.h> |
| 31 | #include <target/target_core_transport.h> | ||
| 32 | 31 | ||
| 33 | #include "iscsi_target_core.h" | 32 | #include "iscsi_target_core.h" |
| 34 | #include "iscsi_target_parameters.h" | 33 | #include "iscsi_target_parameters.h" |
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c index db327845e46b..c04d389a2ff2 100644 --- a/drivers/target/iscsi/iscsi_target_configfs.c +++ b/drivers/target/iscsi/iscsi_target_configfs.c | |||
| @@ -22,12 +22,8 @@ | |||
| 22 | #include <linux/configfs.h> | 22 | #include <linux/configfs.h> |
| 23 | #include <linux/export.h> | 23 | #include <linux/export.h> |
| 24 | #include <target/target_core_base.h> | 24 | #include <target/target_core_base.h> |
| 25 | #include <target/target_core_transport.h> | 25 | #include <target/target_core_fabric.h> |
| 26 | #include <target/target_core_fabric_ops.h> | ||
| 27 | #include <target/target_core_fabric_configfs.h> | 26 | #include <target/target_core_fabric_configfs.h> |
| 28 | #include <target/target_core_fabric_lib.h> | ||
| 29 | #include <target/target_core_device.h> | ||
| 30 | #include <target/target_core_tpg.h> | ||
| 31 | #include <target/target_core_configfs.h> | 27 | #include <target/target_core_configfs.h> |
| 32 | #include <target/configfs_macros.h> | 28 | #include <target/configfs_macros.h> |
| 33 | 29 | ||
diff --git a/drivers/target/iscsi/iscsi_target_device.c b/drivers/target/iscsi/iscsi_target_device.c index a19fa5eea88e..f63ea35bc4ae 100644 --- a/drivers/target/iscsi/iscsi_target_device.c +++ b/drivers/target/iscsi/iscsi_target_device.c | |||
| @@ -21,8 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | #include <scsi/scsi_device.h> | 22 | #include <scsi/scsi_device.h> |
| 23 | #include <target/target_core_base.h> | 23 | #include <target/target_core_base.h> |
| 24 | #include <target/target_core_device.h> | 24 | #include <target/target_core_fabric.h> |
| 25 | #include <target/target_core_transport.h> | ||
| 26 | 25 | ||
| 27 | #include "iscsi_target_core.h" | 26 | #include "iscsi_target_core.h" |
| 28 | #include "iscsi_target_device.h" | 27 | #include "iscsi_target_device.h" |
diff --git a/drivers/target/iscsi/iscsi_target_erl0.c b/drivers/target/iscsi/iscsi_target_erl0.c index b7ffc3cd40cc..478451167b62 100644 --- a/drivers/target/iscsi/iscsi_target_erl0.c +++ b/drivers/target/iscsi/iscsi_target_erl0.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | #include <scsi/iscsi_proto.h> | 22 | #include <scsi/iscsi_proto.h> |
| 23 | #include <target/target_core_base.h> | 23 | #include <target/target_core_base.h> |
| 24 | #include <target/target_core_transport.h> | 24 | #include <target/target_core_fabric.h> |
| 25 | 25 | ||
| 26 | #include "iscsi_target_core.h" | 26 | #include "iscsi_target_core.h" |
| 27 | #include "iscsi_target_seq_pdu_list.h" | 27 | #include "iscsi_target_seq_pdu_list.h" |
diff --git a/drivers/target/iscsi/iscsi_target_erl1.c b/drivers/target/iscsi/iscsi_target_erl1.c index 101b1beb3bca..255c0d67e898 100644 --- a/drivers/target/iscsi/iscsi_target_erl1.c +++ b/drivers/target/iscsi/iscsi_target_erl1.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #include <linux/list.h> | 21 | #include <linux/list.h> |
| 22 | #include <scsi/iscsi_proto.h> | 22 | #include <scsi/iscsi_proto.h> |
| 23 | #include <target/target_core_base.h> | 23 | #include <target/target_core_base.h> |
| 24 | #include <target/target_core_transport.h> | 24 | #include <target/target_core_fabric.h> |
| 25 | 25 | ||
| 26 | #include "iscsi_target_core.h" | 26 | #include "iscsi_target_core.h" |
| 27 | #include "iscsi_target_seq_pdu_list.h" | 27 | #include "iscsi_target_seq_pdu_list.h" |
diff --git a/drivers/target/iscsi/iscsi_target_erl2.c b/drivers/target/iscsi/iscsi_target_erl2.c index 0b8404c30125..1af1f21af21f 100644 --- a/drivers/target/iscsi/iscsi_target_erl2.c +++ b/drivers/target/iscsi/iscsi_target_erl2.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | #include <scsi/iscsi_proto.h> | 22 | #include <scsi/iscsi_proto.h> |
| 23 | #include <target/target_core_base.h> | 23 | #include <target/target_core_base.h> |
| 24 | #include <target/target_core_transport.h> | 24 | #include <target/target_core_fabric.h> |
| 25 | 25 | ||
| 26 | #include "iscsi_target_core.h" | 26 | #include "iscsi_target_core.h" |
| 27 | #include "iscsi_target_datain_values.h" | 27 | #include "iscsi_target_datain_values.h" |
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c index d734bdec24f9..d74e278ec8f7 100644 --- a/drivers/target/iscsi/iscsi_target_login.c +++ b/drivers/target/iscsi/iscsi_target_login.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include <linux/crypto.h> | 23 | #include <linux/crypto.h> |
| 24 | #include <scsi/iscsi_proto.h> | 24 | #include <scsi/iscsi_proto.h> |
| 25 | #include <target/target_core_base.h> | 25 | #include <target/target_core_base.h> |
| 26 | #include <target/target_core_transport.h> | 26 | #include <target/target_core_fabric.h> |
| 27 | 27 | ||
| 28 | #include "iscsi_target_core.h" | 28 | #include "iscsi_target_core.h" |
| 29 | #include "iscsi_target_tq.h" | 29 | #include "iscsi_target_tq.h" |
diff --git a/drivers/target/iscsi/iscsi_target_nego.c b/drivers/target/iscsi/iscsi_target_nego.c index 98936cb7c294..53eea5c827f0 100644 --- a/drivers/target/iscsi/iscsi_target_nego.c +++ b/drivers/target/iscsi/iscsi_target_nego.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #include <linux/ctype.h> | 21 | #include <linux/ctype.h> |
| 22 | #include <scsi/iscsi_proto.h> | 22 | #include <scsi/iscsi_proto.h> |
| 23 | #include <target/target_core_base.h> | 23 | #include <target/target_core_base.h> |
| 24 | #include <target/target_core_tpg.h> | 24 | #include <target/target_core_fabric.h> |
| 25 | 25 | ||
| 26 | #include "iscsi_target_core.h" | 26 | #include "iscsi_target_core.h" |
| 27 | #include "iscsi_target_parameters.h" | 27 | #include "iscsi_target_parameters.h" |
diff --git a/drivers/target/iscsi/iscsi_target_nodeattrib.c b/drivers/target/iscsi/iscsi_target_nodeattrib.c index aeafbe0cd7d1..ac047d8a7a13 100644 --- a/drivers/target/iscsi/iscsi_target_nodeattrib.c +++ b/drivers/target/iscsi/iscsi_target_nodeattrib.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | ******************************************************************************/ | 19 | ******************************************************************************/ |
| 20 | 20 | ||
| 21 | #include <target/target_core_base.h> | 21 | #include <target/target_core_base.h> |
| 22 | #include <target/target_core_transport.h> | ||
| 23 | 22 | ||
| 24 | #include "iscsi_target_core.h" | 23 | #include "iscsi_target_core.h" |
| 25 | #include "iscsi_target_device.h" | 24 | #include "iscsi_target_device.h" |
diff --git a/drivers/target/iscsi/iscsi_target_stat.c b/drivers/target/iscsi/iscsi_target_stat.c index f1db83077e0a..5a1aac0ec7de 100644 --- a/drivers/target/iscsi/iscsi_target_stat.c +++ b/drivers/target/iscsi/iscsi_target_stat.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/export.h> | 23 | #include <linux/export.h> |
| 24 | #include <scsi/iscsi_proto.h> | 24 | #include <scsi/iscsi_proto.h> |
| 25 | #include <target/target_core_base.h> | 25 | #include <target/target_core_base.h> |
| 26 | #include <target/target_core_transport.h> | ||
| 27 | #include <target/configfs_macros.h> | 26 | #include <target/configfs_macros.h> |
| 28 | 27 | ||
| 29 | #include "iscsi_target_core.h" | 28 | #include "iscsi_target_core.h" |
diff --git a/drivers/target/iscsi/iscsi_target_tmr.c b/drivers/target/iscsi/iscsi_target_tmr.c index 490207eacde9..255ed35da815 100644 --- a/drivers/target/iscsi/iscsi_target_tmr.c +++ b/drivers/target/iscsi/iscsi_target_tmr.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #include <asm/unaligned.h> | 21 | #include <asm/unaligned.h> |
| 22 | #include <scsi/iscsi_proto.h> | 22 | #include <scsi/iscsi_proto.h> |
| 23 | #include <target/target_core_base.h> | 23 | #include <target/target_core_base.h> |
| 24 | #include <target/target_core_transport.h> | 24 | #include <target/target_core_fabric.h> |
| 25 | 25 | ||
| 26 | #include "iscsi_target_core.h" | 26 | #include "iscsi_target_core.h" |
| 27 | #include "iscsi_target_seq_pdu_list.h" | 27 | #include "iscsi_target_seq_pdu_list.h" |
diff --git a/drivers/target/iscsi/iscsi_target_tpg.c b/drivers/target/iscsi/iscsi_target_tpg.c index d4cf2cd25c44..cfbcf6e4877d 100644 --- a/drivers/target/iscsi/iscsi_target_tpg.c +++ b/drivers/target/iscsi/iscsi_target_tpg.c | |||
| @@ -19,10 +19,8 @@ | |||
| 19 | ******************************************************************************/ | 19 | ******************************************************************************/ |
| 20 | 20 | ||
| 21 | #include <target/target_core_base.h> | 21 | #include <target/target_core_base.h> |
| 22 | #include <target/target_core_transport.h> | 22 | #include <target/target_core_fabric.h> |
| 23 | #include <target/target_core_fabric_ops.h> | ||
| 24 | #include <target/target_core_configfs.h> | 23 | #include <target/target_core_configfs.h> |
| 25 | #include <target/target_core_tpg.h> | ||
| 26 | 24 | ||
| 27 | #include "iscsi_target_core.h" | 25 | #include "iscsi_target_core.h" |
| 28 | #include "iscsi_target_erl0.h" | 26 | #include "iscsi_target_erl0.h" |
diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c index 02348f727bd4..c1daea190859 100644 --- a/drivers/target/iscsi/iscsi_target_util.c +++ b/drivers/target/iscsi/iscsi_target_util.c | |||
| @@ -22,9 +22,7 @@ | |||
| 22 | #include <scsi/scsi_tcq.h> | 22 | #include <scsi/scsi_tcq.h> |
| 23 | #include <scsi/iscsi_proto.h> | 23 | #include <scsi/iscsi_proto.h> |
| 24 | #include <target/target_core_base.h> | 24 | #include <target/target_core_base.h> |
| 25 | #include <target/target_core_transport.h> | 25 | #include <target/target_core_fabric.h> |
| 26 | #include <target/target_core_tmr.h> | ||
| 27 | #include <target/target_core_fabric_ops.h> | ||
| 28 | #include <target/target_core_configfs.h> | 26 | #include <target/target_core_configfs.h> |
| 29 | 27 | ||
| 30 | #include "iscsi_target_core.h" | 28 | #include "iscsi_target_core.h" |
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c index 81d5832fbbd5..d427a290e184 100644 --- a/drivers/target/loopback/tcm_loop.c +++ b/drivers/target/loopback/tcm_loop.c | |||
| @@ -33,14 +33,9 @@ | |||
| 33 | #include <scsi/scsi_cmnd.h> | 33 | #include <scsi/scsi_cmnd.h> |
| 34 | 34 | ||
| 35 | #include <target/target_core_base.h> | 35 | #include <target/target_core_base.h> |
| 36 | #include <target/target_core_transport.h> | 36 | #include <target/target_core_fabric.h> |
| 37 | #include <target/target_core_fabric_ops.h> | ||
| 38 | #include <target/target_core_fabric_configfs.h> | 37 | #include <target/target_core_fabric_configfs.h> |
| 39 | #include <target/target_core_fabric_lib.h> | ||
| 40 | #include <target/target_core_configfs.h> | 38 | #include <target/target_core_configfs.h> |
| 41 | #include <target/target_core_device.h> | ||
| 42 | #include <target/target_core_tpg.h> | ||
| 43 | #include <target/target_core_tmr.h> | ||
| 44 | 39 | ||
| 45 | #include "tcm_loop.h" | 40 | #include "tcm_loop.h" |
| 46 | 41 | ||
diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c index 097eb5a49648..1b1edd14f4bf 100644 --- a/drivers/target/target_core_alua.c +++ b/drivers/target/target_core_alua.c | |||
| @@ -32,9 +32,8 @@ | |||
| 32 | #include <scsi/scsi_cmnd.h> | 32 | #include <scsi/scsi_cmnd.h> |
| 33 | 33 | ||
| 34 | #include <target/target_core_base.h> | 34 | #include <target/target_core_base.h> |
| 35 | #include <target/target_core_device.h> | 35 | #include <target/target_core_backend.h> |
| 36 | #include <target/target_core_transport.h> | 36 | #include <target/target_core_fabric.h> |
| 37 | #include <target/target_core_fabric_ops.h> | ||
| 38 | #include <target/target_core_configfs.h> | 37 | #include <target/target_core_configfs.h> |
| 39 | 38 | ||
| 40 | #include "target_core_internal.h" | 39 | #include "target_core_internal.h" |
diff --git a/drivers/target/target_core_cdb.c b/drivers/target/target_core_cdb.c index 8f2934fcc68c..59219509d886 100644 --- a/drivers/target/target_core_cdb.c +++ b/drivers/target/target_core_cdb.c | |||
| @@ -29,8 +29,8 @@ | |||
| 29 | #include <scsi/scsi.h> | 29 | #include <scsi/scsi.h> |
| 30 | 30 | ||
| 31 | #include <target/target_core_base.h> | 31 | #include <target/target_core_base.h> |
| 32 | #include <target/target_core_transport.h> | 32 | #include <target/target_core_backend.h> |
| 33 | #include <target/target_core_fabric_ops.h> | 33 | #include <target/target_core_fabric.h> |
| 34 | 34 | ||
| 35 | #include "target_core_internal.h" | 35 | #include "target_core_internal.h" |
| 36 | #include "target_core_ua.h" | 36 | #include "target_core_ua.h" |
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c index ac55af56ba12..3c358907a4a6 100644 --- a/drivers/target/target_core_configfs.c +++ b/drivers/target/target_core_configfs.c | |||
| @@ -39,9 +39,8 @@ | |||
| 39 | #include <linux/spinlock.h> | 39 | #include <linux/spinlock.h> |
| 40 | 40 | ||
| 41 | #include <target/target_core_base.h> | 41 | #include <target/target_core_base.h> |
| 42 | #include <target/target_core_device.h> | 42 | #include <target/target_core_backend.h> |
| 43 | #include <target/target_core_transport.h> | 43 | #include <target/target_core_fabric.h> |
| 44 | #include <target/target_core_fabric_ops.h> | ||
| 45 | #include <target/target_core_fabric_configfs.h> | 44 | #include <target/target_core_fabric_configfs.h> |
| 46 | #include <target/target_core_configfs.h> | 45 | #include <target/target_core_configfs.h> |
| 47 | #include <target/configfs_macros.h> | 46 | #include <target/configfs_macros.h> |
diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c index 28ffe0b52bde..1f74de25a92f 100644 --- a/drivers/target/target_core_device.c +++ b/drivers/target/target_core_device.c | |||
| @@ -42,10 +42,8 @@ | |||
| 42 | #include <scsi/scsi_device.h> | 42 | #include <scsi/scsi_device.h> |
| 43 | 43 | ||
| 44 | #include <target/target_core_base.h> | 44 | #include <target/target_core_base.h> |
| 45 | #include <target/target_core_device.h> | 45 | #include <target/target_core_backend.h> |
| 46 | #include <target/target_core_tpg.h> | 46 | #include <target/target_core_fabric.h> |
| 47 | #include <target/target_core_transport.h> | ||
| 48 | #include <target/target_core_fabric_ops.h> | ||
| 49 | 47 | ||
| 50 | #include "target_core_internal.h" | 48 | #include "target_core_internal.h" |
| 51 | #include "target_core_alua.h" | 49 | #include "target_core_alua.h" |
diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c index fa1e4eb01bc7..4f77cce22646 100644 --- a/drivers/target/target_core_fabric_configfs.c +++ b/drivers/target/target_core_fabric_configfs.c | |||
| @@ -36,10 +36,7 @@ | |||
| 36 | #include <linux/configfs.h> | 36 | #include <linux/configfs.h> |
| 37 | 37 | ||
| 38 | #include <target/target_core_base.h> | 38 | #include <target/target_core_base.h> |
| 39 | #include <target/target_core_device.h> | 39 | #include <target/target_core_fabric.h> |
| 40 | #include <target/target_core_tpg.h> | ||
| 41 | #include <target/target_core_transport.h> | ||
| 42 | #include <target/target_core_fabric_ops.h> | ||
| 43 | #include <target/target_core_fabric_configfs.h> | 40 | #include <target/target_core_fabric_configfs.h> |
| 44 | #include <target/target_core_configfs.h> | 41 | #include <target/target_core_configfs.h> |
| 45 | #include <target/configfs_macros.h> | 42 | #include <target/configfs_macros.h> |
diff --git a/drivers/target/target_core_fabric_lib.c b/drivers/target/target_core_fabric_lib.c index dd9ae929dda2..32d7feb405ec 100644 --- a/drivers/target/target_core_fabric_lib.c +++ b/drivers/target/target_core_fabric_lib.c | |||
| @@ -34,10 +34,7 @@ | |||
| 34 | #include <scsi/scsi_cmnd.h> | 34 | #include <scsi/scsi_cmnd.h> |
| 35 | 35 | ||
| 36 | #include <target/target_core_base.h> | 36 | #include <target/target_core_base.h> |
| 37 | #include <target/target_core_device.h> | 37 | #include <target/target_core_fabric.h> |
| 38 | #include <target/target_core_transport.h> | ||
| 39 | #include <target/target_core_fabric_lib.h> | ||
| 40 | #include <target/target_core_fabric_ops.h> | ||
| 41 | #include <target/target_core_configfs.h> | 38 | #include <target/target_core_configfs.h> |
| 42 | 39 | ||
| 43 | #include "target_core_internal.h" | 40 | #include "target_core_internal.h" |
diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c index b4864fba4ef0..ed7e05353d62 100644 --- a/drivers/target/target_core_file.c +++ b/drivers/target/target_core_file.c | |||
| @@ -37,8 +37,7 @@ | |||
| 37 | #include <scsi/scsi_host.h> | 37 | #include <scsi/scsi_host.h> |
| 38 | 38 | ||
| 39 | #include <target/target_core_base.h> | 39 | #include <target/target_core_base.h> |
| 40 | #include <target/target_core_device.h> | 40 | #include <target/target_core_backend.h> |
| 41 | #include <target/target_core_transport.h> | ||
| 42 | 41 | ||
| 43 | #include "target_core_file.h" | 42 | #include "target_core_file.h" |
| 44 | 43 | ||
diff --git a/drivers/target/target_core_hba.c b/drivers/target/target_core_hba.c index 26c1238976cb..3dd1bd4b6f71 100644 --- a/drivers/target/target_core_hba.c +++ b/drivers/target/target_core_hba.c | |||
| @@ -37,9 +37,8 @@ | |||
| 37 | #include <net/tcp.h> | 37 | #include <net/tcp.h> |
| 38 | 38 | ||
| 39 | #include <target/target_core_base.h> | 39 | #include <target/target_core_base.h> |
| 40 | #include <target/target_core_device.h> | 40 | #include <target/target_core_backend.h> |
| 41 | #include <target/target_core_tpg.h> | 41 | #include <target/target_core_fabric.h> |
| 42 | #include <target/target_core_transport.h> | ||
| 43 | 42 | ||
| 44 | #include "target_core_internal.h" | 43 | #include "target_core_internal.h" |
| 45 | 44 | ||
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c index 4aa992204438..feebbfe6cbd0 100644 --- a/drivers/target/target_core_iblock.c +++ b/drivers/target/target_core_iblock.c | |||
| @@ -42,8 +42,7 @@ | |||
| 42 | #include <scsi/scsi_host.h> | 42 | #include <scsi/scsi_host.h> |
| 43 | 43 | ||
| 44 | #include <target/target_core_base.h> | 44 | #include <target/target_core_base.h> |
| 45 | #include <target/target_core_device.h> | 45 | #include <target/target_core_backend.h> |
| 46 | #include <target/target_core_transport.h> | ||
| 47 | 46 | ||
| 48 | #include "target_core_iblock.h" | 47 | #include "target_core_iblock.h" |
| 49 | 48 | ||
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c index 36fa9a5f1ba6..d2b73b3f4e6c 100644 --- a/drivers/target/target_core_pr.c +++ b/drivers/target/target_core_pr.c | |||
| @@ -33,11 +33,8 @@ | |||
| 33 | #include <asm/unaligned.h> | 33 | #include <asm/unaligned.h> |
| 34 | 34 | ||
| 35 | #include <target/target_core_base.h> | 35 | #include <target/target_core_base.h> |
| 36 | #include <target/target_core_device.h> | 36 | #include <target/target_core_backend.h> |
| 37 | #include <target/target_core_tmr.h> | 37 | #include <target/target_core_fabric.h> |
| 38 | #include <target/target_core_tpg.h> | ||
| 39 | #include <target/target_core_transport.h> | ||
| 40 | #include <target/target_core_fabric_ops.h> | ||
| 41 | #include <target/target_core_configfs.h> | 38 | #include <target/target_core_configfs.h> |
| 42 | 39 | ||
| 43 | #include "target_core_internal.h" | 40 | #include "target_core_internal.h" |
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c index 8b15e56b0384..5d8851de3aee 100644 --- a/drivers/target/target_core_pscsi.c +++ b/drivers/target/target_core_pscsi.c | |||
| @@ -44,8 +44,7 @@ | |||
| 44 | #include <scsi/scsi_tcq.h> | 44 | #include <scsi/scsi_tcq.h> |
| 45 | 45 | ||
| 46 | #include <target/target_core_base.h> | 46 | #include <target/target_core_base.h> |
| 47 | #include <target/target_core_device.h> | 47 | #include <target/target_core_backend.h> |
| 48 | #include <target/target_core_transport.h> | ||
| 49 | 48 | ||
| 50 | #include "target_core_pscsi.h" | 49 | #include "target_core_pscsi.h" |
| 51 | 50 | ||
diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c index 02e51faa2f4e..94b4087dadd5 100644 --- a/drivers/target/target_core_rd.c +++ b/drivers/target/target_core_rd.c | |||
| @@ -37,9 +37,7 @@ | |||
| 37 | #include <scsi/scsi_host.h> | 37 | #include <scsi/scsi_host.h> |
| 38 | 38 | ||
| 39 | #include <target/target_core_base.h> | 39 | #include <target/target_core_base.h> |
| 40 | #include <target/target_core_device.h> | 40 | #include <target/target_core_backend.h> |
| 41 | #include <target/target_core_transport.h> | ||
| 42 | #include <target/target_core_fabric_ops.h> | ||
| 43 | 41 | ||
| 44 | #include "target_core_rd.h" | 42 | #include "target_core_rd.h" |
| 45 | 43 | ||
diff --git a/drivers/target/target_core_stat.c b/drivers/target/target_core_stat.c index d2ba9266ff4d..6d8a90464f2e 100644 --- a/drivers/target/target_core_stat.c +++ b/drivers/target/target_core_stat.c | |||
| @@ -43,8 +43,8 @@ | |||
| 43 | #include <scsi/scsi_host.h> | 43 | #include <scsi/scsi_host.h> |
| 44 | 44 | ||
| 45 | #include <target/target_core_base.h> | 45 | #include <target/target_core_base.h> |
| 46 | #include <target/target_core_transport.h> | 46 | #include <target/target_core_backend.h> |
| 47 | #include <target/target_core_fabric_ops.h> | 47 | #include <target/target_core_fabric.h> |
| 48 | #include <target/target_core_configfs.h> | 48 | #include <target/target_core_configfs.h> |
| 49 | #include <target/configfs_macros.h> | 49 | #include <target/configfs_macros.h> |
| 50 | 50 | ||
diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c index 47bc26ba7865..fc9d74890319 100644 --- a/drivers/target/target_core_tmr.c +++ b/drivers/target/target_core_tmr.c | |||
| @@ -32,10 +32,8 @@ | |||
| 32 | #include <scsi/scsi_cmnd.h> | 32 | #include <scsi/scsi_cmnd.h> |
| 33 | 33 | ||
| 34 | #include <target/target_core_base.h> | 34 | #include <target/target_core_base.h> |
| 35 | #include <target/target_core_device.h> | 35 | #include <target/target_core_backend.h> |
| 36 | #include <target/target_core_tmr.h> | 36 | #include <target/target_core_fabric.h> |
| 37 | #include <target/target_core_transport.h> | ||
| 38 | #include <target/target_core_fabric_ops.h> | ||
| 39 | #include <target/target_core_configfs.h> | 37 | #include <target/target_core_configfs.h> |
| 40 | 38 | ||
| 41 | #include "target_core_internal.h" | 39 | #include "target_core_internal.h" |
diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c index 0a936fae3d23..b7668029bb31 100644 --- a/drivers/target/target_core_tpg.c +++ b/drivers/target/target_core_tpg.c | |||
| @@ -39,10 +39,8 @@ | |||
| 39 | #include <scsi/scsi_cmnd.h> | 39 | #include <scsi/scsi_cmnd.h> |
| 40 | 40 | ||
| 41 | #include <target/target_core_base.h> | 41 | #include <target/target_core_base.h> |
| 42 | #include <target/target_core_device.h> | 42 | #include <target/target_core_backend.h> |
| 43 | #include <target/target_core_tpg.h> | 43 | #include <target/target_core_fabric.h> |
| 44 | #include <target/target_core_transport.h> | ||
| 45 | #include <target/target_core_fabric_ops.h> | ||
| 46 | 44 | ||
| 47 | #include "target_core_internal.h" | 45 | #include "target_core_internal.h" |
| 48 | 46 | ||
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index e0ea63dedde3..72c13b7a349f 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c | |||
| @@ -45,11 +45,8 @@ | |||
| 45 | #include <scsi/scsi_tcq.h> | 45 | #include <scsi/scsi_tcq.h> |
| 46 | 46 | ||
| 47 | #include <target/target_core_base.h> | 47 | #include <target/target_core_base.h> |
| 48 | #include <target/target_core_device.h> | 48 | #include <target/target_core_backend.h> |
| 49 | #include <target/target_core_tmr.h> | 49 | #include <target/target_core_fabric.h> |
| 50 | #include <target/target_core_tpg.h> | ||
| 51 | #include <target/target_core_transport.h> | ||
| 52 | #include <target/target_core_fabric_ops.h> | ||
| 53 | #include <target/target_core_configfs.h> | 50 | #include <target/target_core_configfs.h> |
| 54 | 51 | ||
| 55 | #include "target_core_internal.h" | 52 | #include "target_core_internal.h" |
diff --git a/drivers/target/target_core_ua.c b/drivers/target/target_core_ua.c index e2ae53c7e088..3e12f6bcfa10 100644 --- a/drivers/target/target_core_ua.c +++ b/drivers/target/target_core_ua.c | |||
| @@ -30,9 +30,7 @@ | |||
| 30 | #include <scsi/scsi_cmnd.h> | 30 | #include <scsi/scsi_cmnd.h> |
| 31 | 31 | ||
| 32 | #include <target/target_core_base.h> | 32 | #include <target/target_core_base.h> |
| 33 | #include <target/target_core_device.h> | 33 | #include <target/target_core_fabric.h> |
| 34 | #include <target/target_core_transport.h> | ||
| 35 | #include <target/target_core_fabric_ops.h> | ||
| 36 | #include <target/target_core_configfs.h> | 34 | #include <target/target_core_configfs.h> |
| 37 | 35 | ||
| 38 | #include "target_core_internal.h" | 36 | #include "target_core_internal.h" |
diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c index 71fc9cea5dc9..dbbbc8376d01 100644 --- a/drivers/target/tcm_fc/tfc_cmd.c +++ b/drivers/target/tcm_fc/tfc_cmd.c | |||
| @@ -39,12 +39,8 @@ | |||
| 39 | #include <scsi/fc_encode.h> | 39 | #include <scsi/fc_encode.h> |
| 40 | 40 | ||
| 41 | #include <target/target_core_base.h> | 41 | #include <target/target_core_base.h> |
| 42 | #include <target/target_core_transport.h> | 42 | #include <target/target_core_fabric.h> |
| 43 | #include <target/target_core_fabric_ops.h> | ||
| 44 | #include <target/target_core_device.h> | ||
| 45 | #include <target/target_core_tpg.h> | ||
| 46 | #include <target/target_core_configfs.h> | 43 | #include <target/target_core_configfs.h> |
| 47 | #include <target/target_core_tmr.h> | ||
| 48 | #include <target/configfs_macros.h> | 44 | #include <target/configfs_macros.h> |
| 49 | 45 | ||
| 50 | #include "tcm_fc.h" | 46 | #include "tcm_fc.h" |
diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c index 9402b7387cac..73852fbc857b 100644 --- a/drivers/target/tcm_fc/tfc_conf.c +++ b/drivers/target/tcm_fc/tfc_conf.c | |||
| @@ -41,12 +41,8 @@ | |||
| 41 | #include <scsi/libfc.h> | 41 | #include <scsi/libfc.h> |
| 42 | 42 | ||
| 43 | #include <target/target_core_base.h> | 43 | #include <target/target_core_base.h> |
| 44 | #include <target/target_core_transport.h> | 44 | #include <target/target_core_fabric.h> |
| 45 | #include <target/target_core_fabric_ops.h> | ||
| 46 | #include <target/target_core_fabric_configfs.h> | 45 | #include <target/target_core_fabric_configfs.h> |
| 47 | #include <target/target_core_fabric_lib.h> | ||
| 48 | #include <target/target_core_device.h> | ||
| 49 | #include <target/target_core_tpg.h> | ||
| 50 | #include <target/target_core_configfs.h> | 46 | #include <target/target_core_configfs.h> |
| 51 | #include <target/configfs_macros.h> | 47 | #include <target/configfs_macros.h> |
| 52 | 48 | ||
diff --git a/drivers/target/tcm_fc/tfc_io.c b/drivers/target/tcm_fc/tfc_io.c index 1369b1cb103d..d8cabc21036d 100644 --- a/drivers/target/tcm_fc/tfc_io.c +++ b/drivers/target/tcm_fc/tfc_io.c | |||
| @@ -48,10 +48,7 @@ | |||
| 48 | #include <scsi/fc_encode.h> | 48 | #include <scsi/fc_encode.h> |
| 49 | 49 | ||
| 50 | #include <target/target_core_base.h> | 50 | #include <target/target_core_base.h> |
| 51 | #include <target/target_core_transport.h> | 51 | #include <target/target_core_fabric.h> |
| 52 | #include <target/target_core_fabric_ops.h> | ||
| 53 | #include <target/target_core_device.h> | ||
| 54 | #include <target/target_core_tpg.h> | ||
| 55 | #include <target/target_core_configfs.h> | 52 | #include <target/target_core_configfs.h> |
| 56 | #include <target/configfs_macros.h> | 53 | #include <target/configfs_macros.h> |
| 57 | 54 | ||
diff --git a/drivers/target/tcm_fc/tfc_sess.c b/drivers/target/tcm_fc/tfc_sess.c index 326921385aff..4c0507cf808c 100644 --- a/drivers/target/tcm_fc/tfc_sess.c +++ b/drivers/target/tcm_fc/tfc_sess.c | |||
| @@ -40,10 +40,7 @@ | |||
| 40 | #include <scsi/libfc.h> | 40 | #include <scsi/libfc.h> |
| 41 | 41 | ||
| 42 | #include <target/target_core_base.h> | 42 | #include <target/target_core_base.h> |
| 43 | #include <target/target_core_transport.h> | 43 | #include <target/target_core_fabric.h> |
| 44 | #include <target/target_core_fabric_ops.h> | ||
| 45 | #include <target/target_core_device.h> | ||
| 46 | #include <target/target_core_tpg.h> | ||
| 47 | #include <target/target_core_configfs.h> | 44 | #include <target/target_core_configfs.h> |
| 48 | #include <target/configfs_macros.h> | 45 | #include <target/configfs_macros.h> |
| 49 | 46 | ||