summaryrefslogtreecommitdiff
path: root/source3/locking
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/locking
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/locking')
-rw-r--r--source3/locking/locking.c2
-rw-r--r--source3/locking/proto.h2
-rw-r--r--source3/locking/share_mode_lock.c2
3 files changed, 3 insertions, 3 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,