[PATCH] libata: separate out __ata_ehi_hotplugged() (c0b6c037) · Commits · 戴 / test

Separate out __ata_ehi_hotplugged() from ata_ehi_hotplugged(). The underscored version doesn't set AC_ERR_ATA_BUS. This will be used for resume which is a hotplug event but not an ATA bus error. Signed-off-by:

Tejun Heo <htejun@gmail.com> Signed-off-by:

Jeff Garzik <jeff@garzik.org>

include/linux/libata.h

+7 −2

Original line number	Diff line number	Diff line
		@@ -843,7 +843,7 @@ extern void ata_do_eh(struct ata_port *ap, ata_prereset_fn_t prereset,
		(ehi)->desc_len = 0; \
		} while (0)

		static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi)
		static inline void __ata_ehi_hotplugged(struct ata_eh_info *ehi)
		{
		if (ehi->flags & ATA_EHI_HOTPLUGGED)
		return;
		@@ -851,11 +851,16 @@ static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi)
		ehi->flags \|= ATA_EHI_HOTPLUGGED \| ATA_EHI_RESUME_LINK;
		ehi->hotplug_timestamp = jiffies;

		ehi->err_mask \|= AC_ERR_ATA_BUS;
		ehi->action \|= ATA_EH_SOFTRESET;
		ehi->probe_mask \|= (1 << ATA_MAX_DEVICES) - 1;
		}

		static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi)
		{
		__ata_ehi_hotplugged(ehi);
		ehi->err_mask \|= AC_ERR_ATA_BUS;
		}

		/*
		* qc helpers
		*/

Admin message