summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2009-07-02 10:27:01 -0700
committerTim Prouty <tprouty@samba.org>2009-07-06 15:38:41 -0700
commit18a27a8df223ba8eb0faf6a64384acce174f3ace (patch)
treed57bbf2825951eb7b5a8883b0f2733bd1ce74958 /source3
parent99bd4fda0cd97eb211549a511a2ff6153c2bde2d (diff)
downloadsamba-18a27a8df223ba8eb0faf6a64384acce174f3ace.tar.gz
samba-18a27a8df223ba8eb0faf6a64384acce174f3ace.tar.bz2
samba-18a27a8df223ba8eb0faf6a64384acce174f3ace.zip
s3 sticky write time: Removed unused args and tighten up a function by making an arg const
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h7
-rw-r--r--source3/locking/locking.c3
-rw-r--r--source3/smbd/dosmode.c7
-rw-r--r--source3/smbd/trans2.c5
4 files changed, 11 insertions, 11 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 1e44823abc..6bd37efc57 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3474,7 +3474,8 @@ NTSTATUS can_set_delete_on_close(files_struct *fsp, bool delete_on_close,
void set_delete_on_close_token(struct share_mode_lock *lck, const UNIX_USER_TOKEN *tok);
void set_delete_on_close_lck(struct share_mode_lock *lck, bool delete_on_close, const UNIX_USER_TOKEN *tok);
bool set_delete_on_close(files_struct *fsp, bool delete_on_close, const UNIX_USER_TOKEN *tok);
-bool set_sticky_write_time(struct file_id fileid, struct timespec write_time);
+bool set_sticky_write_time(const struct file_id fileid,
+ struct timespec write_time);
bool set_write_time(struct file_id fileid, struct timespec write_time);
int share_mode_forall(void (*fn)(const struct share_mode_entry *, const char *,
const char *, void *),
@@ -6242,8 +6243,8 @@ int file_set_dosmode(connection_struct *conn, struct smb_filename *smb_fname,
uint32 dosmode, const char *parent_dir, bool newfile);
int file_ntimes(connection_struct *conn, const char *fname,
struct smb_file_time *ft, const SMB_STRUCT_STAT *psbuf);
-bool set_sticky_write_time_path(connection_struct *conn, const char *fname,
- struct file_id fileid, const struct timespec mtime);
+bool set_sticky_write_time_path(struct file_id fileid,
+ const struct timespec mtime);
bool set_sticky_write_time_fsp(struct files_struct *fsp, const struct timespec mtime);
bool update_write_time(struct files_struct *fsp);
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index dd735be88a..78064cfcf9 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -1415,7 +1415,8 @@ bool set_delete_on_close(files_struct *fsp, bool delete_on_close, const UNIX_USE
return True;
}
-bool set_sticky_write_time(struct file_id fileid, struct timespec write_time)
+bool set_sticky_write_time(const struct file_id fileid,
+ struct timespec write_time)
{
struct share_mode_lock *lck;
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 2006b75d52..97d788218d 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -791,8 +791,8 @@ int file_ntimes(connection_struct *conn, const char *fname,
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)
+bool set_sticky_write_time_path(const struct file_id fileid,
+ const struct timespec mtime)
{
if (null_timespec(mtime)) {
return true;
@@ -815,8 +815,7 @@ bool set_sticky_write_time_fsp(struct files_struct *fsp, const struct timespec m
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);
+ return set_sticky_write_time_path(fsp->file_id, mtime);
}
/******************************************************************
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 2c74c8f49e..e93d313821 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -5009,9 +5009,8 @@ NTSTATUS smb_set_file_time(connection_struct *conn,
set_sticky_write_time_fsp(fsp, ft->mtime);
}
} else {
- set_sticky_write_time_path(conn, fname,
- vfs_file_id_from_sbuf(conn, psbuf),
- ft->mtime);
+ set_sticky_write_time_path(
+ vfs_file_id_from_sbuf(conn, psbuf), ft->mtime);
}
}