Mesa (staging/21.2): util/fossilize_db: Flush files after header write.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Aug 9 21:46:59 UTC 2021
Module: Mesa
Branch: staging/21.2
Commit: b2d326fba1199c5ec06daeedfc9df3f941bd831f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b2d326fba1199c5ec06daeedfc9df3f941bd831f
Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date: Thu Aug 5 01:29:04 2021 +0200
util/fossilize_db: Flush files after header write.
We should probably flush before we unlock the file again.
Fixes: 4f0f8133a35 "util/fossilize_db: Do not lock the fossilize db permanently."
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12204>
(cherry picked from commit 3091277052cccd47994a2aa075eecaa767cc709b)
---
.pick_status.json | 2 +-
src/util/fossilize_db.c | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/.pick_status.json b/.pick_status.json
index 341f7a1dcbb..67a0e9ac367 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -607,7 +607,7 @@
"description": "util/fossilize_db: Flush files after header write.",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": "4f0f8133a35ec2fec8d99936cd7425e40d092169"
},
diff --git a/src/util/fossilize_db.c b/src/util/fossilize_db.c
index 6737cf2b21b..af5c6e58581 100644
--- a/src/util/fossilize_db.c
+++ b/src/util/fossilize_db.c
@@ -241,6 +241,9 @@ load_foz_dbs(struct foz_db *foz_db, FILE *db_idx, uint8_t file_idx,
sizeof(stream_reference_magic_and_version), db_idx) !=
sizeof(stream_reference_magic_and_version))
goto fail;
+
+ fflush(foz_db->file[file_idx]);
+ fflush(db_idx);
}
flock(fileno(foz_db->file[file_idx]), LOCK_UN);
More information about the mesa-commit
mailing list