Mesa (staging/21.1): util/fossilize_db: Flush files after header write.

[GitLab Mirror]

Module: Mesa
Branch: staging/21.1
Commit: 32a665bb10550490b8b7096352652e0018961bae
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=32a665bb10550490b8b7096352652e0018961bae

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 c69bf4f51b6..166bae1eed6 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -184,7 +184,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 8b80d13403d..8d773e78ec3 100644
--- a/src/util/fossilize_db.c
+++ b/src/util/fossilize_db.c
@@ -245,6 +245,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(db_idx), LOCK_UN);