linux-ide.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* another libsas/ATAPI fix
@ 2020-06-20  7:13 Christoph Hellwig
  2020-06-20  7:13 ` [PATCH] libata: fix the ata_scsi_dma_need_drain stub Christoph Hellwig
  0 siblings, 1 reply; 4+ messages in thread
From: Christoph Hellwig @ 2020-06-20  7:13 UTC (permalink / raw)
  To: martin.petersen; +Cc: linux-scsi, linux-ide

Hi all,

another fixup for the dma_drain vs SAS HBA issue.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH] libata: fix the ata_scsi_dma_need_drain stub
  2020-06-20  7:13 another libsas/ATAPI fix Christoph Hellwig
@ 2020-06-20  7:13 ` Christoph Hellwig
  2020-06-20  8:21   ` Sergei Shtylyov
  2020-06-24  4:29   ` Martin K. Petersen
  0 siblings, 2 replies; 4+ messages in thread
From: Christoph Hellwig @ 2020-06-20  7:13 UTC (permalink / raw)
  To: martin.petersen; +Cc: linux-scsi, linux-ide

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")
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 include/linux/libata.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 042e584daca73e..c57bf674968114 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -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
-- 
2.26.2


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] libata: fix the ata_scsi_dma_need_drain stub
  2020-06-20  7:13 ` [PATCH] libata: fix the ata_scsi_dma_need_drain stub Christoph Hellwig
@ 2020-06-20  8:21   ` Sergei Shtylyov
  2020-06-24  4:29   ` Martin K. Petersen
  1 sibling, 0 replies; 4+ messages in thread
From: Sergei Shtylyov @ 2020-06-20  8:21 UTC (permalink / raw)
  To: Christoph Hellwig, martin.petersen; +Cc: linux-scsi, linux-ide

On 20.06.2020 10:13, Christoph Hellwig wrote:

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

    Disabled. :-)

> 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")
> Signed-off-by: Christoph Hellwig <hch@lst.de>
[...]

MBR, Sergei

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] libata: fix the ata_scsi_dma_need_drain stub
  2020-06-20  7:13 ` [PATCH] libata: fix the ata_scsi_dma_need_drain stub Christoph Hellwig
  2020-06-20  8:21   ` Sergei Shtylyov
@ 2020-06-24  4:29   ` Martin K. Petersen
  1 sibling, 0 replies; 4+ messages in thread
From: Martin K. Petersen @ 2020-06-24  4:29 UTC (permalink / raw)
  To: Christoph Hellwig; +Cc: Martin K . Petersen, linux-scsi, linux-ide

On Sat, 20 Jun 2020 09:13:02 +0200, Christoph Hellwig wrote:

> 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

-- 
Martin K. Petersen	Oracle Linux Engineering

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-06-24  4:31 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-20  7:13 another libsas/ATAPI fix Christoph Hellwig
2020-06-20  7:13 ` [PATCH] libata: fix the ata_scsi_dma_need_drain stub Christoph Hellwig
2020-06-20  8:21   ` Sergei Shtylyov
2020-06-24  4:29   ` Martin K. Petersen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).