From: Björn Jacke <bj@sernet.de>
Date: Tue, 7 Sep 2010 01:29:19 +0000 (+0200)
Subject: s3: use monotonic clock for aio timeout
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=f69085e5ff525d534f66c6163aacb8c320a484bc;p=obnox%2Fsamba%2Fsamba-obnox.git

s3: use monotonic clock for aio timeout
---

diff --git a/source3/smbd/aio.c b/source3/smbd/aio.c
index 677fbb6764c..7a23d379181 100644
--- a/source3/smbd/aio.c
+++ b/source3/smbd/aio.c
@@ -900,7 +900,7 @@ int wait_for_aio_completion(files_struct *fsp)
 	struct aio_extra *aio_ex;
 	const SMB_STRUCT_AIOCB **aiocb_list;
 	int aio_completion_count = 0;
-	time_t start_time = time(NULL);
+	time_t start_time = time_mono(NULL);
 	int seconds_left;
 
 	for (seconds_left = SMB_TIME_FOR_AIO_COMPLETE_WAIT;
@@ -975,7 +975,7 @@ int wait_for_aio_completion(files_struct *fsp)
 
 		SAFE_FREE(aiocb_list);
 		seconds_left = SMB_TIME_FOR_AIO_COMPLETE_WAIT
-			- (time(NULL) - start_time);
+			- (time_mono(NULL) - start_time);
 	}
 
 	/* We timed out - we don't know why. Return ret if already an error,