summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2010-09-07 03:29:19 +0200
committerBjörn Jacke <bj@sernet.de>2010-09-07 20:29:13 +0200
commitf69085e5ff525d534f66c6163aacb8c320a484bc (patch)
tree0007bb34730a116949a5c2f907728e1b9357ba4b /source3/smbd
parent8833adb04ffeb21848b56bb6606ca2982ccca1e4 (diff)
downloadsamba-f69085e5ff525d534f66c6163aacb8c320a484bc.tar.gz
samba-f69085e5ff525d534f66c6163aacb8c320a484bc.tar.bz2
samba-f69085e5ff525d534f66c6163aacb8c320a484bc.zip
s3: use monotonic clock for aio timeout
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/aio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/aio.c b/source3/smbd/aio.c
index 677fbb6764..7a23d37918 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,