From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 19 Feb 2018 17:24:36 +0000 (+0100)
Subject: tree-wide: make use of fsync_directory_of_file() all over the place
X-Git-Tag: v238~82^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ac2f74fb6bb798db1fb3f7a7bf97f2579e963c2;p=thirdparty%2Fsystemd.git

tree-wide: make use of fsync_directory_of_file() all over the place

Let's make use this at various places we call fsync(), to make things
fully reliable, as the kernel devs suggest to first fsync() files and
then fsync() the directories they are located in.
---

diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index 26d6174664e..29b941348aa 100644
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -1187,6 +1187,10 @@ int fflush_sync_and_check(FILE *f) {
         if (fsync(fileno(f)) < 0)
                 return -errno;
 
+        r = fsync_directory_of_file(fileno(f));
+        if (r < 0)
+                return r;
+
         return 0;
 }
 
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index ae034f5cdb1..37a5f1d6341 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -434,12 +434,13 @@ static int copy_file_with_version_check(const char *from, const char *to, bool f
 
         (void) copy_times(fd_from, fd_to);
 
-        r = fsync(fd_to);
-        if (r < 0) {
+        if (fsync(fd_to) < 0) {
                 (void) unlink_noerrno(t);
                 return log_error_errno(errno, "Failed to copy data from \"%s\" to \"%s\": %m", from, t);
         }
 
+        (void) fsync_directory_of_file(fd_to);
+
         r = renameat(AT_FDCWD, t, AT_FDCWD, to);
         if (r < 0) {
                 (void) unlink_noerrno(t);
diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
index 6900af9fb50..e924750d1b4 100644
--- a/src/coredump/coredump.c
+++ b/src/coredump/coredump.c
@@ -260,6 +260,8 @@ static int fix_permissions(
         if (fsync(fd) < 0)
                 return log_error_errno(errno, "Failed to sync coredump %s: %m", coredump_tmpfile_name(filename));
 
+        (void) fsync_directory_of_file(fd);
+
         r = link_tmpfile(fd, filename, target);
         if (r < 0)
                 return log_error_errno(r, "Failed to move coredump %s into place: %m", target);
diff --git a/src/libsystemd/sd-id128/id128-util.c b/src/libsystemd/sd-id128/id128-util.c
index a6e38578b16..8ce012e35fa 100644
--- a/src/libsystemd/sd-id128/id128-util.c
+++ b/src/libsystemd/sd-id128/id128-util.c
@@ -23,6 +23,7 @@
 #include <unistd.h>
 
 #include "fd-util.h"
+#include "fs-util.h"
 #include "hexdecoct.h"
 #include "id128-util.h"
 #include "io-util.h"
@@ -180,9 +181,13 @@ int id128_write_fd(int fd, Id128Format f, sd_id128_t id, bool do_sync) {
         if (do_sync) {
                 if (fsync(fd) < 0)
                         return -errno;
+
+                r = fsync_directory_of_file(fd);
+                if (r < 0)
+                        return r;
         }
 
-        return r;
+        return 0;
 }
 
 int id128_write(const char *p, Id128Format f, sd_id128_t id, bool do_sync) {