Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure HDD1 is never damaged or corrupted due to unexpected RPCS3/game close #15036

Merged
merged 1 commit into from
Jan 11, 2024

Conversation

elad335
Copy link
Contributor

@elad335 elad335 commented Jan 11, 2024

Fixes #14958

rpcs3/Emu/VFS.cpp Outdated Show resolved Hide resolved
rpcs3/Emu/Cell/Modules/cellSysCache.cpp Outdated Show resolved Hide resolved
@elad335 elad335 force-pushed the hdd1 branch 3 times, most recently from 8da48dd to 6f25d03 Compare January 11, 2024 15:47
@@ -141,8 +193,8 @@ error_code cellSysCacheMount(vm::ptr<CellSysCacheParam> param)

std::lock_guard lock0(g_mp_sys_dev_hdd1.mutex);

// Check if can reuse existing cache (won't if cache id is an empty string)
if (param->cacheId[0] && cache_id == cache.cache_id)
// Check if can reuse existing cache (won't if cache id is an empty string or cache is damaned/incomplete)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Check if can reuse existing cache (won't if cache id is an empty string or cache is damaned/incomplete)
// Check if can reuse existing cache (won't if cache id is an empty string or cache is damaged/incomplete)

struct fmt_class_string<vm::_ptr_base<char[Size], u32>, void> : fmt_class_string<vm::_ptr_base<const char, u32>>
{
// Classify char[] as const char*
};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
};
};

@ChwaraeTeg
Copy link

Just to confirm, this doesn't fix #15017 - the issue with that one seems to relate to HDD0 rather than HDD1

@elad335 elad335 merged commit 825ae5b into RPCS3:master Jan 11, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants