From 9cf6d735d43f6f905b19f52d38c93aa30092333d Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 9 Jan 2012 14:30:53 +0100 Subject: s3: Introduce get_share_mode_lock_fresh() This slightly simplifies the code path for all callers which assume that a share mode exists already. Only the callers in open_file_ntcreate and open_directory will ever create new share modes. Signed-off-by: Jeremy Allison --- source3/locking/proto.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'source3/locking/proto.h') diff --git a/source3/locking/proto.h b/source3/locking/proto.h index d6f1c1bf4a..25f3d196b8 100644 --- a/source3/locking/proto.h +++ b/source3/locking/proto.h @@ -147,10 +147,13 @@ 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, - const char *servicepath, - const struct smb_filename *smb_fname, - const struct timespec *old_write_time); + const struct file_id id); +struct share_mode_lock *get_share_mode_lock_fresh( + TALLOC_CTX *mem_ctx, + const struct file_id id, + const char *servicepath, + const struct smb_filename *smb_fname, + const struct timespec *old_write_time); struct share_mode_lock *fetch_share_mode_unlocked(TALLOC_CTX *mem_ctx, const struct file_id id); bool rename_share_filename(struct messaging_context *msg_ctx, -- cgit