Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba929992 authored by Bart Van Assche's avatar Bart Van Assche Committed by James Bottomley
Browse files

target: Minimize SCSI header #include directives 



Only include SCSI initiator header files in target code that needs
these header files, namely the SCSI pass-through code and the tcm_loop
driver. Change SCSI_SENSE_BUFFERSIZE into TRANSPORT_SENSE_BUFFER in
target code because the former is intended for initiator code and the
latter for target code. With this patch the only initiator include
directives in target code that remain are as follows:

$ git grep -nHE 'include .scsi/(scsi.h|scsi_host.h|scsi_device.h|scsi_cmnd.h)' drivers/target drivers/infiniband/ulp/{isert,srpt} drivers/usb/gadget/legacy/tcm_*.[ch] drivers/{vhost,xen} include/{target,trace/events/target.h}
drivers/target/loopback/tcm_loop.c:29:#include <scsi/scsi.h>
drivers/target/loopback/tcm_loop.c:31:#include <scsi/scsi_host.h>
drivers/target/loopback/tcm_loop.c:32:#include <scsi/scsi_device.h>
drivers/target/loopback/tcm_loop.c:33:#include <scsi/scsi_cmnd.h>
drivers/target/target_core_pscsi.c:39:#include <scsi/scsi_device.h>
drivers/target/target_core_pscsi.c:40:#include <scsi/scsi_host.h>
drivers/xen/xen-scsiback.c:52:#include <scsi/scsi_host.h> /* SG_ALL */

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent 8d3a8248

Documentation/target/tcm_mod_builder.py

+2 −5
Original line number Diff line number Diff line
@@ -503,11 +503,8 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "#include <linux/string.h>\n"

	buf += "#include <linux/ctype.h>\n"

	buf += "#include <asm/unaligned.h>\n"

	buf += "#include <scsi/scsi.h>\n"

	buf += "#include <scsi/scsi_host.h>\n"

	buf += "#include <scsi/scsi_device.h>\n"

	buf += "#include <scsi/scsi_cmnd.h>\n"

	buf += "#include <scsi/libfc.h>\n\n"

	buf += "#include <scsi/scsi_common.h>\n"

	buf += "#include <scsi/scsi_proto.h>\n"

	buf += "#include <target/target_core_base.h>\n"

	buf += "#include <target/target_core_fabric.h>\n"

	buf += "#include <target/target_core_configfs.h>\n\n"

drivers/infiniband/ulp/srpt/ib_srpt.c

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <linux/string.h>

#include <linux/delay.h>

#include <linux/atomic.h>

#include <scsi/scsi_proto.h>

#include <scsi/scsi_tcq.h>

#include <target/configfs_macros.h>

#include <target/target_core_base.h>

drivers/infiniband/ulp/srpt/ib_srpt.h

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ struct srpt_send_ioctx { 
	u8			n_rdma;

	u8			n_rbuf;

	bool			queue_status_only;

	u8			sense_data[SCSI_SENSE_BUFFERSIZE];

	u8			sense_data[TRANSPORT_SENSE_BUFFER];

};



/**

drivers/target/iscsi/iscsi_target.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/module.h>

#include <linux/idr.h>

#include <asm/unaligned.h>

#include <scsi/scsi_device.h>

#include <scsi/scsi_proto.h>

#include <scsi/iscsi_proto.h>

#include <scsi/scsi_tcq.h>

#include <target/target_core_base.h>

drivers/target/iscsi/iscsi_target_device.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
 * GNU General Public License for more details.

 ******************************************************************************/



#include <scsi/scsi_device.h>

#include <target/target_core_base.h>

#include <target/target_core_fabric.h>