ata: libata: Introduce ata_port_eh_scheduled()
Damien Le Moal
maintainerPATCH 1/1 ata: libata: Introduce ata_port_eh_scheduled()
Introduce the inline helper function ata_port_eh_scheduled() to test if EH is pending (ATA_PFLAG_EH_PENDING port flag is set) or running (ATA_PFLAG_EH_IN_PROGRESS port flag is set) for a port. Use this helper in ata_port_wait_eh() and __ata_scsi_queuecmd() to replace the hardcoded port flag tests.
No functional changes.
--- drivers/ata/libata-eh.c | 2 +- drivers/ata/libata-scsi.c | 5 +++-- drivers/ata/libata.h | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-)
drivers/ata/libata-eh.c +1 -1
@@ -823,7 +823,7 @@ void ata_port_wait_eh(struct ata_port *ap) retry:spin_lock_irqsave (ap->lock, flags); -while (ap->pflags & (ATA_PFLAG_EH_PENDING |ATA_PFLAG_EH_IN_PROGRESS )) { +while (ata_port_eh_scheduled (ap)) {prepare_to_wait (&ap->eh_wait_q, &wait,TASK_UNINTERRUPTIBLE );spin_unlock_irqrestore (ap->lock, flags);schedule ();
drivers/ata/libata-scsi.c +3 -2
@@ -4316,9 +4316,10 @@ int __ata_scsi_queuecmd(struct scsi_cmnd *scmd, struct ata_device *dev)* scsi_queue_rq() will defer commands if scsi_host_in_recovery(). * However, this check is done without holding the ap->lock (a libata * specific lock), so we can have received an error irq since then, -* therefore we must check if EH is pending, while holding ap->lock. +* therefore we must check if EH is pending or running, while holding +* ap->lock. */ -if (ap->pflags & (ATA_PFLAG_EH_PENDING |ATA_PFLAG_EH_IN_PROGRESS )) +if (ata_port_eh_scheduled (ap))return SCSI_MLQUEUE_DEVICE_BUSY ;if (unlikely (!scmd->cmd_len))
drivers/ata/libata.h +5 -0
@@ -51,6 +51,11 @@ static inline bool ata_dev_is_zac(struct ata_device *dev)ata_id_zoned_cap (dev->id) ==0x01 ; } +static inline bool ata_port_eh_scheduled (struct ata_port *ap) +{ +return ap->pflags & (ATA_PFLAG_EH_PENDING |ATA_PFLAG_EH_IN_PROGRESS ); +} +#ifdef CONFIG_ATA_FORCE extern void ata_force_cbl (struct ata_port *ap);#else
Signature · 1 line
2.50.0
Quoted 9 lines · Damien Le Moal
Introduce the inline helper function
ata_port_eh_scheduled()to test if EH is pending (ATA_PFLAG_EH_PENDINGport flag is set) or running (ATA_PFLAG_EH_IN_PROGRESSport flag is set) for a port. Use this helper inata_port_wait_eh()and__ata_scsi_queuecmd()to replace the hardcoded port flag tests.No functional changes.
Signed-off-by Damien Le Moal <[email protected]>
Quoted 9 lines · Damien Le Moal
Introduce the inline helper function
ata_port_eh_scheduled()to test if EH is pending (ATA_PFLAG_EH_PENDINGport flag is set) or running (ATA_PFLAG_EH_IN_PROGRESSport flag is set) for a port. Use this helper inata_port_wait_eh()and__ata_scsi_queuecmd()to replace the hardcoded port flag tests.No functional changes.
[...]
Applied to libata/linux.git (for-6.17), thanks!
[1/1] ata: libata: Introduce ata_port_eh_scheduled()
https://git.kernel.org/libata/linux/c/7aae547b
Kind regards,
Niklas