From: Jens Axboe <jens.axboe@oracle.com>
Date: Wed, 7 Oct 2009 20:02:15 +0000 (+0200)
Subject: Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
X-Git-Tag: fio-1.34.2~2
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=9c965f3a2ec2e188606946c2f096a0ec2cc07a5f;hp=666bf1234912c3790ff1e6204596891c6ef7180c

Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
---

diff --git a/mutex.c b/mutex.c
index ab7dc704..34b3324c 100644
--- 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);