diff options
| -rw-r--r-- | source3/locking/locking.c | 2 | ||||
| -rw-r--r-- | source3/locking/proto.h | 2 | ||||
| -rw-r--r-- | source3/locking/share_mode_lock.c | 2 | ||||
| -rw-r--r-- | source3/smbd/open.c | 18 |
4 files changed, 12 insertions, 12 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 385db18b95..149a79d27a 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -456,7 +456,7 @@ char *share_mode_str(TALLOC_CTX *ctx, int num, const struct share_mode_entry *e) struct share_mode_lock *get_existing_share_mode_lock(TALLOC_CTX *mem_ctx, const struct file_id id) { - return get_share_mode_lock_fresh(mem_ctx, id, NULL, NULL, NULL); + return get_share_mode_lock(mem_ctx, id, NULL, NULL, NULL); } /******************************************************************* diff --git a/source3/locking/proto.h b/source3/locking/proto.h index 1aa1d5035a..3a6df37e93 100644 --- a/source3/locking/proto.h +++ b/source3/locking/proto.h @@ -148,7 +148,7 @@ bool locking_end(void); char *share_mode_str(TALLOC_CTX *ctx, int num, const struct share_mode_entry *e); struct share_mode_lock *get_existing_share_mode_lock(TALLOC_CTX *mem_ctx, const struct file_id id); -struct share_mode_lock *get_share_mode_lock_fresh( +struct share_mode_lock *get_share_mode_lock( TALLOC_CTX *mem_ctx, const struct file_id id, const char *servicepath, diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c index 6bc055f70f..2152591ed2 100644 --- a/source3/locking/share_mode_lock.c +++ b/source3/locking/share_mode_lock.c @@ -388,7 +388,7 @@ static int the_lock_destructor(struct share_mode_lock *l) Get a share_mode_lock, Reference counted to allow nexted calls. ********************************************************************/ -struct share_mode_lock *get_share_mode_lock_fresh( +struct share_mode_lock *get_share_mode_lock( TALLOC_CTX *mem_ctx, const struct file_id id, const char *servicepath, diff --git a/source3/smbd/open.c b/source3/smbd/open.c index ed3ef90f16..e9637c8ce9 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -1949,9 +1949,9 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, struct timespec old_write_time = smb_fname->st.st_ex_mtime; id = vfs_file_id_from_sbuf(conn, &smb_fname->st); - lck = get_share_mode_lock_fresh(talloc_tos(), id, - conn->connectpath, - smb_fname, &old_write_time); + lck = get_share_mode_lock(talloc_tos(), id, + conn->connectpath, + smb_fname, &old_write_time); if (lck == NULL) { DEBUG(0, ("Could not get share mode lock\n")); return NT_STATUS_SHARING_VIOLATION; @@ -2191,9 +2191,9 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, id = fsp->file_id; - lck = get_share_mode_lock_fresh(talloc_tos(), id, - conn->connectpath, - smb_fname, &old_write_time); + lck = get_share_mode_lock(talloc_tos(), id, + conn->connectpath, + smb_fname, &old_write_time); if (lck == NULL) { DEBUG(0, ("open_file_ntcreate: Could not get share " @@ -2878,9 +2878,9 @@ static NTSTATUS open_directory(connection_struct *conn, return NT_STATUS_ACCESS_DENIED; } - lck = get_share_mode_lock_fresh(talloc_tos(), fsp->file_id, - conn->connectpath, smb_dname, - &mtimespec); + lck = get_share_mode_lock(talloc_tos(), fsp->file_id, + conn->connectpath, smb_dname, + &mtimespec); if (lck == NULL) { DEBUG(0, ("open_directory: Could not get share mode lock for " |