acpi, nfit: Fix ARS overflow continuation

djbw · djbw · commit 3fa58dcab50a · 2018-11-10T09:54:28.000-08:00
When the platform BIOS is unable to report all the media error records it requires the OS to restart the scrub at a prescribed location. The driver detects the overflow condition, but then fails to report it to the ARS state machine after reaping the records. Propagate -ENOSPC correctly to continue the ARS operation. Cc: <stable@vger.kernel.org> Fixes: 1cf03c0 ("nfit: scrub and register regions in a workqueue") Reported-by: Jacek Zloch <jacek.zloch@intel.com> Reviewed-by: Dave Jiang <dave.jiang@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
@@ -2928,9 +2928,9 @@ static int acpi_nfit_query_poison(struct acpi_nfit_desc *acpi_desc)
 		return rc;
 
 	if (ars_status_process_records(acpi_desc))
-		return -ENOMEM;
+		dev_err(acpi_desc->dev, "Failed to process ARS records\n");
 
-	return 0;
+	return rc;
 }
 
 static int ars_register(struct acpi_nfit_desc *acpi_desc,

Original file line number	Diff line number	Diff line change
`@@ -2928,9 +2928,9 @@ static int acpi_nfit_query_poison(struct acpi_nfit_desc *acpi_desc)`
`2928`	`2928`	`return rc;`
`2929`	`2929`
`2930`	`2930`	`if (ars_status_process_records(acpi_desc))`
`2931`		`- return -ENOMEM;`
	`2931`	`+ dev_err(acpi_desc->dev, "Failed to process ARS records\n");`
`2932`	`2932`
`2933`		`- return 0;`
	`2933`	`+ return rc;`
`2934`	`2934`	`}`
`2935`	`2935`
`2936`	`2936`	`static int ars_register(struct acpi_nfit_desc *acpi_desc,`