diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2021-07-24 13:08:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2021-07-24 13:08:31 -0700 |
| commit | 7ffca2bb9d8bf6813db50364b1dd2c02f58fb65e (patch) | |
| tree | 029191d4764f70c421a186cf4f219486aa373f78 /drivers/scsi/mpt3sas/mpt3sas_base.h | |
| parent | Merge tag 'io_uring-5.14-2021-07-24' of git://git.kernel.dk/linux-block (diff) | |
| parent | scsi: target: Fix NULL dereference on XCOPY completion (diff) | |
| download | linux-7ffca2bb9d8bf6813db50364b1dd2c02f58fb65e.tar.gz linux-7ffca2bb9d8bf6813db50364b1dd2c02f58fb65e.tar.bz2 linux-7ffca2bb9d8bf6813db50364b1dd2c02f58fb65e.zip | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Four fixes, all in drivers, all of which can lead to user visible
problems in certain situations"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: target: Fix NULL dereference on XCOPY completion
scsi: mpt3sas: Transition IOC to Ready state during shutdown
scsi: target: Fix protect handling in WRITE SAME(32)
scsi: iscsi: Fix iface sysfs attr detection
Diffstat (limited to 'drivers/scsi/mpt3sas/mpt3sas_base.h')
| -rw-r--r-- | drivers/scsi/mpt3sas/mpt3sas_base.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h index d4834c8ee9c0..0c6c3df0038d 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.h +++ b/drivers/scsi/mpt3sas/mpt3sas_base.h @@ -1730,6 +1730,10 @@ do { ioc_err(ioc, "In func: %s\n", __func__); \ status, mpi_request, sz); } while (0) int mpt3sas_wait_for_ioc(struct MPT3SAS_ADAPTER *ioc, int wait_count); +int +mpt3sas_base_make_ioc_ready(struct MPT3SAS_ADAPTER *ioc, enum reset_type type); +void mpt3sas_base_free_irq(struct MPT3SAS_ADAPTER *ioc); +void mpt3sas_base_disable_msix(struct MPT3SAS_ADAPTER *ioc); /* scsih shared API */ struct scsi_cmnd *mpt3sas_scsih_scsi_lookup_get(struct MPT3SAS_ADAPTER *ioc, |