diff options
| author | Volker Lendecke <vl@samba.org> | 2012-02-19 14:23:56 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2012-02-19 17:44:26 +0100 |
| commit | e5c84840737692b6c445e4ed316d869f6d0394bf (patch) | |
| tree | 8f891a860d0736a0686b1e76cc13cb36db4bf8e1 /source3/locking | |
| parent | da84242f5b91858b0df9ace9c565dd2a53d4998a (diff) | |
| download | samba-e5c84840737692b6c445e4ed316d869f6d0394bf.tar.gz samba-e5c84840737692b6c445e4ed316d869f6d0394bf.tar.bz2 samba-e5c84840737692b6c445e4ed316d869f6d0394bf.zip | |
s3: get_share_mode_lock->get_existing_share_mode_lock
Diffstat (limited to 'source3/locking')
| -rw-r--r-- | source3/locking/locking.c | 10 | ||||
| -rw-r--r-- | source3/locking/proto.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 7063b54d9c..385db18b95 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -453,8 +453,8 @@ char *share_mode_str(TALLOC_CTX *ctx, int num, const struct share_mode_entry *e) counts it internally to allow for nested lock fetches. ********************************************************************/ -struct share_mode_lock *get_share_mode_lock(TALLOC_CTX *mem_ctx, - const struct file_id id) +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); } @@ -953,7 +953,7 @@ bool set_delete_on_close(files_struct *fsp, bool delete_on_close, const struct s delete_on_close ? "Adding" : "Removing", fsp->fnum, fsp_str_dbg(fsp))); - lck = get_share_mode_lock(talloc_tos(), fsp->file_id); + lck = get_existing_share_mode_lock(talloc_tos(), fsp->file_id); if (lck == NULL) { return False; } @@ -1006,7 +1006,7 @@ bool set_sticky_write_time(struct file_id fileid, struct timespec write_time) convert_timespec_to_time_t(write_time)), file_id_string_tos(&fileid))); - lck = get_share_mode_lock(talloc_tos(), fileid); + lck = get_existing_share_mode_lock(talloc_tos(), fileid); if (lck == NULL) { return False; } @@ -1029,7 +1029,7 @@ bool set_write_time(struct file_id fileid, struct timespec write_time) convert_timespec_to_time_t(write_time)), file_id_string_tos(&fileid))); - lck = get_share_mode_lock(talloc_tos(), fileid); + lck = get_existing_share_mode_lock(talloc_tos(), fileid); if (lck == NULL) { return False; } diff --git a/source3/locking/proto.h b/source3/locking/proto.h index 25f3d196b8..1aa1d5035a 100644 --- a/source3/locking/proto.h +++ b/source3/locking/proto.h @@ -146,8 +146,8 @@ bool locking_init(void); bool locking_init_readonly(void); bool locking_end(void); char *share_mode_str(TALLOC_CTX *ctx, int num, const struct share_mode_entry *e); -struct share_mode_lock *get_share_mode_lock(TALLOC_CTX *mem_ctx, - const struct file_id id); +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( TALLOC_CTX *mem_ctx, const struct file_id id, |