summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-07-18 17:12:30 +0200
committerVolker Lendecke <vl@samba.org>2010-07-18 21:22:41 +0200
commit27aece72004a84a6e0b2e00987d8a362e307d1d8 (patch)
tree37b74b75d0edcfe28ce4d9898c0889a74b262492
parent1946beb679c7de75b142b30d84b5e4bf12c7e6bd (diff)
downloadsamba-27aece72004a84a6e0b2e00987d8a362e307d1d8.tar.gz
samba-27aece72004a84a6e0b2e00987d8a362e307d1d8.tar.bz2
samba-27aece72004a84a6e0b2e00987d8a362e307d1d8.zip
s3: Actually use the usecs in aio_fork_suspend
Jeremy, please check!
-rw-r--r--source3/modules/vfs_aio_fork.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index ff2b6ad9ff..02b1394216 100644
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -768,7 +768,8 @@ static int aio_fork_suspend(struct vfs_handle_struct *handle,
struct timeval tv = convert_timespec_to_timeval(*timeout);
struct tevent_timer *te = tevent_add_timer(ev,
frame,
- timeval_current_ofs(tv.tv_sec,0),
+ timeval_current_ofs(tv.tv_sec,
+ tv.tv_usec),
aio_fork_suspend_timed_out,
&timed_out);
if (!te) {