From 5954eadf6741e0b4cdab23c414d7a6b470cd06db Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed, 24 Feb 2010 12:16:50 +0000
Subject: [PATCH] * Remove the fdatasync check since it's no longer needed.

---
 configure.ac        | 1 -
 src/libutil/util.cc | 3 +--
 src/libutil/util.hh | 6 +-----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9d3d9f76eb..d5db92af33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -279,7 +279,6 @@ AC_CHECK_FUNCS([setresuid setreuid lchown])
 # Nice to have, but not essential.
 AC_CHECK_FUNCS([strsignal])
 AC_CHECK_FUNCS([posix_fallocate])
-AC_CHECK_FUNCS([fdatasync])
 
 
 # This is needed if ATerm or bzip2 are static libraries,
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index 8c52625a25..3f76be6708 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -227,13 +227,12 @@ string readFile(const Path & path)
 }
 
 
-void writeFile(const Path & path, const string & s, bool doFsync)
+void writeFile(const Path & path, const string & s)
 {
     AutoCloseFD fd = open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT, 0666);
     if (fd == -1)
         throw SysError(format("opening file `%1%'") % path);
     writeFull(fd, (unsigned char *) s.c_str(), s.size());
-    if (doFsync) fdatasync(fd);
 }
 
 
diff --git a/src/libutil/util.hh b/src/libutil/util.hh
index 90132da733..a3580b547d 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -12,10 +12,6 @@
 
 #include <cstdio>
 
-#ifndef HAVE_FDATASYNC
-#define fdatasync fsync
-#endif
-
 
 namespace nix {
 
@@ -66,7 +62,7 @@ string readFile(int fd);
 string readFile(const Path & path);
 
 /* Write a string to a file. */
-void writeFile(const Path & path, const string & s, bool doFsync = false);
+void writeFile(const Path & path, const string & s);
 
 /* Read a line from a file descriptor. */
 string readLine(int fd);