s3: only include smb profiling where needed.

[nivanova/samba-autobuild/.git] / source3 / smbd / statcache.c

diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index da52cc05d4e0f0dab797afd063f0f33cb85c6a90..5c74b928550312956dd1ed61318d8c95b033d7bd 100644 (file)
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -21,6 +21,10 @@
 */
 
 #include "includes.h"
+#include "memcache.h"
+#include "smbd/smbd.h"
+#include "messages.h"
+#include "smbprofile.h"
 
 /****************************************************************************
  Stat cache code used in unix_convert.
@@ -175,8 +179,7 @@ bool stat_cache_lookup(connection_struct *conn,
        DATA_BLOB data_val;
        char *name;
        TALLOC_CTX *ctx = talloc_tos();
-       struct smb_filename *smb_fname = NULL;
-       NTSTATUS status;
+       struct smb_filename smb_fname;
 
        *pp_dirpath = NULL;
        *pp_start = *pp_name;
@@ -276,25 +279,18 @@ bool stat_cache_lookup(connection_struct *conn,
                  "-> [%s]\n", chk_name, translated_path ));
        DO_PROFILE_INC(statcache_hits);
 
-       status = create_synthetic_smb_fname(talloc_tos(), translated_path,
-                                           NULL, NULL, &smb_fname);
-       if (!NT_STATUS_IS_OK(status)) {
-               TALLOC_FREE(chk_name);
-               TALLOC_FREE(translated_path);
-               return false;
-       }
+       ZERO_STRUCT(smb_fname);
+       smb_fname.base_name = translated_path;
 
-       if (SMB_VFS_STAT(conn, smb_fname) != 0) {
+       if (SMB_VFS_STAT(conn, &smb_fname) != 0) {
                /* Discard this entry - it doesn't exist in the filesystem. */
                memcache_delete(smbd_memcache(), STAT_CACHE,
                                data_blob_const(chk_name, strlen(chk_name)));
                TALLOC_FREE(chk_name);
                TALLOC_FREE(translated_path);
-               TALLOC_FREE(smb_fname);
                return False;
        }
-       *pst = smb_fname->st;
-       TALLOC_FREE(smb_fname);
+       *pst = smb_fname.st;
 
        if (!sizechanged) {
                memcpy(*pp_name, translated_path,
@@ -343,10 +339,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,