X-Git-Url: http://git.samba.org/samba.git/?p=tprouty%2Fsamba.git;a=blobdiff_plain;f=source%2Fsmbd%2Ffileio.c;h=095841825a5e34ef2132a15741e320fc7e796c07;hp=63850f24eba7234eb0b834b4a17664ea1dcb21ae;hb=ef6697435efba2afe15498caeb5daae7aea10604;hpb=359b252b72da0f60ff5c549c65b75aa32e0e9cbf

diff --git a/source/smbd/fileio.c b/source/smbd/fileio.c
index 63850f24eb..095841825a 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);
 }