path: root/include/linux/libata.h
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2020-06-27 15:20:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-06-27 15:20:03 -0700
commit3cd1c5d582f42fead949947a6e3c8f51797580c9 (patch)
tree82de54b915d227bd9cabd7663fcad8543c675166 /include/linux/libata.h
parentMerge tag 'vfio-v5.8-rc3' of git://github.com/awilliam/linux-vfio (diff)
parentscsi: mptscsih: Fix read sense data size (diff)
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley: "Six small fixes, five in drivers and one to correct another minor regression from cc97923a5bcc ("block: move dma drain handling to scsi") where we still need the drain stub to be built in to the kernel for the modular libata, non-modular SAS driver case" * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: scsi: mptscsih: Fix read sense data size scsi: zfcp: Fix panic on ERP timeout for previously dismissed ERP action scsi: lpfc: Avoid another null dereference in lpfc_sli4_hba_unset() scsi: libata: Fix the ata_scsi_dma_need_drain stub scsi: qla2xxx: Keep initiator ports after RSCN scsi: qla2xxx: Set NVMe status code for failed NVMe FCP request
Diffstat (limited to 'include/linux/libata.h')
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index e7e5256817dc..77ccf040a128 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1095,7 +1095,7 @@ extern int ata_scsi_ioctl(struct scsi_device *dev, unsigned int cmd,
#define ATA_SCSI_COMPAT_IOCTL /* empty */
extern int ata_scsi_queuecmd(struct Scsi_Host *h, struct scsi_cmnd *cmd);
bool ata_scsi_dma_need_drain(struct request *rq);
#define ata_scsi_dma_need_drain NULL