Revert "fsync always now uses O_DIRECT on Linux"

This reverts commit 566c3c7a22c0ec217c40f7a95db2bb83c8cc16c7.

diff --git a/config.h b/config.h
index d1da9887dfc64930a72886c1cc5a4f029635296e..754d3aa86f7341c7dad02664b8d10f47d270598e 100644 (file)
--- a/config.h
+++ b/config.h
@@ -35,9 +35,4 @@
 #define HAVE_KQUEUE 1
 #endif
 
 #define HAVE_KQUEUE 1
 #endif
 

-/* test for O_DIRECT */
-#ifdef __linux__
-#define HAVE_O_DIRECT 1
-#endif
-

 #endif
 #endif

diff --git a/redis.c b/redis.c
index de4f5763d79acb07a0f00572d6d06ee2a9b77f84..53d5c215c7ba11488c1eeb110b357f7046f8485b 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -1673,16 +1673,7 @@ static void initServer() {
         acceptHandler, NULL) == AE_ERR) oom("creating file event");
 
     if (server.appendonly) {
         acceptHandler, NULL) == AE_ERR) oom("creating file event");
 
     if (server.appendonly) {

-        int flags = O_WRONLY|O_APPEND|O_CREAT;
-
-#ifdef HAVE_O_DIRECT
-        if (server.appendfsync == APPENDFSYNC_ALWAYS) {
-            flags |= O_DIRECT;
-            server.appendfsync = APPENDFSYNC_NO;
-        }
-#endif
-
-        server.appendfd = open(server.appendfilename,flags,0644);
+        server.appendfd = open(server.appendfilename,O_WRONLY|O_APPEND|O_CREAT,0644);

         if (server.appendfd == -1) {
             redisLog(REDIS_WARNING, "Can't open the append-only file: %s",
                 strerror(errno));
         if (server.appendfd == -1) {
             redisLog(REDIS_WARNING, "Can't open the append-only file: %s",
                 strerror(errno));