Changeset 204 for branches/samba-3.2.x/source/smbd/dosmode.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/dosmode.c (modified) (2 diffs)

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

@@ -632 +632 @@
 }
 
-/*******************************************************************
- Change a filetime - possibly allowing DOS semantics.
-*******************************************************************/
-
-bool set_write_time_path(connection_struct *conn, const char *fname,
-                         struct file_id fileid, const struct timespec mtime,
-                         bool overwrite)
+/******************************************************************
+ Force a "sticky" write time on a pathname. This will always be
+ returned on all future write time queries and set on close.
+******************************************************************/
+
+bool set_sticky_write_time_path(connection_struct *conn, const char *fname,
+                         struct file_id fileid, const struct timespec mtime)
 {
         if (null_timespec(mtime)) {
@@ -644 +644 @@
         }
 
-        if (!set_write_time(fileid, mtime, overwrite)) {
+        if (!set_sticky_write_time(fileid, mtime)) {
                 return false;
         }
 
-        /* in the overwrite case the caller should trigger the notify */
-        if (!overwrite) {
-                notify_fname(conn, NOTIFY_ACTION_MODIFIED,
-                             FILE_NOTIFY_CHANGE_LAST_WRITE, fname);
-        }
-
         return true;
 }
 
-bool set_write_time_fsp(struct files_struct *fsp, const struct timespec mtime,
-                        bool overwrite)
-{
-        if (overwrite) {
-                fsp->write_time_forced = true;
-                TALLOC_FREE(fsp->update_write_time_event);
-        }
-
-        return set_write_time_path(fsp->conn, fsp->fsp_name, fsp->file_id,
-                                   mtime, overwrite);
-}
+/******************************************************************
+ Force a "sticky" write time on an fsp. This will always be
+ returned on all future write time queries and set on close.
+******************************************************************/
+
+bool set_sticky_write_time_fsp(struct files_struct *fsp, const struct timespec mtime)
+{
+        fsp->write_time_forced = true;
+        TALLOC_FREE(fsp->update_write_time_event);
+
+        return set_sticky_write_time_path(fsp->conn, fsp->fsp_name,
+                        fsp->file_id, mtime);
+}
+
+/******************************************************************
+ Update a write time immediately, without the 2 second delay.
+******************************************************************/
+
+bool update_write_time(struct files_struct *fsp)
+{
+        if (!set_write_time(fsp->file_id, timespec_current())) {
+                return false;
+        }
+
+        notify_fname(fsp->conn, NOTIFY_ACTION_MODIFIED,
+                        FILE_NOTIFY_CHANGE_LAST_WRITE, fsp->fsp_name);
+
+        return true;
+}