smbd: Inline set_sticky_write_time_path into set_sticky_write_time_fsp

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jennifer Sutton <jsutton@samba.org>

diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index c5eeb68f2c6ebf688451b8f294dd8ee9ec391438..32de2a4a0182181a07166c01c2a51b0e1e00ffdd 100644 (file)
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -1244,24 +1244,6 @@ done:
        return ret;
 }
 
-/******************************************************************
- 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(struct file_id fileid, struct timespec mtime)
-{
-       if (is_omit_timespec(&mtime)) {
-               return true;
-       }
-
-       if (!set_sticky_write_time(fileid, mtime)) {
-               return false;
-       }
-
-       return true;
-}
-
 /******************************************************************
  Force a "sticky" write time on an fsp. This will always be
  returned on all future write time queries and set on close.
@@ -1269,6 +1251,8 @@ bool set_sticky_write_time_path(struct file_id fileid, struct timespec mtime)
 
 bool set_sticky_write_time_fsp(struct files_struct *fsp, struct timespec mtime)
 {
+       bool ok;
+
        if (is_omit_timespec(&mtime)) {
                return true;
        }
@@ -1276,7 +1260,8 @@ bool set_sticky_write_time_fsp(struct files_struct *fsp, struct timespec mtime)
        fsp->fsp_flags.write_time_forced = true;
        TALLOC_FREE(fsp->update_write_time_event);
 
-       return set_sticky_write_time_path(fsp->file_id, mtime);
+       ok = set_sticky_write_time(fsp->file_id, mtime);
+       return ok;
 }
 
 /******************************************************************

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 429d8875f0a90cc8e1b9b0e0b1b30a8fabb3edc0..93c3dcff07ad394e88ec8c3a3b1fa7d28b65bca4 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -216,7 +216,6 @@ NTSTATUS file_set_sparse(connection_struct *conn,
 int file_ntimes(connection_struct *conn,
                files_struct *fsp,
                struct smb_file_time *ft);
-bool set_sticky_write_time_path(struct file_id fileid, struct timespec mtime);
 bool set_sticky_write_time_fsp(struct files_struct *fsp,
                               struct timespec mtime);