Merge pull request #727 from pcm720/master

uyjulian · web-flow · commit 287ca586a850 · 2025-01-26T12:02:57.000-06:00
[ps2hdd] Do not restore journal on unformatted HDDs to avoid corrupting non-APA HDDs
diff --git a/iop/hdd/apa/src/hdd.c b/iop/hdd/apa/src/hdd.c
@@ -339,7 +339,7 @@ int APA_ENTRYPOINT(int argc, char *argv[])
 	{
 		if(hddDevices[i].status<2)
 		{
-			if(apaJournalRestore(i) != 0)
+			if((hddDevices[i].status != 1) && apaJournalRestore(i) != 0)
 			{
 				APA_PRINTF(APA_DRV_NAME": error: log check failed.\n");
 				return hddInitError();

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ int APA_ENTRYPOINT(int argc, char *argv[])`
`339`	`339`	`{`
`340`	`340`	`if(hddDevices[i].status<2)`
`341`	`341`	`{`
`342`		`- if(apaJournalRestore(i) != 0)`
	`342`	`+ if((hddDevices[i].status != 1) && apaJournalRestore(i) != 0)`
`343`	`343`	`{`
`344`	`344`	`APA_PRINTF(APA_DRV_NAME": error: log check failed.\n");`
`345`	`345`	`return hddInitError();`