From d4af8dd89abb7b2f13ff67444dbf615ada63bd14 Mon Sep 17 00:00:00 2001
From: Eladash <elad3356p@gmail.com>
Date: Mon, 22 Feb 2021 14:36:35 +0200
Subject: [PATCH] Fix atomicity of savedata/trophy data writes

---
 Utilities/File.h                        | 11 ++++++++---
 rpcs3/Emu/Cell/Modules/cellSaveData.cpp |  2 +-
 rpcs3/Loader/TRP.cpp                    |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Utilities/File.h b/Utilities/File.h
index d39242bd80..0a23eb03e2 100644
--- a/Utilities/File.h
+++ b/Utilities/File.h
@@ -748,7 +748,7 @@ namespace fs
 		return result;
 	}
 
-	template <typename... Args>
+	template <bool Flush = false, typename... Args>
 	bool write_file(const std::string& path, bs_t<fs::open_mode> mode, const Args&... args)
 	{
 		// Always use write flag, remove read flag
@@ -758,14 +758,19 @@ namespace fs
 			{
 				// Specialization for [const void*, usz] args
 				f.write(args...);
-				return true;
 			}
 			else
 			{
 				// Write args sequentially
 				(f.write(args), ...);
-				return true;
 			}
+
+			if constexpr (Flush)
+			{
+				f.sync();
+			}
+
+			return true;
 		}
 
 		return false;
diff --git a/rpcs3/Emu/Cell/Modules/cellSaveData.cpp b/rpcs3/Emu/Cell/Modules/cellSaveData.cpp
index addd5fa9c3..1a873e5756 100644
--- a/rpcs3/Emu/Cell/Modules/cellSaveData.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSaveData.cpp
@@ -1911,7 +1911,7 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 			if (auto file = pair.second.release())
 			{
 				auto fvec = static_cast<fs::container_stream<std::vector<uchar>>&>(*file);
-				fs::file(new_path + vfs::escape(pair.first), fs::rewrite).write(fvec.obj);
+				ensure(fs::write_file<true>(new_path + vfs::escape(pair.first), fs::rewrite, fvec.obj));
 			}
 		}
 
diff --git a/rpcs3/Loader/TRP.cpp b/rpcs3/Loader/TRP.cpp
index 97293121b2..36f80553ba 100644
--- a/rpcs3/Loader/TRP.cpp
+++ b/rpcs3/Loader/TRP.cpp
@@ -47,7 +47,7 @@ bool TRPLoader::Install(const std::string& dest, bool show)
 		}
 
 		// Create the file in the temporary directory
-		success = fs::write_file(temp + '/' + vfs::escape(entry.name), fs::create + fs::excl, buffer);
+		success = fs::write_file<true>(temp + '/' + vfs::escape(entry.name), fs::create + fs::excl, buffer);
 		if (!success)
 		{
 			break;