Revert "HACK w2k behaviour"

This reverts commit 8d751a927ea95c7b9d1ae013237cdb1a049b7d1a.

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index efc9a99cdaf39b05fec79796678e7036fb4da382..4f3db69489640486fefe5e0200e81f12b0322fb5 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -334,8 +334,6 @@ typedef struct files_struct {
        bool kernel_share_modes_taken;
 
        bool update_write_time_triggered;
-       uint64_t num_write_time_updates;
-       bool got_query_path_info;
        struct tevent_timer *update_write_time_event;
        bool update_write_time_on_close;
        struct timespec close_write_time;

diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index 9448ebe5d08c7962352e9257ad4792867c518912..d83efde6abb086eb9d58286dcf45a10e69c53936 100644 (file)
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -178,10 +178,8 @@ void fsp_flush_write_time_update(struct files_struct *fsp)
 
        /* Remove the timed event handler. */
        TALLOC_FREE(fsp->update_write_time_event);
-       if (!fsp->got_query_path_info) {
        fsp->update_write_time_triggered = false;
        fsp->update_write_time_on_close = false;
-       }
 }
 
 static void update_write_time_handler(struct tevent_context *ctx,
@@ -228,7 +226,6 @@ void trigger_write_time_update(struct files_struct *fsp)
                return;
        }
        fsp->update_write_time_triggered = true;
-       fsp->num_write_time_updates++;
 
        delay = lp_parm_int(SNUM(fsp->conn),
                            "smbd", "writetimeupdatedelay",
@@ -365,12 +362,6 @@ void msg_file_got_pathinfo(struct messaging_context *msg,
                        continue;
                }
 
-               fsp->got_query_path_info = true;
-
-               if (fsp->num_write_time_updates == 1) {
-                       continue;
-               }
-
                /*
                 * We cancel the timer, which means the write time update
                 * will happen on close.