diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-09-08 15:12:24 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-09-09 12:14:04 +0200 |
| commit | ef6697435efba2afe15498caeb5daae7aea10604 (patch) | |
| tree | 304990766f169324e7ec5f0a3af45dcb0536a85d | |
| parent | db306bfee30437d2858788ea783ccb5acabd1ffa (diff) | |
| download | samba-ef6697435efba2afe15498caeb5daae7aea10604.tar.gz | |
smbd: some write time fixes
- only the first non truncating write causes
the write time update with 2 seconds delay.
It's not enough to check for an existing update event
as it will be NULL after the event was triggered.
- SMBwrite truncates always update the write time
unless the sticky write time is set.
- SMBwrite truncates don't trigger a write time update on close.
metze
(cherry picked from commit 142a9703ae19a467a23ee72429f899dae156df64)
| -rw-r--r-- | source/include/smb.h | 1 | ||||
| -rw-r--r-- | source/smbd/fileio.c | 15 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/include/smb.h b/source/include/smb.h index 5194c7303c2..3c7058fc29d 100644 --- a/source/include/smb.h +++ b/source/include/smb.h @@ -487,6 +487,7 @@ typedef struct files_struct { uint32 access_mask; /* NTCreateX access bits (FILE_READ_DATA etc.) */ uint32 share_access; /* NTCreateX share constants (FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE). */ + bool update_write_time_triggered; struct timed_event *update_write_time_event; bool update_write_time_on_close; struct timespec close_write_time; diff --git a/source/smbd/fileio.c b/source/smbd/fileio.c index 63850f24eba..095841825a5 100644 --- a/source/smbd/fileio.c +++ b/source/smbd/fileio.c @@ -202,12 +202,13 @@ void trigger_write_time_update(struct files_struct *fsp) return; } - if (fsp->update_write_time_event) { + if (fsp->update_write_time_triggered) { /* * No point - an event is already scheduled. */ return; } + fsp->update_write_time_triggered = true; delay = lp_parm_int(SNUM(fsp->conn), "smbd", "writetimeupdatedelay", @@ -232,14 +233,12 @@ void trigger_write_time_update_immediate(struct files_struct *fsp) return; } - if (fsp->update_write_time_event) { - /* - * No point - an event is already scheduled. - */ - return; - } + TALLOC_FREE(fsp->update_write_time_event); + DEBUG(5, ("Update write time immediate on %s\n", fsp->fsp_name)); + + fsp->update_write_time_triggered = true; - fsp->update_write_time_on_close = true; + fsp->update_write_time_on_close = false; update_write_time(fsp); } |