diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-07 12:28:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-07 12:28:53 -0400 |
commit | 4dfddf503670d8def0fddb497e628130fc4522a8 (patch) | |
tree | f4bbf85589c13a1994fef75622ec80c48684f475 /drivers/scsi/scsi_priv.h | |
parent | d4e65476bc68dbc9231b3c772b71f1576579b6fb (diff) | |
parent | 14bf41dcef651c13911a1715e83220732a3a4071 (diff) |
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI updates from James Bottomley:
"This update includes the usual round of major driver updates (hpsa,
be2iscsi, hisi_sas, zfcp, cxlflash). There's a new incarnation of hpsa
called smartpqi for which a driver is added, there's some cleanup work
of the ibm vscsi target and updates to libfc, plus a whole host of
minor fixes and updates and finally the removal of several ISA drivers
which seem not to have been used for years"
* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (173 commits)
scsi: mvsas: Mark symbols static where possible
scsi: pm8001: Mark symbols static where possible
scsi: arcmsr: Simplify user_len checking
scsi: fcoe: fix off by one in eth2fc_speed()
scsi: dtc: remove from tree
scsi: t128: remove from tree
scsi: pas16: remove from tree
scsi: u14-34f: remove from tree
scsi: ultrastor: remove from tree
scsi: in2000: remove from tree
scsi: wd7000: remove from tree
scsi: scsi_dh_alua: Fix memory leak in alua_rtpg()
scsi: lpfc: Mark symbols static where possible
scsi: hpsa: correct call to hpsa_do_reset
scsi: ufs: Get a TM service response from the correct offset
scsi: ibmvfc: Fix I/O hang when port is not mapped
scsi: megaraid_sas: clean function declarations in megaraid_sas_base.c up
scsi: ipr: Remove redundant messages at adapter init time
scsi: ipr: Don't log unnecessary 9084 error details
scsi: smartpqi: raid bypass lba calculation fix
...
Diffstat (limited to 'drivers/scsi/scsi_priv.h')
-rw-r--r-- | drivers/scsi/scsi_priv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h index 85c8a51bc563..193636a59adf 100644 --- a/drivers/scsi/scsi_priv.h +++ b/drivers/scsi/scsi_priv.h | |||
@@ -86,12 +86,14 @@ extern void scsi_device_unbusy(struct scsi_device *sdev); | |||
86 | extern void scsi_queue_insert(struct scsi_cmnd *cmd, int reason); | 86 | extern void scsi_queue_insert(struct scsi_cmnd *cmd, int reason); |
87 | extern void scsi_io_completion(struct scsi_cmnd *, unsigned int); | 87 | extern void scsi_io_completion(struct scsi_cmnd *, unsigned int); |
88 | extern void scsi_run_host_queues(struct Scsi_Host *shost); | 88 | extern void scsi_run_host_queues(struct Scsi_Host *shost); |
89 | extern void scsi_requeue_run_queue(struct work_struct *work); | ||
89 | extern struct request_queue *scsi_alloc_queue(struct scsi_device *sdev); | 90 | extern struct request_queue *scsi_alloc_queue(struct scsi_device *sdev); |
90 | extern struct request_queue *scsi_mq_alloc_queue(struct scsi_device *sdev); | 91 | extern struct request_queue *scsi_mq_alloc_queue(struct scsi_device *sdev); |
91 | extern int scsi_mq_setup_tags(struct Scsi_Host *shost); | 92 | extern int scsi_mq_setup_tags(struct Scsi_Host *shost); |
92 | extern void scsi_mq_destroy_tags(struct Scsi_Host *shost); | 93 | extern void scsi_mq_destroy_tags(struct Scsi_Host *shost); |
93 | extern int scsi_init_queue(void); | 94 | extern int scsi_init_queue(void); |
94 | extern void scsi_exit_queue(void); | 95 | extern void scsi_exit_queue(void); |
96 | extern void scsi_evt_thread(struct work_struct *work); | ||
95 | struct request_queue; | 97 | struct request_queue; |
96 | struct request; | 98 | struct request; |
97 | extern struct kmem_cache *scsi_sdb_cache; | 99 | extern struct kmem_cache *scsi_sdb_cache; |