summaryrefslogtreecommitdiff
path: root/source3/smbd/fileio.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-01-05 18:01:04 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-01-05 18:01:04 +0100
commit37e6849d451c4f49c6a0c96a78a5ef81baab83d4 (patch)
treed1e443f66fa367340ef04d39349e50e7100b9b5f /source3/smbd/fileio.c
parentde7dc2cec059305d28cc75a5347bfd88f3cb5c95 (diff)
parent0581094023ba5e561184a2ea57f6e905161de978 (diff)
downloadsamba-37e6849d451c4f49c6a0c96a78a5ef81baab83d4.tar.gz
samba-37e6849d451c4f49c6a0c96a78a5ef81baab83d4.tar.bz2
samba-37e6849d451c4f49c6a0c96a78a5ef81baab83d4.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/smbd/fileio.c')
-rw-r--r--source3/smbd/fileio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index e67f926a04..30253d4466 100644
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -173,7 +173,7 @@ static int wcp_file_size_change(files_struct *fsp)
static void update_write_time_handler(struct event_context *ctx,
struct timed_event *te,
- const struct timeval *now,
+ struct timeval now,
void *private_data)
{
files_struct *fsp = (files_struct *)private_data;
@@ -221,7 +221,6 @@ void trigger_write_time_update(struct files_struct *fsp)
fsp->update_write_time_event =
event_add_timed(smbd_event_context(), NULL,
timeval_current_ofs(0, delay),
- "update_write_time_handler",
update_write_time_handler, fsp);
}