summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2010-09-10 20:46:10 +0200
committerBjörn Jacke <bj@sernet.de>2010-09-10 23:10:26 +0200
commit3eda2815f648fdb688f9bace4c45870c7a427dfc (patch)
treed73f45f4e43842b6d9af439f8d56eef8c634a69a
parentd320aa1212ba926f81d37ee0690381f1f287f30d (diff)
downloadsamba-3eda2815f648fdb688f9bace4c45870c7a427dfc.tar.gz
samba-3eda2815f648fdb688f9bace4c45870c7a427dfc.tar.bz2
samba-3eda2815f648fdb688f9bace4c45870c7a427dfc.zip
s4/pvfs: use monotonic time for this timeout
-rw-r--r--source4/ntvfs/posix/pvfs_search.c6
-rw-r--r--source4/ntvfs/posix/vfs_posix.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/ntvfs/posix/pvfs_search.c b/source4/ntvfs/posix/pvfs_search.c
index e6b53ee623..a050de1ec3 100644
--- a/source4/ntvfs/posix/pvfs_search.c
+++ b/source4/ntvfs/posix/pvfs_search.c
@@ -291,7 +291,7 @@ static NTSTATUS pvfs_search_fill(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx,
static void pvfs_search_cleanup(struct pvfs_state *pvfs)
{
int i;
- time_t t = time(NULL);
+ time_t t = time_mono(NULL);
for (i=0;i<MAX_OLD_SEARCHES;i++) {
struct pvfs_search_state *search;
@@ -379,7 +379,7 @@ static NTSTATUS pvfs_search_first_old(struct ntvfs_module_context *ntvfs,
search->current_index = 0;
search->search_attrib = search_attrib & 0xFF;
search->must_attrib = (search_attrib>>8) & 0xFF;
- search->last_used = time(NULL);
+ search->last_used = time_mono(NULL);
search->te = NULL;
DLIST_ADD(pvfs->search.list, search);
@@ -437,7 +437,7 @@ static NTSTATUS pvfs_search_next_old(struct ntvfs_module_context *ntvfs,
if (!NT_STATUS_IS_OK(status)) {
return status;
}
- search->last_used = time(NULL);
+ search->last_used = time_mono(NULL);
status = pvfs_search_fill(pvfs, req, max_count, search, io->generic.data_level,
&reply_count, search_private, callback);
diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h
index 70e4c90d7a..d60369df50 100644
--- a/source4/ntvfs/posix/vfs_posix.h
+++ b/source4/ntvfs/posix/vfs_posix.h
@@ -224,7 +224,7 @@ struct pvfs_search_state {
uint16_t search_attrib;
uint16_t must_attrib;
struct pvfs_dir *dir;
- time_t last_used;
+ time_t last_used; /* monotonic clock time */
unsigned int num_ea_names;
struct ea_name *ea_names;
struct tevent_timer *te;