Skip to contentSkip to conversation

another libsas/ATAPI fix

PATCH Applied Christoph Hellwig 3 participants 4 messages Jun 20, 2020 – Jun 24, 2020

Subsystems (2)
lore
Share & tools
lore
#1 lore raw

PATCH 1/1 libata: fix the ata_scsi_dma_need_drain stub

We don't only need the stub when libata is disable, but also if it is modular and there are built-in SAS drivers (which can happen when SCSI_SAS_ATA is disabled).

Fixes b8f1d1e05817 ("scsi: Wire up ata_scsi_dma_need_drain for SAS HBA drivers")
---
 include/linux/libata.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/libata.h +1 -1
index 042e584daca73e..c57bf674968114 100644
@@ -1092,7 +1092,7 @@ extern int ata_scsi_ioctl(struct scsi_device *dev, unsigned int cmd,
 #define ATA_SCSI_COMPAT_IOCTL /* empty */
 #endif
 extern int ata_scsi_queuecmd(struct Scsi_Host *h, struct scsi_cmnd *cmd);
-#if IS_ENABLED(CONFIG_ATA)
+#if IS_REACHABLE(CONFIG_ATA)
 bool ata_scsi_dma_need_drain(struct request *rq);
 #else
 #define ata_scsi_dma_need_drain NULL
Signature · 1 line
2.26.2
#2 lore raw

Re: [PATCH] libata: fix the ata_scsi_dma_need_drain stub

Quoted 1 line · Christoph Hellwig

We don't only need the stub when libata is disable, but also if it

Disabled. :-)

Quoted 5 lines

is modular and there are built-in SAS drivers (which can happen when SCSI_SAS_ATA is disabled).

Fixes b8f1d1e05817 ("scsi: Wire up ata_scsi_dma_need_drain for SAS HBA drivers")

[...]

MBR, Sergei

#3 lore raw

Re: [PATCH] libata: fix the ata_scsi_dma_need_drain stub

In reply to Christoph Hellwig
Quoted 3 lines · Christoph Hellwig

We don't only need the stub when libata is disable, but also if it is modular and there are built-in SAS drivers (which can happen when SCSI_SAS_ATA is disabled).

Applied to 5.8/scsi-fixes, thanks!

[1/1] scsi: libata: Fix the ata_scsi_dma_need_drain stub

      https://git.kernel.org/mkp/scsi/c/aad4b4d15f30
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering