verify: fix header verification version check

[fio.git] / mutex.c

diff --git a/mutex.c b/mutex.c
index 9ee3bd838cb1ae801b71f2604f94441264130343..7612b32ba26d89e06f55116f0dc236fef5ebfe70 100644 (file)
--- a/mutex.c
+++ b/mutex.c
@@ -18,10 +18,15 @@
 #include "fio_time.h"
 #include "gettime.h"
 
-void fio_mutex_remove(struct fio_mutex *mutex)
+void __fio_mutex_remove(struct fio_mutex *mutex)
 {
        assert(mutex->magic == FIO_MUTEX_MAGIC);
        pthread_cond_destroy(&mutex->cond);
+}
+
+void fio_mutex_remove(struct fio_mutex *mutex)
+{
+       __fio_mutex_remove(mutex);
        munmap((void *) mutex, sizeof(*mutex));
 }
 
@@ -87,7 +92,7 @@ struct fio_mutex *fio_mutex_init(int value)
        return NULL;
 }
 
-static int mutex_timed_out(struct timeval *t, unsigned int seconds)
+static bool mutex_timed_out(struct timeval *t, unsigned int seconds)
 {
        return mtime_since_now(t) >= seconds * 1000;
 }
@@ -128,16 +133,16 @@ int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int seconds)
        return ret;
 }
 
-int fio_mutex_down_trylock(struct fio_mutex *mutex)
+bool fio_mutex_down_trylock(struct fio_mutex *mutex)
 {
-       int ret = 1;
+       bool ret = true;
 
        assert(mutex->magic == FIO_MUTEX_MAGIC);
 
        pthread_mutex_lock(&mutex->lock);
        if (mutex->value) {
                mutex->value--;
-               ret = 0;
+               ret = false;
        }
        pthread_mutex_unlock(&mutex->lock);