Changeset 204 for branches/samba-3.2.x/source/locking

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/locking/locking.c (modified) (3 diffs)

branches/samba-3.2.x/source/locking/locking.c

@@ -1410 +1410 @@
 }
 
-bool set_write_time(struct file_id fileid, struct timespec write_time,
-                    bool overwrite)
+bool set_sticky_write_time(struct file_id fileid, struct timespec write_time)
 {
         struct share_mode_lock *lck;
 
-        DEBUG(5,("set_write_time: %s overwrite=%d id=%s\n",
+        DEBUG(5,("set_sticky_write_time: %s id=%s\n",
                  timestring(debug_ctx(),
                             convert_timespec_to_time_t(write_time)),
-                 overwrite, file_id_string_tos(&fileid)));
+                 file_id_string_tos(&fileid)));
 
         lck = get_share_mode_lock(NULL, fileid, NULL, NULL, NULL);
@@ -1425 +1424 @@
         }
 
-        if (overwrite || null_timespec(lck->changed_write_time)) {
+        if (timespec_compare(&lck->changed_write_time, &write_time) != 0) {
                 lck->modified = True;
                 lck->changed_write_time = write_time;
@@ -1433 +1432 @@
         return True;
 }
+
+bool set_write_time(struct file_id fileid, struct timespec write_time)
+{
+        struct share_mode_lock *lck;
+
+        DEBUG(5,("set_write_time: %s id=%s\n",
+                 timestring(debug_ctx(),
+                            convert_timespec_to_time_t(write_time)),
+                 file_id_string_tos(&fileid)));
+
+        lck = get_share_mode_lock(NULL, fileid, NULL, NULL, NULL);
+        if (lck == NULL) {
+                return False;
+        }
+
+        if (timespec_compare(&lck->old_write_time, &write_time) != 0) {
+                lck->modified = True;
+                lck->old_write_time = write_time;
+        }
+
+        TALLOC_FREE(lck);
+        return True;
+}
+
 
 struct forall_state {