cellSysCache: Global hdd1 lock

Take advantage of recursive locking.
RPCS3 · Sep 16, 2020 · 7f66df6 · 7f66df6
1 parent ebfaeb7
commit 7f66df6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/rpcs3/Emu/Cell/Modules/cellSysCache.cpp b/rpcs3/Emu/Cell/Modules/cellSysCache.cpp
@@ -79,8 +79,6 @@ struct syscache_info
 		// Poison opened files in /dev_hdd1 to return CELL_EIO on access
 		if (remove_root)
 		{
-			std::lock_guard lock(g_mp_sys_dev_hdd1.mutex);
-
 			idm::select<lv2_fs_object, lv2_file>([](u32 id, lv2_file& file)
 			{
 				if (std::memcmp("/dev_hdd1", file.name.data(), 9) == 0)
@@ -108,6 +106,7 @@ error_code cellSysCacheClear()
 	// Clear existing cache
 	if (!cache->cache_id.empty())
 	{
+		std::lock_guard lock0(g_mp_sys_dev_hdd1.mutex);
 		cache->clear(false);
 	}
 
@@ -149,6 +148,8 @@ error_code cellSysCacheMount(vm::ptr<CellSysCacheParam> param)
 		return not_an_error(CELL_SYSCACHE_RET_OK_RELAYED);
 	}
 
+	std::lock_guard lock0(g_mp_sys_dev_hdd1.mutex);
+
 	// Clear existing cache
 	if (!cache->cache_id.empty())
 	{