Merge remote-tracking branch 'origin/unstable' into unstable

[redis.git] / src / bio.c

diff --git a/src/bio.c b/src/bio.c
index 9199bf23ac57be02ec684dd4b3d4b7d372d1fb29..eaac8e40d55663caf3fbacf4212a01247ba26972 100644 (file)
--- a/src/bio.c
+++ b/src/bio.c
@@ -130,7 +130,7 @@ void *bioProcessBackgroundJobs(void *arg) {
         if (type == REDIS_BIO_CLOSE_FILE) {
             close((long)job->arg1);
         } else if (type == REDIS_BIO_AOF_FSYNC) {
-            fsync((long)job->arg1);
+            aof_fsync((long)job->arg1);
         } else {
             redisPanic("Wrong job type in bioProcessBackgroundJobs().");
         }
@@ -153,6 +153,11 @@ unsigned long long bioPendingJobsOfType(int type) {
     return val;
 }
 
+#if 0 /* We don't use the following code for now, and bioWaitPendingJobsLE
+         probably needs a rewrite using conditional variables instead of the
+         current implementation. */
+         
+
 /* Wait until the number of pending jobs of the specified type are
  * less or equal to the specified number.
  *
@@ -200,3 +205,4 @@ time_t bioOlderJobOfType(int type) {
     return time;
 }
 
+#endif