Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

scsi: iscsi: Declare SCSI host template const

Browse Source 
Make it explicit that the SCSI host template is not modified.

Reviewed-by: Mike Christie <michael.christie@oracle.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20230322195515.1267197-50-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Bart Van Assche 2023-03-22 12:54:44 -07:00 committed by Martin K. Petersen
parent eb60d17a0e
commit 80602aca4f
11 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/infiniband/ulp/iser/iscsi_iser.c
View File

@ -78,7 +78,7 @@ MODULE_DESCRIPTION("iSER (iSCSI Extensions for RDMA) Datamover");
MODULE_LICENSE("Dual BSD/GPL"); MODULE_LICENSE("Dual BSD/GPL");
MODULE_AUTHOR("Alex Nezhinsky, Dan Bar Dov, Or Gerlitz"); MODULE_AUTHOR("Alex Nezhinsky, Dan Bar Dov, Or Gerlitz");
static struct scsi_host_template iscsi_iser_sht; static const struct scsi_host_template iscsi_iser_sht;
static struct iscsi_transport iscsi_iser_transport; static struct iscsi_transport iscsi_iser_transport;
static struct scsi_transport_template *iscsi_iser_scsi_transport; static struct scsi_transport_template *iscsi_iser_scsi_transport;
static struct workqueue_struct *release_wq; static struct workqueue_struct *release_wq;
@ -956,7 +956,7 @@ static umode_t iser_attr_is_visible(int param_type, int param)
return 0; return 0;
} }
static struct scsi_host_template iscsi_iser_sht = { static const struct scsi_host_template iscsi_iser_sht = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = "iSCSI Initiator over iSER", .name = "iSCSI Initiator over iSER",
.queuecommand = iscsi_queuecommand, .queuecommand = iscsi_queuecommand,

2
drivers/scsi/be2iscsi/be_main.c
View File

@ -398,7 +398,7 @@ static const struct pci_device_id beiscsi_pci_id_table[] = {
MODULE_DEVICE_TABLE(pci, beiscsi_pci_id_table); MODULE_DEVICE_TABLE(pci, beiscsi_pci_id_table);
static struct scsi_host_template beiscsi_sht = { static const struct scsi_host_template beiscsi_sht = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = "Emulex 10Gbe open-iscsi Initiator Driver", .name = "Emulex 10Gbe open-iscsi Initiator Driver",
.proc_name = DRV_NAME, .proc_name = DRV_NAME,

4
drivers/scsi/bnx2i/bnx2i_iscsi.c
View File

@ -22,7 +22,7 @@
struct scsi_transport_template *bnx2i_scsi_xport_template; struct scsi_transport_template *bnx2i_scsi_xport_template;
struct iscsi_transport bnx2i_iscsi_transport; struct iscsi_transport bnx2i_iscsi_transport;
static struct scsi_host_template bnx2i_host_template; static const struct scsi_host_template bnx2i_host_template;
/* /*
* Global endpoint resource info * Global endpoint resource info
@ -2250,7 +2250,7 @@ static umode_t bnx2i_attr_is_visible(int param_type, int param)
* 'Scsi_Host_Template' structure and 'iscsi_tranport' structure template * 'Scsi_Host_Template' structure and 'iscsi_tranport' structure template
* used while registering with the scsi host and iSCSI transport module. * used while registering with the scsi host and iSCSI transport module.
*/ */
static struct scsi_host_template bnx2i_host_template = { static const struct scsi_host_template bnx2i_host_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = "QLogic Offload iSCSI Initiator", .name = "QLogic Offload iSCSI Initiator",
.proc_name = "bnx2i", .proc_name = "bnx2i",

2
drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
View File

@ -80,7 +80,7 @@ static struct cxgb3_client t3_client = {
.event_handler = cxgb3i_dev_event_handler, .event_handler = cxgb3i_dev_event_handler,
}; };
static struct scsi_host_template cxgb3i_host_template = { static const struct scsi_host_template cxgb3i_host_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = DRV_MODULE_NAME, .name = DRV_MODULE_NAME,
.proc_name = DRV_MODULE_NAME, .proc_name = DRV_MODULE_NAME,

2
drivers/scsi/cxgbi/libcxgbi.c
View File

@ -337,7 +337,7 @@ void cxgbi_hbas_remove(struct cxgbi_device *cdev)
EXPORT_SYMBOL_GPL(cxgbi_hbas_remove); EXPORT_SYMBOL_GPL(cxgbi_hbas_remove);
int cxgbi_hbas_add(struct cxgbi_device *cdev, u64 max_lun, int cxgbi_hbas_add(struct cxgbi_device *cdev, u64 max_lun,
unsigned int max_conns, struct scsi_host_template *sht, unsigned int max_conns, const struct scsi_host_template *sht,
struct scsi_transport_template *stt) struct scsi_transport_template *stt)
{ {
struct cxgbi_hba *chba; struct cxgbi_hba *chba;

2
drivers/scsi/cxgbi/libcxgbi.h
View File

@ -591,7 +591,7 @@ struct cxgbi_device *cxgbi_device_find_by_netdev(struct net_device *, int *);
struct cxgbi_device *cxgbi_device_find_by_netdev_rcu(struct net_device *, struct cxgbi_device *cxgbi_device_find_by_netdev_rcu(struct net_device *,
int *); int *);
int cxgbi_hbas_add(struct cxgbi_device *, u64, unsigned int, int cxgbi_hbas_add(struct cxgbi_device *, u64, unsigned int,
struct scsi_host_template *, const struct scsi_host_template *,
struct scsi_transport_template *); struct scsi_transport_template *);
void cxgbi_hbas_remove(struct cxgbi_device *); void cxgbi_hbas_remove(struct cxgbi_device *);

4
drivers/scsi/iscsi_tcp.c
View File

@ -47,7 +47,7 @@ MODULE_DESCRIPTION("iSCSI/TCP data-path");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static struct scsi_transport_template *iscsi_sw_tcp_scsi_transport; static struct scsi_transport_template *iscsi_sw_tcp_scsi_transport;
static struct scsi_host_template iscsi_sw_tcp_sht; static const struct scsi_host_template iscsi_sw_tcp_sht;
static struct iscsi_transport iscsi_sw_tcp_transport; static struct iscsi_transport iscsi_sw_tcp_transport;
static unsigned int iscsi_max_lun = ~0; static unsigned int iscsi_max_lun = ~0;
@ -1072,7 +1072,7 @@ static int iscsi_sw_tcp_slave_configure(struct scsi_device *sdev)
return 0; return 0;
} }
static struct scsi_host_template iscsi_sw_tcp_sht = { static const struct scsi_host_template iscsi_sw_tcp_sht = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = "iSCSI Initiator over TCP/IP", .name = "iSCSI Initiator over TCP/IP",
.queuecommand = iscsi_queuecommand, .queuecommand = iscsi_queuecommand,

2
drivers/scsi/libiscsi.c
View File

@ -2895,7 +2895,7 @@ EXPORT_SYMBOL_GPL(iscsi_host_add);
* This should be called by partial offload and software iscsi drivers. * This should be called by partial offload and software iscsi drivers.
* To access the driver specific memory use the iscsi_host_priv() macro. * To access the driver specific memory use the iscsi_host_priv() macro.
*/ */
struct Scsi_Host *iscsi_host_alloc(struct scsi_host_template *sht, struct Scsi_Host *iscsi_host_alloc(const struct scsi_host_template *sht,
int dd_data_size, bool xmit_can_sleep) int dd_data_size, bool xmit_can_sleep)
{ {
struct Scsi_Host *shost; struct Scsi_Host *shost;

2
drivers/scsi/qedi/qedi_gbl.h
View File

@ -17,7 +17,7 @@ extern int qedi_do_not_recover;
extern uint qedi_io_tracing; extern uint qedi_io_tracing;
extern struct scsi_host_template qedi_host_template; extern const struct scsi_host_template qedi_host_template;
extern struct iscsi_transport qedi_iscsi_transport; extern struct iscsi_transport qedi_iscsi_transport;
extern const struct qed_iscsi_ops *qedi_ops; extern const struct qed_iscsi_ops *qedi_ops;
extern const struct qedi_debugfs_ops qedi_debugfs_ops[]; extern const struct qedi_debugfs_ops qedi_debugfs_ops[];

2
drivers/scsi/qedi/qedi_iscsi.c
View File

@ -40,7 +40,7 @@ static int qedi_eh_host_reset(struct scsi_cmnd *cmd)
return qedi_recover_all_conns(qedi); return qedi_recover_all_conns(qedi);
} }
struct scsi_host_template qedi_host_template = { const struct scsi_host_template qedi_host_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = "QLogic QEDI 25/40/100Gb iSCSI Initiator Driver", .name = "QLogic QEDI 25/40/100Gb iSCSI Initiator Driver",
.proc_name = QEDI_MODULE_NAME, .proc_name = QEDI_MODULE_NAME,

2
include/scsi/libiscsi.h
View File

@ -407,7 +407,7 @@ extern int iscsi_host_set_param(struct Scsi_Host *shost,
extern int iscsi_host_get_param(struct Scsi_Host *shost, extern int iscsi_host_get_param(struct Scsi_Host *shost,
enum iscsi_host_param param, char *buf); enum iscsi_host_param param, char *buf);
extern int iscsi_host_add(struct Scsi_Host *shost, struct device *pdev); extern int iscsi_host_add(struct Scsi_Host *shost, struct device *pdev);
extern struct Scsi_Host *iscsi_host_alloc(struct scsi_host_template *sht, extern struct Scsi_Host *iscsi_host_alloc(const struct scsi_host_template *sht,
int dd_data_size, int dd_data_size,
bool xmit_can_sleep); bool xmit_can_sleep);
extern void iscsi_host_remove(struct Scsi_Host *shost, bool is_shutdown); extern void iscsi_host_remove(struct Scsi_Host *shost, bool is_shutdown);