summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-02-19 14:27:49 +0100
committerVolker Lendecke <vl@samba.org>2012-02-19 19:16:41 +0100
commitf217faef1a7d55f24265181889df36bf868d7abd (patch)
tree22884efa5d10ef26b12f13bdcc1f4d489e8c2fc9 /source3/smbd
parente5c84840737692b6c445e4ed316d869f6d0394bf (diff)
downloadsamba-f217faef1a7d55f24265181889df36bf868d7abd.tar.gz
samba-f217faef1a7d55f24265181889df36bf868d7abd.tar.bz2
samba-f217faef1a7d55f24265181889df36bf868d7abd.zip
s3: get_share_mode_lock_fresh->get_share_mode_lock
get_share_mode_lock_fresh is just a confusing name Autobuild-User: Volker Lendecke <vl@samba.org> Autobuild-Date: Sun Feb 19 19:16:41 CET 2012 on sn-devel-104
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/open.c18
1 files changed, 9 insertions, 9 deletions
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 "