From c9b654f5810f46b20e082895499c0bf2a3077173 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 6 Jul 2010 22:43:14 +0200 Subject: s3: Remove smbd_messaging_context() from send_stat_cache_delete_message() --- source3/include/proto.h | 3 ++- source3/lib/dummysmbd.c | 3 ++- source3/locking/locking.c | 3 ++- source3/smbd/close.c | 3 ++- source3/smbd/statcache.c | 5 +++-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/source3/include/proto.h b/source3/include/proto.h index 7e56f7db22..060776fa62 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5838,7 +5838,8 @@ bool stat_cache_lookup(connection_struct *conn, char **pp_dirpath, char **pp_start, SMB_STRUCT_STAT *pst); -void send_stat_cache_delete_message(const char *name); +void send_stat_cache_delete_message(struct messaging_context *msg_ctx, + const char *name); void stat_cache_delete(const char *name); unsigned int fast_string_hash(TDB_DATA *key); bool reset_stat_cache( void ); diff --git a/source3/lib/dummysmbd.c b/source3/lib/dummysmbd.c index 01a5563306..c79e080882 100644 --- a/source3/lib/dummysmbd.c +++ b/source3/lib/dummysmbd.c @@ -44,7 +44,8 @@ void cancel_pending_lock_requests_by_fid(files_struct *fsp, { } -void send_stat_cache_delete_message(const char *name) +void send_stat_cache_delete_message(struct messaging_context *msg_ctx, + const char *name) { } diff --git a/source3/locking/locking.c b/source3/locking/locking.c index a9b13d61a1..24998ab588 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -1457,7 +1457,8 @@ bool set_delete_on_close(files_struct *fsp, bool delete_on_close, const UNIX_USE if (fsp->is_directory) { SMB_ASSERT(!is_ntfs_stream_smb_fname(fsp->fsp_name)); - send_stat_cache_delete_message(fsp->fsp_name->base_name); + send_stat_cache_delete_message(fsp->conn->sconn->msg_ctx, + fsp->fsp_name->base_name); } TALLOC_FREE(lck); diff --git a/source3/smbd/close.c b/source3/smbd/close.c index fb0e20647e..fad9601491 100644 --- a/source3/smbd/close.c +++ b/source3/smbd/close.c @@ -961,7 +961,8 @@ static NTSTATUS close_directory(struct smb_request *req, files_struct *fsp, become_user(fsp->conn, fsp->vuid); became_user = True; } - send_stat_cache_delete_message(fsp->fsp_name->base_name); + send_stat_cache_delete_message(fsp->conn->sconn->msg_ctx, + fsp->fsp_name->base_name); set_delete_on_close_lck(lck, True, get_current_utok(fsp->conn)); fsp->delete_on_close = true; if (became_user) { diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c index 88cb97e6a6..cea27d442c 100644 --- a/source3/smbd/statcache.c +++ b/source3/smbd/statcache.c @@ -336,10 +336,11 @@ bool stat_cache_lookup(connection_struct *conn, Tell all smbd's to delete an entry. **************************************************************************/ -void send_stat_cache_delete_message(const char *name) +void send_stat_cache_delete_message(struct messaging_context *msg_ctx, + const char *name) { #ifdef DEVELOPER - message_send_all(smbd_messaging_context(), + message_send_all(msg_ctx, MSG_SMB_STAT_CACHE_DELETE, name, strlen(name)+1, -- cgit