Changeset 204 for branches/samba-3.2.x/source/smbd/fileio.c

Timestamp:

May 20, 2009, 6:46:53 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.4

File:

• branches/samba-3.2.x/source/smbd/fileio.c (modified) (3 diffs)

branches/samba-3.2.x/source/smbd/fileio.c

@@ -177 +177 @@
                                       void *private_data)
 {
-       files_struct *fsp = (files_struct *)private_data;
-
-       /* Remove the timed event handler. */
-       TALLOC_FREE(fsp->update_write_time_event);
-       DEBUG(5, ("Update write time on %s\n", fsp->fsp_name));
-
-       /* change the write time if not already changed by someoneelse */
-       set_write_time_fsp(fsp, timespec_current(), false);
-}
+        files_struct *fsp = (files_struct *)private_data;
+
+        /* Remove the timed event handler. */
+        TALLOC_FREE(fsp->update_write_time_event);
+        DEBUG(5, ("Update write time on %s\n", fsp->fsp_name));
+
+        /* change the write time if not already changed by someone else */
+        update_write_time(fsp);
+}
+
+/*********************************************************
+ Schedule a write time update for WRITE_TIME_UPDATE_USEC_DELAY
+ in the future.
+*********************************************************/
 
 void trigger_write_time_update(struct files_struct *fsp)
@@ -192 +197 @@
 
         if (fsp->write_time_forced) {
+                /* No point - "sticky" write times
+                 * in effect.
+                 */
                 return;
         }
 
         if (fsp->update_write_time_triggered) {
+                /*
+                 * We only update the write time
+                 * on the first write. After that
+                 * no other writes affect this.
+                 */
                 return;
         }
@@ -211 +224 @@
                                 "update_write_time_handler",
                                 update_write_time_handler, fsp);
+}
+
+void trigger_write_time_update_immediate(struct files_struct *fsp)
+{
+        if (fsp->write_time_forced) {
+                /*
+                 * No point - "sticky" write times
+                 * in effect.
+                 */
+                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 = false;
+        update_write_time(fsp);
 }