Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
authorJens Axboe <jens.axboe@oracle.com>
Wed, 7 Oct 2009 20:02:15 +0000 (22:02 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Wed, 7 Oct 2009 20:02:15 +0000 (22:02 +0200)
mutex.c

diff --git a/mutex.c b/mutex.c
index ab7dc7044aa8c8e2f549da7a5e089e9e71322717..34b3324ca7d395f49e1579390ba2f60322dd2ba1 100644 (file)
--- a/mutex.c
+++ b/mutex.c
@@ -95,7 +95,7 @@ int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int seconds)
        struct timespec t;
        int ret = 0;
 
-       clock_gettime(CLOCK_REALTIME, &t);
+       clock_gettime(CLOCK_MONOTONIC, &t);
        t.tv_sec += seconds;
 
        pthread_mutex_lock(&mutex->lock);