Attachment 251709 Details for Bug 279978 – Patch to not use wiped func_code

[patch] Patch to not use wiped func_code

sata_recovery.patch (text/plain), 1.48 KB, created by Alexander Motin on 2024-06-26 15:27:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Motin

Created: 2024-06-26 15:27:23 UTC

Size: 1.48 KB

patch

obsolete

>diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c
>index b8cca377e47f..2910247d9327 100644
>--- a/sys/dev/ahci/ahci.c
>+++ b/sys/dev/ahci/ahci.c
>@@ -2175,7 +2175,7 @@ ahci_issue_recovery(struct ahci_channel *ch)
> 	}
> 	xpt_setup_ccb(&ccb->ccb_h, ch->hold[i]->ccb_h.path,
> 	    ch->hold[i]->ccb_h.pinfo.priority);
>-	if (ccb->ccb_h.func_code == XPT_ATA_IO) {
>+	if (ch->hold[i]->ccb_h.func_code == XPT_ATA_IO) {
> 		/* READ LOG */
> 		ccb->ccb_h.recovery_type = RECOVERY_READ_LOG;
> 		ccb->ccb_h.func_code = XPT_ATA_IO;
>diff --git a/sys/dev/mvs/mvs.c b/sys/dev/mvs/mvs.c
>index 253fdc096475..9677d16f088c 100644
>--- a/sys/dev/mvs/mvs.c
>+++ b/sys/dev/mvs/mvs.c
>@@ -1798,7 +1798,7 @@ mvs_issue_recovery(device_t dev)
> 	}
> 	xpt_setup_ccb(&ccb->ccb_h, ch->hold[i]->ccb_h.path,
> 	    ch->hold[i]->ccb_h.pinfo.priority);
>-	if (ccb->ccb_h.func_code == XPT_ATA_IO) {
>+	if (ch->hold[i]->ccb_h.func_code == XPT_ATA_IO) {
> 		/* READ LOG */
> 		ccb->ccb_h.recovery_type = RECOVERY_READ_LOG;
> 		ccb->ccb_h.func_code = XPT_ATA_IO;
>diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c
>index ad370c99f85e..e5b0b8b1f009 100644
>--- a/sys/dev/siis/siis.c
>+++ b/sys/dev/siis/siis.c
>@@ -1394,7 +1394,7 @@ siis_issue_recovery(device_t dev)
> 	}
> 	xpt_setup_ccb(&ccb->ccb_h, ch->hold[i]->ccb_h.path,
> 	    ch->hold[i]->ccb_h.pinfo.priority);
>-	if (ccb->ccb_h.func_code == XPT_ATA_IO) {
>+	if (ch->hold[i]->ccb_h.func_code == XPT_ATA_IO) {
> 		/* READ LOG */
> 		ccb->ccb_h.recovery_type = RECOVERY_READ_LOG;
> 		ccb->ccb_h.func_code = XPT_ATA_IO;

Actions: View | Diff

Attachments on bug 279978: 251709