vfs_time_audit: remove init_search_op implementation
[nivanova/samba-autobuild/.git] / source3 / modules / vfs_time_audit.c
index 25332e4e0382da008bb93ab2f8e4a14f484a9d30..8e08a7be095d03a740c739301ece60dcf9bc20a6 100644 (file)
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "ntioctl.h"
+#include "lib/util/tevent_unix.h"
+#include "lib/util/tevent_ntstatus.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
 
 static double audit_timeout;
 
-static void smb_time_audit_log(const char *syscallname, double elapsed)
+static void smb_time_audit_log_msg(const char *syscallname, double elapsed,
+                                   const char *msg)
 {
-       DEBUG(0, ("WARNING: System call \"%s\" took unexpectedly long "
-                 "(%.2f seconds) -- Validate that file and storage "
+       DEBUG(0, ("WARNING: VFS call \"%s\" took unexpectedly long "
+                 "(%.2f seconds) %s%s-- Validate that file and storage "
                  "subsystems are operating normally\n", syscallname,
-                 elapsed));
+                 elapsed, (msg != NULL) ? msg : "",
+                 (msg != NULL) ? " " : ""));
+}
+
+static void smb_time_audit_log(const char *syscallname, double elapsed)
+{
+       smb_time_audit_log_msg(syscallname, elapsed, NULL);
+}
+
+static void smb_time_audit_log_fsp(const char *syscallname, double elapsed,
+                                  const struct files_struct *fsp)
+{
+       char *base_name = NULL;
+       char *connectpath = NULL;
+       char *msg = NULL;
+
+       if (fsp == NULL) {
+               smb_time_audit_log(syscallname, elapsed);
+               return;
+       }
+       if (fsp->conn)
+               connectpath = fsp->conn->connectpath;
+       if (fsp->fsp_name)
+               base_name = fsp->fsp_name->base_name;
+
+       if (connectpath != NULL && base_name != NULL) {
+               msg = talloc_asprintf(talloc_tos(), "filename = \"%s/%s\"",
+                                     connectpath, base_name);
+       } else if (connectpath != NULL && base_name == NULL) {
+               msg = talloc_asprintf(talloc_tos(), "connectpath = \"%s\", "
+                                     "base_name = <NULL>",
+                                     connectpath);
+       } else if (connectpath == NULL && base_name != NULL) {
+               msg = talloc_asprintf(talloc_tos(), "connectpath = <NULL>, "
+                                     "base_name = \"%s\"",
+                                     base_name);
+       } else { /* connectpath == NULL && base_name == NULL */
+               msg = talloc_asprintf(talloc_tos(), "connectpath = <NULL>, "
+                                     "base_name = <NULL>");
+       }
+       smb_time_audit_log_msg(syscallname, elapsed, msg);
+       TALLOC_FREE(msg);
+}
+
+static void smb_time_audit_log_fname(const char *syscallname, double elapsed,
+                                   const char *fname)
+{
+       char cwd[PATH_MAX];
+       char *msg = NULL;
+
+       if (getcwd(cwd, sizeof(cwd)) == NULL) {
+               snprintf(cwd, sizeof(cwd), "<getcwd() error %d>", errno);
+       }
+       if (fname != NULL) {
+               msg = talloc_asprintf(talloc_tos(),
+                                     "cwd = \"%s\", filename = \"%s\"",
+                                     cwd, fname);
+       } else {
+               msg = talloc_asprintf(talloc_tos(),
+                                     "cwd = \"%s\", filename = <NULL>",
+                                     cwd);
+       }
+       smb_time_audit_log_msg(syscallname, elapsed, msg);
+       TALLOC_FREE(msg);
+}
+
+static void smb_time_audit_log_smb_fname(const char *syscallname, double elapsed,
+                                      const struct smb_filename *smb_fname)
+{
+       if (smb_fname != NULL) {
+               smb_time_audit_log_fname(syscallname, elapsed,
+                                        smb_fname->base_name);
+       } else {
+               smb_time_audit_log_fname(syscallname, elapsed,
+                                        "smb_fname = <NULL>");
+       }
 }
 
 static int smb_time_audit_connect(vfs_handle_struct *handle,
@@ -58,7 +136,7 @@ static int smb_time_audit_connect(vfs_handle_struct *handle,
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
        if (timediff > audit_timeout) {
-               smb_time_audit_log("connect", timediff);
+               smb_time_audit_log_msg("connect", timediff, user);
        }
        return result;
 }
@@ -76,48 +154,52 @@ static void smb_time_audit_disconnect(vfs_handle_struct *handle)
        if (timediff > audit_timeout) {
                smb_time_audit_log("disconnect", timediff);
        }
-
-       return;
 }
 
 static uint64_t smb_time_audit_disk_free(vfs_handle_struct *handle,
-                                        const char *path,
-                                        bool small_query, uint64_t *bsize,
-                                        uint64_t *dfree, uint64_t *dsize)
+                                       const struct smb_filename *smb_fname,
+                                       uint64_t *bsize,
+                                       uint64_t *dfree,
+                                       uint64_t *dsize)
 {
        uint64_t result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_DISK_FREE(handle, path, small_query, bsize,
-                                       dfree, dsize);
+       result = SMB_VFS_NEXT_DISK_FREE(handle, smb_fname, bsize, dfree, dsize);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        /* Don't have a reasonable notion of failure here */
        if (timediff > audit_timeout) {
-               smb_time_audit_log("disk_free", timediff);
+               smb_time_audit_log_fname("disk_free",
+                               timediff,
+                               smb_fname->base_name);
        }
 
        return result;
 }
 
 static int smb_time_audit_get_quota(struct vfs_handle_struct *handle,
-                                   enum SMB_QUOTA_TYPE qtype, unid_t id,
-                                   SMB_DISK_QUOTA *qt)
+                                       const struct smb_filename *smb_fname,
+                                       enum SMB_QUOTA_TYPE qtype,
+                                       unid_t id,
+                                       SMB_DISK_QUOTA *qt)
 {
        int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_GET_QUOTA(handle, qtype, id, qt);
+       result = SMB_VFS_NEXT_GET_QUOTA(handle, smb_fname, qtype, id, qt);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("get_quota", timediff);
+               smb_time_audit_log_fname("get_quota",
+                               timediff,
+                               smb_fname->base_name);
        }
        return result;
 }
@@ -158,14 +240,14 @@ static int smb_time_audit_get_shadow_copy_data(struct vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("get_shadow_copy_data", timediff);
+               smb_time_audit_log_fsp("get_shadow_copy_data", timediff, fsp);
        }
 
        return result;
 }
 
 static int smb_time_audit_statvfs(struct vfs_handle_struct *handle,
-                                 const char *path,
+                                 const struct smb_filename *smb_fname,
                                  struct vfs_statvfs_struct *statbuf)
 {
        int result;
@@ -173,12 +255,13 @@ static int smb_time_audit_statvfs(struct vfs_handle_struct *handle,
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_STATVFS(handle, path, statbuf);
+       result = SMB_VFS_NEXT_STATVFS(handle, smb_fname, statbuf);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("statvfs", timediff);
+               smb_time_audit_log_fname("statvfs", timediff,
+                       smb_fname->base_name);
        }
 
        return result;
@@ -203,31 +286,120 @@ static uint32_t smb_time_audit_fs_capabilities(struct vfs_handle_struct *handle,
        return result;
 }
 
-static SMB_STRUCT_DIR *smb_time_audit_opendir(vfs_handle_struct *handle,
-                                             const char *fname,
-                                             const char *mask, uint32 attr)
+static NTSTATUS smb_time_audit_get_dfs_referrals(
+                       struct vfs_handle_struct *handle,
+                       struct dfs_GetDFSReferral *r)
 {
-       SMB_STRUCT_DIR *result;
+       NTSTATUS result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
+       result = SMB_VFS_NEXT_GET_DFS_REFERRALS(handle, r);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("opendir", timediff);
+               smb_time_audit_log("get_dfs_referrals(", timediff);
        }
 
        return result;
 }
 
-static SMB_STRUCT_DIR *smb_time_audit_fdopendir(vfs_handle_struct *handle,
+static NTSTATUS smb_time_audit_snap_check_path(struct vfs_handle_struct *handle,
+                                              TALLOC_CTX *mem_ctx,
+                                              const char *service_path,
+                                              char **base_volume)
+{
+       NTSTATUS status;
+       struct timespec ts1,ts2;
+       double timediff;
+
+       clock_gettime_mono(&ts1);
+       status = SMB_VFS_NEXT_SNAP_CHECK_PATH(handle, mem_ctx, service_path,
+                                             base_volume);
+       clock_gettime_mono(&ts2);
+       timediff = nsec_time_diff(&ts2, &ts1) * 1.0e-9;
+
+       if (timediff > audit_timeout) {
+               smb_time_audit_log("snap_check_path", timediff);
+       }
+
+       return status;
+}
+
+static NTSTATUS smb_time_audit_snap_create(struct vfs_handle_struct *handle,
+                                          TALLOC_CTX *mem_ctx,
+                                          const char *base_volume,
+                                          time_t *tstamp,
+                                          bool rw,
+                                          char **base_path,
+                                          char **snap_path)
+{
+       NTSTATUS status;
+       struct timespec ts1,ts2;
+       double timediff;
+
+       clock_gettime_mono(&ts1);
+       status = SMB_VFS_NEXT_SNAP_CREATE(handle, mem_ctx, base_volume, tstamp,
+                                         rw, base_path, snap_path);
+       clock_gettime_mono(&ts2);
+       timediff = nsec_time_diff(&ts2 ,&ts1) * 1.0e-9;
+
+       if (timediff > audit_timeout) {
+               smb_time_audit_log("snap_create", timediff);
+       }
+
+       return status;
+}
+
+static NTSTATUS smb_time_audit_snap_delete(struct vfs_handle_struct *handle,
+                                          TALLOC_CTX *mem_ctx,
+                                          char *base_path,
+                                          char *snap_path)
+{
+       NTSTATUS status;
+       struct timespec ts1,ts2;
+       double timediff;
+
+       clock_gettime_mono(&ts1);
+       status = SMB_VFS_NEXT_SNAP_DELETE(handle, mem_ctx, base_path,
+                                         snap_path);
+       clock_gettime_mono(&ts2);
+       timediff = nsec_time_diff(&ts2, &ts1) * 1.0e-9;
+
+       if (timediff > audit_timeout) {
+               smb_time_audit_log("snap_delete", timediff);
+       }
+
+       return status;
+}
+
+static DIR *smb_time_audit_opendir(vfs_handle_struct *handle,
+                                  const struct smb_filename *smb_fname,
+                                  const char *mask, uint32_t attr)
+{
+       DIR *result;
+       struct timespec ts1,ts2;
+       double timediff;
+
+       clock_gettime_mono(&ts1);
+       result = SMB_VFS_NEXT_OPENDIR(handle, smb_fname, mask, attr);
+       clock_gettime_mono(&ts2);
+       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
+
+       if (timediff > audit_timeout) {
+               smb_time_audit_log_smb_fname("opendir", timediff, smb_fname);
+       }
+
+       return result;
+}
+
+static DIR *smb_time_audit_fdopendir(vfs_handle_struct *handle,
                                              files_struct *fsp,
-                                             const char *mask, uint32 attr)
+                                             const char *mask, uint32_t attr)
 {
-       SMB_STRUCT_DIR *result;
+       DIR *result;
        struct timespec ts1,ts2;
        double timediff;
 
@@ -237,17 +409,17 @@ static SMB_STRUCT_DIR *smb_time_audit_fdopendir(vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("fdopendir", timediff);
+               smb_time_audit_log_fsp("fdopendir", timediff, fsp);
        }
 
        return result;
 }
 
-static SMB_STRUCT_DIRENT *smb_time_audit_readdir(vfs_handle_struct *handle,
-                                                SMB_STRUCT_DIR *dirp,
+static struct dirent *smb_time_audit_readdir(vfs_handle_struct *handle,
+                                                DIR *dirp,
                                                 SMB_STRUCT_STAT *sbuf)
 {
-       SMB_STRUCT_DIRENT *result;
+       struct dirent *result;
        struct timespec ts1,ts2;
        double timediff;
 
@@ -264,7 +436,7 @@ static SMB_STRUCT_DIRENT *smb_time_audit_readdir(vfs_handle_struct *handle,
 }
 
 static void smb_time_audit_seekdir(vfs_handle_struct *handle,
-                                  SMB_STRUCT_DIR *dirp, long offset)
+                                  DIR *dirp, long offset)
 {
        struct timespec ts1,ts2;
        double timediff;
@@ -278,11 +450,10 @@ static void smb_time_audit_seekdir(vfs_handle_struct *handle,
                smb_time_audit_log("seekdir", timediff);
        }
 
-       return;
 }
 
 static long smb_time_audit_telldir(vfs_handle_struct *handle,
-                                  SMB_STRUCT_DIR *dirp)
+                                  DIR *dirp)
 {
        long result;
        struct timespec ts1,ts2;
@@ -301,7 +472,7 @@ static long smb_time_audit_telldir(vfs_handle_struct *handle,
 }
 
 static void smb_time_audit_rewinddir(vfs_handle_struct *handle,
-                                    SMB_STRUCT_DIR *dirp)
+                                    DIR *dirp)
 {
        struct timespec ts1,ts2;
        double timediff;
@@ -315,49 +486,53 @@ static void smb_time_audit_rewinddir(vfs_handle_struct *handle,
                smb_time_audit_log("rewinddir", timediff);
        }
 
-       return;
 }
 
 static int smb_time_audit_mkdir(vfs_handle_struct *handle,
-                               const char *path, mode_t mode)
+                               const struct smb_filename *smb_fname,
+                               mode_t mode)
 {
        int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_MKDIR(handle, path, mode);
+       result = SMB_VFS_NEXT_MKDIR(handle, smb_fname, mode);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("mkdir", timediff);
+               smb_time_audit_log_smb_fname("mkdir",
+                       timediff,
+                       smb_fname);
        }
 
        return result;
 }
 
 static int smb_time_audit_rmdir(vfs_handle_struct *handle,
-                               const char *path)
+                               const struct smb_filename *smb_fname)
 {
        int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_RMDIR(handle, path);
+       result = SMB_VFS_NEXT_RMDIR(handle, smb_fname);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("rmdir", timediff);
+               smb_time_audit_log_smb_fname("rmdir",
+                       timediff,
+                       smb_fname);
        }
 
        return result;
 }
 
 static int smb_time_audit_closedir(vfs_handle_struct *handle,
-                                  SMB_STRUCT_DIR *dirp)
+                                  DIR *dirp)
 {
        int result;
        struct timespec ts1,ts2;
@@ -375,23 +550,6 @@ static int smb_time_audit_closedir(vfs_handle_struct *handle,
        return result;
 }
 
-static void smb_time_audit_init_search_op(vfs_handle_struct *handle,
-                                         SMB_STRUCT_DIR *dirp)
-{
-       struct timespec ts1,ts2;
-       double timediff;
-
-       clock_gettime_mono(&ts1);
-       SMB_VFS_NEXT_INIT_SEARCH_OP(handle, dirp);
-       clock_gettime_mono(&ts2);
-       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
-
-       if (timediff > audit_timeout) {
-               smb_time_audit_log("init_search_op", timediff);
-       }
-       return;
-}
-
 static int smb_time_audit_open(vfs_handle_struct *handle,
                               struct smb_filename *fname,
                               files_struct *fsp,
@@ -407,7 +565,7 @@ static int smb_time_audit_open(vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("open", timediff);
+               smb_time_audit_log_fsp("open", timediff, fsp);
        }
 
        return result;
@@ -423,12 +581,15 @@ static NTSTATUS smb_time_audit_create_file(vfs_handle_struct *handle,
                                           uint32_t create_options,
                                           uint32_t file_attributes,
                                           uint32_t oplock_request,
+                                          struct smb2_lease *lease,
                                           uint64_t allocation_size,
                                           uint32_t private_flags,
                                           struct security_descriptor *sd,
                                           struct ea_list *ea_list,
                                           files_struct **result_fsp,
-                                          int *pinfo)
+                                          int *pinfo,
+                                          const struct smb2_create_blobs *in_context_blobs,
+                                          struct smb2_create_blobs *out_context_blobs)
 {
        NTSTATUS result;
        struct timespec ts1,ts2;
@@ -446,17 +607,24 @@ static NTSTATUS smb_time_audit_create_file(vfs_handle_struct *handle,
                create_options,                         /* create_options */
                file_attributes,                        /* file_attributes */
                oplock_request,                         /* oplock_request */
+               lease,                                  /* lease */
                allocation_size,                        /* allocation_size */
                private_flags,
                sd,                                     /* sd */
                ea_list,                                /* ea_list */
                result_fsp,                             /* result */
-               pinfo);
+               pinfo,
+               in_context_blobs, out_context_blobs);   /* create context */
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("create_file", timediff);
+               /*
+                * can't use result_fsp this time, may have
+                * invalid content causing smbd crash
+                */
+               smb_time_audit_log_smb_fname("create_file", timediff,
+                                          fname);
        }
 
        return result;
@@ -474,7 +642,7 @@ static int smb_time_audit_close(vfs_handle_struct *handle, files_struct *fsp)
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("close", timediff);
+               smb_time_audit_log_fsp("close", timediff, fsp);
        }
 
        return result;
@@ -493,7 +661,7 @@ static ssize_t smb_time_audit_read(vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("read", timediff);
+               smb_time_audit_log_fsp("read", timediff, fsp);
        }
 
        return result;
@@ -501,7 +669,7 @@ static ssize_t smb_time_audit_read(vfs_handle_struct *handle,
 
 static ssize_t smb_time_audit_pread(vfs_handle_struct *handle,
                                    files_struct *fsp,
-                                   void *data, size_t n, SMB_OFF_T offset)
+                                   void *data, size_t n, off_t offset)
 {
        ssize_t result;
        struct timespec ts1,ts2;
@@ -513,12 +681,76 @@ static ssize_t smb_time_audit_pread(vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("pread", timediff);
+               smb_time_audit_log_fsp("pread", timediff, fsp);
        }
 
        return result;
 }
 
+struct smb_time_audit_pread_state {
+       struct files_struct *fsp;
+       ssize_t ret;
+       struct vfs_aio_state vfs_aio_state;
+};
+
+static void smb_time_audit_pread_done(struct tevent_req *subreq);
+
+static struct tevent_req *smb_time_audit_pread_send(
+       struct vfs_handle_struct *handle, TALLOC_CTX *mem_ctx,
+       struct tevent_context *ev, struct files_struct *fsp,
+       void *data, size_t n, off_t offset)
+{
+       struct tevent_req *req, *subreq;
+       struct smb_time_audit_pread_state *state;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct smb_time_audit_pread_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->fsp = fsp;
+
+       subreq = SMB_VFS_NEXT_PREAD_SEND(state, ev, handle, fsp, data,
+                                        n, offset);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, smb_time_audit_pread_done, req);
+       return req;
+}
+
+static void smb_time_audit_pread_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct smb_time_audit_pread_state *state = tevent_req_data(
+               req, struct smb_time_audit_pread_state);
+
+       state->ret = SMB_VFS_PREAD_RECV(subreq, &state->vfs_aio_state);
+       TALLOC_FREE(subreq);
+       tevent_req_done(req);
+}
+
+static ssize_t smb_time_audit_pread_recv(struct tevent_req *req,
+                                        struct vfs_aio_state *vfs_aio_state)
+{
+       struct smb_time_audit_pread_state *state = tevent_req_data(
+               req, struct smb_time_audit_pread_state);
+       double timediff;
+
+       timediff = state->vfs_aio_state.duration * 1.0e-9;
+
+       if (timediff > audit_timeout) {
+               smb_time_audit_log_fsp("async pread", timediff, state->fsp);
+       }
+
+       if (tevent_req_is_unix_error(req, &vfs_aio_state->error)) {
+               return -1;
+       }
+       *vfs_aio_state = state->vfs_aio_state;
+       return state->ret;
+}
+
 static ssize_t smb_time_audit_write(vfs_handle_struct *handle,
                                    files_struct *fsp,
                                    const void *data, size_t n)
@@ -533,7 +765,7 @@ static ssize_t smb_time_audit_write(vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("write", timediff);
+               smb_time_audit_log_fsp("write", timediff, fsp);
        }
 
        return result;
@@ -542,7 +774,7 @@ static ssize_t smb_time_audit_write(vfs_handle_struct *handle,
 static ssize_t smb_time_audit_pwrite(vfs_handle_struct *handle,
                                     files_struct *fsp,
                                     const void *data, size_t n,
-                                    SMB_OFF_T offset)
+                                    off_t offset)
 {
        ssize_t result;
        struct timespec ts1,ts2;
@@ -554,17 +786,81 @@ static ssize_t smb_time_audit_pwrite(vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("pwrite", timediff);
+               smb_time_audit_log_fsp("pwrite", timediff, fsp);
        }
 
        return result;
 }
 
-static SMB_OFF_T smb_time_audit_lseek(vfs_handle_struct *handle,
+struct smb_time_audit_pwrite_state {
+       struct files_struct *fsp;
+       ssize_t ret;
+       struct vfs_aio_state vfs_aio_state;
+};
+
+static void smb_time_audit_pwrite_done(struct tevent_req *subreq);
+
+static struct tevent_req *smb_time_audit_pwrite_send(
+       struct vfs_handle_struct *handle, TALLOC_CTX *mem_ctx,
+       struct tevent_context *ev, struct files_struct *fsp,
+       const void *data, size_t n, off_t offset)
+{
+       struct tevent_req *req, *subreq;
+       struct smb_time_audit_pwrite_state *state;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct smb_time_audit_pwrite_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->fsp = fsp;
+
+       subreq = SMB_VFS_NEXT_PWRITE_SEND(state, ev, handle, fsp, data,
+                                        n, offset);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, smb_time_audit_pwrite_done, req);
+       return req;
+}
+
+static void smb_time_audit_pwrite_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct smb_time_audit_pwrite_state *state = tevent_req_data(
+               req, struct smb_time_audit_pwrite_state);
+
+       state->ret = SMB_VFS_PWRITE_RECV(subreq, &state->vfs_aio_state);
+       TALLOC_FREE(subreq);
+       tevent_req_done(req);
+}
+
+static ssize_t smb_time_audit_pwrite_recv(struct tevent_req *req,
+                                         struct vfs_aio_state *vfs_aio_state)
+{
+       struct smb_time_audit_pwrite_state *state = tevent_req_data(
+               req, struct smb_time_audit_pwrite_state);
+       double timediff;
+
+       timediff = state->vfs_aio_state.duration * 1.0e-9;
+
+       if (timediff > audit_timeout) {
+               smb_time_audit_log_fsp("async pwrite", timediff, state->fsp);
+       }
+
+       if (tevent_req_is_unix_error(req, &vfs_aio_state->error)) {
+               return -1;
+       }
+       *vfs_aio_state = state->vfs_aio_state;
+       return state->ret;
+}
+
+static off_t smb_time_audit_lseek(vfs_handle_struct *handle,
                                      files_struct *fsp,
-                                     SMB_OFF_T offset, int whence)
+                                     off_t offset, int whence)
 {
-       SMB_OFF_T result;
+       off_t result;
        struct timespec ts1,ts2;
        double timediff;
 
@@ -574,7 +870,7 @@ static SMB_OFF_T smb_time_audit_lseek(vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("lseek", timediff);
+               smb_time_audit_log_fsp("lseek", timediff, fsp);
        }
 
        return result;
@@ -582,7 +878,7 @@ static SMB_OFF_T smb_time_audit_lseek(vfs_handle_struct *handle,
 
 static ssize_t smb_time_audit_sendfile(vfs_handle_struct *handle, int tofd,
                                       files_struct *fromfsp,
-                                      const DATA_BLOB *hdr, SMB_OFF_T offset,
+                                      const DATA_BLOB *hdr, off_t offset,
                                       size_t n)
 {
        ssize_t result;
@@ -595,7 +891,7 @@ static ssize_t smb_time_audit_sendfile(vfs_handle_struct *handle, int tofd,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("sendfile", timediff);
+               smb_time_audit_log_fsp("sendfile", timediff, fromfsp);
        }
 
        return result;
@@ -603,7 +899,7 @@ static ssize_t smb_time_audit_sendfile(vfs_handle_struct *handle, int tofd,
 
 static ssize_t smb_time_audit_recvfile(vfs_handle_struct *handle, int fromfd,
                                       files_struct *tofsp,
-                                      SMB_OFF_T offset,
+                                      off_t offset,
                                       size_t n)
 {
        ssize_t result;
@@ -616,7 +912,7 @@ static ssize_t smb_time_audit_recvfile(vfs_handle_struct *handle, int fromfd,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("recvfile", timediff);
+               smb_time_audit_log_fsp("recvfile", timediff, tofsp);
        }
 
        return result;
@@ -636,7 +932,7 @@ static int smb_time_audit_rename(vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("rename", timediff);
+               smb_time_audit_log_smb_fname("rename", timediff, newname);
        }
 
        return result;
@@ -654,12 +950,74 @@ static int smb_time_audit_fsync(vfs_handle_struct *handle, files_struct *fsp)
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("fsync", timediff);
+               smb_time_audit_log_fsp("fsync", timediff, fsp);
        }
 
        return result;
 }
 
+struct smb_time_audit_fsync_state {
+       struct files_struct *fsp;
+       int ret;
+       struct vfs_aio_state vfs_aio_state;
+};
+
+static void smb_time_audit_fsync_done(struct tevent_req *subreq);
+
+static struct tevent_req *smb_time_audit_fsync_send(
+       struct vfs_handle_struct *handle, TALLOC_CTX *mem_ctx,
+       struct tevent_context *ev, struct files_struct *fsp)
+{
+       struct tevent_req *req, *subreq;
+       struct smb_time_audit_fsync_state *state;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct smb_time_audit_fsync_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->fsp = fsp;
+
+       subreq = SMB_VFS_NEXT_FSYNC_SEND(state, ev, handle, fsp);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, smb_time_audit_fsync_done, req);
+       return req;
+}
+
+static void smb_time_audit_fsync_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct smb_time_audit_fsync_state *state = tevent_req_data(
+               req, struct smb_time_audit_fsync_state);
+
+       state->ret = SMB_VFS_FSYNC_RECV(subreq, &state->vfs_aio_state);
+       TALLOC_FREE(subreq);
+       tevent_req_done(req);
+}
+
+static int smb_time_audit_fsync_recv(struct tevent_req *req,
+                                    struct vfs_aio_state *vfs_aio_state)
+{
+       struct smb_time_audit_fsync_state *state = tevent_req_data(
+               req, struct smb_time_audit_fsync_state);
+       double timediff;
+
+       timediff = state->vfs_aio_state.duration * 1.0e-9;
+
+       if (timediff > audit_timeout) {
+               smb_time_audit_log_fsp("async fsync", timediff, state->fsp);
+       }
+
+       if (tevent_req_is_unix_error(req, &vfs_aio_state->error)) {
+               return -1;
+       }
+       *vfs_aio_state = state->vfs_aio_state;
+       return state->ret;
+}
+
 static int smb_time_audit_stat(vfs_handle_struct *handle,
                               struct smb_filename *fname)
 {
@@ -673,7 +1031,7 @@ static int smb_time_audit_stat(vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("stat", timediff);
+               smb_time_audit_log_smb_fname("stat", timediff, fname);
        }
 
        return result;
@@ -692,7 +1050,7 @@ static int smb_time_audit_fstat(vfs_handle_struct *handle, files_struct *fsp,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("fstat", timediff);
+               smb_time_audit_log_fsp("fstat", timediff, fsp);
        }
 
        return result;
@@ -711,7 +1069,7 @@ static int smb_time_audit_lstat(vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("lstat", timediff);
+               smb_time_audit_log_smb_fname("lstat", timediff, path);
        }
 
        return result;
@@ -731,7 +1089,7 @@ static uint64_t smb_time_audit_get_alloc_size(vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("get_alloc_size", timediff);
+               smb_time_audit_log_fsp("get_alloc_size", timediff, fsp);
        }
 
        return result;
@@ -750,26 +1108,29 @@ static int smb_time_audit_unlink(vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("unlink", timediff);
+               smb_time_audit_log_smb_fname("unlink", timediff, path);
        }
 
        return result;
 }
 
 static int smb_time_audit_chmod(vfs_handle_struct *handle,
-                               const char *path, mode_t mode)
+                       const struct smb_filename *smb_fname,
+                       mode_t mode)
 {
        int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_CHMOD(handle, path, mode);
+       result = SMB_VFS_NEXT_CHMOD(handle, smb_fname, mode);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("chmod", timediff);
+               smb_time_audit_log_fname("chmod",
+                       timediff,
+                       smb_fname->base_name);
        }
 
        return result;
@@ -788,26 +1149,30 @@ static int smb_time_audit_fchmod(vfs_handle_struct *handle, files_struct *fsp,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("fchmod", timediff);
+               smb_time_audit_log_fsp("fchmod", timediff, fsp);
        }
 
        return result;
 }
 
 static int smb_time_audit_chown(vfs_handle_struct *handle,
-                               const char *path, uid_t uid, gid_t gid)
+                       const struct smb_filename *smb_fname,
+                       uid_t uid,
+                       gid_t gid)
 {
        int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_CHOWN(handle, path, uid, gid);
+       result = SMB_VFS_NEXT_CHOWN(handle, smb_fname, uid, gid);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("chown", timediff);
+               smb_time_audit_log_fname("chown",
+                       timediff,
+                       smb_fname->base_name);
        }
 
        return result;
@@ -826,57 +1191,65 @@ static int smb_time_audit_fchown(vfs_handle_struct *handle, files_struct *fsp,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("fchown", timediff);
+               smb_time_audit_log_fsp("fchown", timediff, fsp);
        }
 
        return result;
 }
 
 static int smb_time_audit_lchown(vfs_handle_struct *handle,
-                                const char *path, uid_t uid, gid_t gid)
+                       const struct smb_filename *smb_fname,
+                       uid_t uid,
+                       gid_t gid)
 {
        int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_LCHOWN(handle, path, uid, gid);
+       result = SMB_VFS_NEXT_LCHOWN(handle, smb_fname, uid, gid);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("lchown", timediff);
+               smb_time_audit_log_fname("lchown",
+                       timediff,
+                       smb_fname->base_name);
        }
 
        return result;
 }
 
-static int smb_time_audit_chdir(vfs_handle_struct *handle, const char *path)
+static int smb_time_audit_chdir(vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname)
 {
        int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_CHDIR(handle, path);
+       result = SMB_VFS_NEXT_CHDIR(handle, smb_fname);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("chdir", timediff);
+               smb_time_audit_log_fname("chdir",
+                       timediff,
+                       smb_fname->base_name);
        }
 
        return result;
 }
 
-static char *smb_time_audit_getwd(vfs_handle_struct *handle)
+static struct smb_filename *smb_time_audit_getwd(vfs_handle_struct *handle,
+                                       TALLOC_CTX *mem_ctx)
 {
-       char *result;
+       struct smb_filename *result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_GETWD(handle);
+       result = SMB_VFS_NEXT_GETWD(handle, mem_ctx);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
@@ -901,7 +1274,7 @@ static int smb_time_audit_ntimes(vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("ntimes", timediff);
+               smb_time_audit_log_smb_fname("ntimes", timediff, path);
        }
 
        return result;
@@ -909,7 +1282,7 @@ static int smb_time_audit_ntimes(vfs_handle_struct *handle,
 
 static int smb_time_audit_ftruncate(vfs_handle_struct *handle,
                                    files_struct *fsp,
-                                   SMB_OFF_T len)
+                                   off_t len)
 {
        int result;
        struct timespec ts1,ts2;
@@ -921,7 +1294,7 @@ static int smb_time_audit_ftruncate(vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("ftruncate", timediff);
+               smb_time_audit_log_fsp("ftruncate", timediff, fsp);
        }
 
        return result;
@@ -929,28 +1302,34 @@ static int smb_time_audit_ftruncate(vfs_handle_struct *handle,
 
 static int smb_time_audit_fallocate(vfs_handle_struct *handle,
                                    files_struct *fsp,
-                                   enum vfs_fallocate_mode mode,
-                                   SMB_OFF_T offset,
-                                   SMB_OFF_T len)
+                                   uint32_t mode,
+                                   off_t offset,
+                                   off_t len)
 {
        int result;
+       int saved_errno = 0;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
        result = SMB_VFS_NEXT_FALLOCATE(handle, fsp, mode, offset, len);
+       if (result == -1) {
+               saved_errno = errno;
+       }
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("fallocate", timediff);
+               smb_time_audit_log_fsp("fallocate", timediff, fsp);
+       }
+       if (result == -1) {
+               errno = saved_errno;
        }
-
        return result;
 }
 
 static bool smb_time_audit_lock(vfs_handle_struct *handle, files_struct *fsp,
-                               int op, SMB_OFF_T offset, SMB_OFF_T count,
+                               int op, off_t offset, off_t count,
                                int type)
 {
        bool result;
@@ -963,7 +1342,7 @@ static bool smb_time_audit_lock(vfs_handle_struct *handle, files_struct *fsp,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("lock", timediff);
+               smb_time_audit_log_fsp("lock", timediff, fsp);
        }
 
        return result;
@@ -971,7 +1350,7 @@ static bool smb_time_audit_lock(vfs_handle_struct *handle, files_struct *fsp,
 
 static int smb_time_audit_kernel_flock(struct vfs_handle_struct *handle,
                                       struct files_struct *fsp,
-                                      uint32 share_mode, uint32 access_mask)
+                                      uint32_t share_mode, uint32_t access_mask)
 {
        int result;
        struct timespec ts1,ts2;
@@ -984,7 +1363,7 @@ static int smb_time_audit_kernel_flock(struct vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("kernel_flock", timediff);
+               smb_time_audit_log_fsp("kernel_flock", timediff, fsp);
        }
 
        return result;
@@ -1004,7 +1383,7 @@ static int smb_time_audit_linux_setlease(vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("linux_setlease", timediff);
+               smb_time_audit_log_fsp("linux_setlease", timediff, fsp);
        }
 
        return result;
@@ -1012,7 +1391,7 @@ static int smb_time_audit_linux_setlease(vfs_handle_struct *handle,
 
 static bool smb_time_audit_getlock(vfs_handle_struct *handle,
                                   files_struct *fsp,
-                                  SMB_OFF_T *poffset, SMB_OFF_T *pcount,
+                                  off_t *poffset, off_t *pcount,
                                   int *ptype, pid_t *ppid)
 {
        bool result;
@@ -1026,71 +1405,80 @@ static bool smb_time_audit_getlock(vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("getlock", timediff);
+               smb_time_audit_log_fsp("getlock", timediff, fsp);
        }
 
        return result;
 }
 
 static int smb_time_audit_symlink(vfs_handle_struct *handle,
-                                 const char *oldpath, const char *newpath)
+                               const char *link_contents,
+                               const struct smb_filename *new_smb_fname)
 {
        int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYMLINK(handle, oldpath, newpath);
+       result = SMB_VFS_NEXT_SYMLINK(handle, link_contents, new_smb_fname);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("symlink", timediff);
+               smb_time_audit_log_fname("symlink", timediff,
+                       new_smb_fname->base_name);
        }
 
        return result;
 }
 
 static int smb_time_audit_readlink(vfs_handle_struct *handle,
-                         const char *path, char *buf, size_t bufsiz)
+                               const struct smb_filename *smb_fname,
+                               char *buf,
+                               size_t bufsiz)
 {
        int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_READLINK(handle, path, buf, bufsiz);
+       result = SMB_VFS_NEXT_READLINK(handle, smb_fname,
+                               buf, bufsiz);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("readlink", timediff);
+               smb_time_audit_log_fname("readlink", timediff,
+                               smb_fname->base_name);
        }
 
        return result;
 }
 
 static int smb_time_audit_link(vfs_handle_struct *handle,
-                              const char *oldpath, const char *newpath)
+                               const struct smb_filename *old_smb_fname,
+                               const struct smb_filename *new_smb_fname)
 {
        int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_LINK(handle, oldpath, newpath);
+       result = SMB_VFS_NEXT_LINK(handle, old_smb_fname, new_smb_fname);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("link", timediff);
+               smb_time_audit_log_fname("link", timediff,
+                       new_smb_fname->base_name);
        }
 
        return result;
 }
 
 static int smb_time_audit_mknod(vfs_handle_struct *handle,
-                               const char *pathname, mode_t mode,
+                               const struct smb_filename *smb_fname,
+                               mode_t mode,
                                SMB_DEV_T dev)
 {
        int result;
@@ -1098,75 +1486,53 @@ static int smb_time_audit_mknod(vfs_handle_struct *handle,
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_MKNOD(handle, pathname, mode, dev);
+       result = SMB_VFS_NEXT_MKNOD(handle, smb_fname, mode, dev);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("mknod", timediff);
+               smb_time_audit_log_smb_fname("mknod", timediff, smb_fname);
        }
 
        return result;
 }
 
-static char *smb_time_audit_realpath(vfs_handle_struct *handle,
-                                    const char *path)
+static struct smb_filename *smb_time_audit_realpath(vfs_handle_struct *handle,
+                               TALLOC_CTX *ctx,
+                               const struct smb_filename *smb_fname)
 {
-       char *result;
+       struct smb_filename *result_fname;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_REALPATH(handle, path);
+       result_fname = SMB_VFS_NEXT_REALPATH(handle, ctx, smb_fname);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("realpath", timediff);
+               smb_time_audit_log_fname("realpath", timediff,
+                               smb_fname->base_name);
        }
 
-       return result;
-}
-
-static NTSTATUS smb_time_audit_notify_watch(struct vfs_handle_struct *handle,
-                       struct sys_notify_context *ctx,
-                       struct notify_entry *e,
-                       void (*callback)(struct sys_notify_context *ctx,
-                                       void *private_data,
-                                       struct notify_event *ev),
-                       void *private_data, void *handle_p)
-{
-       NTSTATUS result;
-       struct timespec ts1,ts2;
-       double timediff;
-
-       clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_NOTIFY_WATCH(handle, ctx, e, callback,
-                                          private_data, handle_p);
-       clock_gettime_mono(&ts2);
-       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
-
-       if (timediff > audit_timeout) {
-               smb_time_audit_log("notify_watch", timediff);
-       }
-
-       return result;
+       return result_fname;
 }
 
 static int smb_time_audit_chflags(vfs_handle_struct *handle,
-                                 const char *path, unsigned int flags)
+                               const struct smb_filename *smb_fname,
+                               unsigned int flags)
 {
        int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_CHFLAGS(handle, path, flags);
+       result = SMB_VFS_NEXT_CHFLAGS(handle, smb_fname, flags);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("chflags", timediff);
+               smb_time_audit_log_smb_fname("chflags", timediff, smb_fname);
        }
 
        return result;
@@ -1196,7 +1562,7 @@ static struct file_id smb_time_audit_file_id_create(struct vfs_handle_struct *ha
 
 static NTSTATUS smb_time_audit_streaminfo(vfs_handle_struct *handle,
                                          struct files_struct *fsp,
-                                         const char *fname,
+                                         const struct smb_filename *smb_fname,
                                          TALLOC_CTX *mem_ctx,
                                          unsigned int *pnum_streams,
                                          struct stream_struct **pstreams)
@@ -1206,13 +1572,13 @@ static NTSTATUS smb_time_audit_streaminfo(vfs_handle_struct *handle,
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_STREAMINFO(handle, fsp, fname, mem_ctx,
+       result = SMB_VFS_NEXT_STREAMINFO(handle, fsp, smb_fname, mem_ctx,
                                         pnum_streams, pstreams);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("streaminfo", timediff);
+               smb_time_audit_log_fsp("streaminfo", timediff, fsp);
        }
 
        return result;
@@ -1235,26 +1601,27 @@ static int smb_time_audit_get_real_filename(struct vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("get_real_filename", timediff);
+               smb_time_audit_log_fname("get_real_filename", timediff, path);
        }
 
        return result;
 }
 
 static const char *smb_time_audit_connectpath(vfs_handle_struct *handle,
-                                             const char *fname)
+                                       const struct smb_filename *smb_fname)
 {
        const char *result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_CONNECTPATH(handle, fname);
+       result = SMB_VFS_NEXT_CONNECTPATH(handle, smb_fname);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("connectpath", timediff);
+               smb_time_audit_log_fname("connectpath", timediff,
+                       smb_fname->base_name);
        }
 
        return result;
@@ -1263,8 +1630,7 @@ static const char *smb_time_audit_connectpath(vfs_handle_struct *handle,
 static NTSTATUS smb_time_audit_brl_lock_windows(struct vfs_handle_struct *handle,
                                                struct byte_range_lock *br_lck,
                                                struct lock_struct *plock,
-                                               bool blocking_lock,
-                                               struct blocking_lock_record *blr)
+                                               bool blocking_lock)
 {
        NTSTATUS result;
        struct timespec ts1,ts2;
@@ -1272,12 +1638,13 @@ static NTSTATUS smb_time_audit_brl_lock_windows(struct vfs_handle_struct *handle
 
        clock_gettime_mono(&ts1);
        result = SMB_VFS_NEXT_BRL_LOCK_WINDOWS(handle, br_lck, plock,
-                                              blocking_lock, blr);
+                                              blocking_lock);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("brl_lock_windows", timediff);
+               smb_time_audit_log_fsp("brl_lock_windows", timediff,
+                                      brl_fsp(br_lck));
        }
 
        return result;
@@ -1299,7 +1666,8 @@ static bool smb_time_audit_brl_unlock_windows(struct vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("brl_unlock_windows", timediff);
+               smb_time_audit_log_fsp("brl_unlock_windows", timediff,
+                                      brl_fsp(br_lck));
        }
 
        return result;
@@ -1307,64 +1675,45 @@ static bool smb_time_audit_brl_unlock_windows(struct vfs_handle_struct *handle,
 
 static bool smb_time_audit_brl_cancel_windows(struct vfs_handle_struct *handle,
                                              struct byte_range_lock *br_lck,
-                                             struct lock_struct *plock,
-                                             struct blocking_lock_record *blr)
+                                             struct lock_struct *plock)
 {
        bool result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_BRL_CANCEL_WINDOWS(handle, br_lck, plock, blr);
+       result = SMB_VFS_NEXT_BRL_CANCEL_WINDOWS(handle, br_lck, plock);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("brl_cancel_windows", timediff);
+               smb_time_audit_log_fsp("brl_cancel_windows", timediff,
+                                      brl_fsp(br_lck));
        }
 
        return result;
 }
 
-static bool smb_time_audit_strict_lock(struct vfs_handle_struct *handle,
-                                      struct files_struct *fsp,
-                                      struct lock_struct *plock)
+static bool smb_time_audit_strict_lock_check(struct vfs_handle_struct *handle,
+                                            struct files_struct *fsp,
+                                            struct lock_struct *plock)
 {
        bool result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_STRICT_LOCK(handle, fsp, plock);
+       result = SMB_VFS_NEXT_STRICT_LOCK_CHECK(handle, fsp, plock);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("strict_lock", timediff);
+               smb_time_audit_log_fsp("strict_lock_check", timediff, fsp);
        }
 
        return result;
 }
 
-static void smb_time_audit_strict_unlock(struct vfs_handle_struct *handle,
-                                        struct files_struct *fsp,
-                                        struct lock_struct *plock)
-{
-       struct timespec ts1,ts2;
-       double timediff;
-
-       clock_gettime_mono(&ts1);
-       SMB_VFS_NEXT_STRICT_UNLOCK(handle, fsp, plock);
-       clock_gettime_mono(&ts2);
-       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
-
-       if (timediff > audit_timeout) {
-               smb_time_audit_log("strict_unlock", timediff);
-       }
-
-       return;
-}
-
 static NTSTATUS smb_time_audit_translate_name(struct vfs_handle_struct *handle,
                                              const char *name,
                                              enum vfs_translate_direction direction,
@@ -1382,588 +1731,704 @@ static NTSTATUS smb_time_audit_translate_name(struct vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("translate_name", timediff);
+               smb_time_audit_log_fname("translate_name", timediff, name);
        }
 
        return result;
 }
 
-static NTSTATUS smb_time_audit_fget_nt_acl(vfs_handle_struct *handle,
-                                          files_struct *fsp,
-                                          uint32 security_info,
-                                          struct security_descriptor **ppdesc)
+static NTSTATUS smb_time_audit_fsctl(struct vfs_handle_struct *handle,
+                               struct files_struct *fsp,
+                               TALLOC_CTX *ctx,
+                               uint32_t function,
+                               uint16_t req_flags,
+                               const uint8_t *_in_data,
+                               uint32_t in_len,
+                               uint8_t **_out_data,
+                               uint32_t max_out_len,
+                               uint32_t *out_len)
 {
        NTSTATUS result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp, security_info, ppdesc);
+       result = SMB_VFS_NEXT_FSCTL(handle,
+                               fsp,
+                               ctx,
+                               function,
+                               req_flags,
+                               _in_data,
+                               in_len,
+                               _out_data,
+                               max_out_len,
+                               out_len);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("fget_nt_acl", timediff);
+               smb_time_audit_log_fsp("fsctl", timediff, fsp);
        }
 
        return result;
 }
 
-static NTSTATUS smb_time_audit_get_nt_acl(vfs_handle_struct *handle,
-                                         const char *name,
-                                         uint32 security_info,
-                                         struct security_descriptor **ppdesc)
+static NTSTATUS smb_time_get_dos_attributes(struct vfs_handle_struct *handle,
+                                       struct smb_filename *smb_fname,
+                                       uint32_t *dosmode)
 {
        NTSTATUS result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_GET_NT_ACL(handle, name, security_info, ppdesc);
+       result = SMB_VFS_NEXT_GET_DOS_ATTRIBUTES(handle,
+                               smb_fname,
+                               dosmode);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("get_nt_acl", timediff);
+               smb_time_audit_log_fname("get_dos_attributes",
+                               timediff,
+                               smb_fname->base_name);
        }
 
        return result;
 }
 
-static NTSTATUS smb_time_audit_fset_nt_acl(vfs_handle_struct *handle,
-                                          files_struct *fsp,
-                                          uint32 security_info_sent,
-                                          const struct security_descriptor *psd)
+static NTSTATUS smb_time_fget_dos_attributes(struct vfs_handle_struct *handle,
+                                       struct files_struct *fsp,
+                                       uint32_t *dosmode)
 {
        NTSTATUS result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent,
-                                         psd);
+       result = SMB_VFS_NEXT_FGET_DOS_ATTRIBUTES(handle,
+                               fsp,
+                               dosmode);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("fset_nt_acl", timediff);
+               smb_time_audit_log_fsp("fget_dos_attributes", timediff, fsp);
        }
 
        return result;
 }
 
-static int smb_time_audit_chmod_acl(vfs_handle_struct *handle,
-                                   const char *path, mode_t mode)
+static NTSTATUS smb_time_set_dos_attributes(struct vfs_handle_struct *handle,
+                                       const struct smb_filename *smb_fname,
+                                       uint32_t dosmode)
 {
-       int result;
+       NTSTATUS result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_CHMOD_ACL(handle, path, mode);
+       result = SMB_VFS_NEXT_SET_DOS_ATTRIBUTES(handle,
+                               smb_fname,
+                               dosmode);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("chmod_acl", timediff);
+               smb_time_audit_log_fname("set_dos_attributes",
+                               timediff,
+                               smb_fname->base_name);
        }
 
        return result;
 }
 
-static int smb_time_audit_fchmod_acl(vfs_handle_struct *handle,
-                                    files_struct *fsp, mode_t mode)
+static NTSTATUS smb_time_fset_dos_attributes(struct vfs_handle_struct *handle,
+                                       struct files_struct *fsp,
+                                       uint32_t dosmode)
 {
-       int result;
+       NTSTATUS result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_FCHMOD_ACL(handle, fsp, mode);
+       result = SMB_VFS_NEXT_FSET_DOS_ATTRIBUTES(handle,
+                               fsp,
+                               dosmode);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("fchmod_acl", timediff);
+               smb_time_audit_log_fsp("fset_dos_attributes", timediff, fsp);
        }
 
        return result;
 }
 
-static int smb_time_audit_sys_acl_get_entry(vfs_handle_struct *handle,
-                                           SMB_ACL_T theacl, int entry_id,
-                                           SMB_ACL_ENTRY_T *entry_p)
+struct time_audit_offload_read_state {
+       struct vfs_handle_struct *handle;
+       struct timespec ts_send;
+       DATA_BLOB token_blob;
+};
+
+static void smb_time_audit_offload_read_done(struct tevent_req *subreq);
+
+static struct tevent_req *smb_time_audit_offload_read_send(
+       TALLOC_CTX *mem_ctx,
+       struct tevent_context *ev,
+       struct vfs_handle_struct *handle,
+       struct files_struct *fsp,
+       uint32_t fsctl,
+       uint32_t ttl,
+       off_t offset,
+       size_t to_copy)
 {
-       int result;
-       struct timespec ts1,ts2;
-       double timediff;
+       struct tevent_req *req = NULL;
+       struct tevent_req *subreq = NULL;
+       struct time_audit_offload_read_state *state = NULL;
 
-       clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_GET_ENTRY(handle, theacl, entry_id,
-                                               entry_p);
-       clock_gettime_mono(&ts2);
-       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
+       req = tevent_req_create(mem_ctx, &state,
+                               struct time_audit_offload_read_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->handle = handle;
+       clock_gettime_mono(&state->ts_send);
 
-       if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_get_entry", timediff);
+       subreq = SMB_VFS_NEXT_OFFLOAD_READ_SEND(mem_ctx, ev,
+                                               handle, fsp,
+                                               fsctl, ttl,
+                                               offset, to_copy);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
        }
 
-       return result;
+       tevent_req_set_callback(subreq, smb_time_audit_offload_read_done, req);
+       return req;
 }
 
-static int smb_time_audit_sys_acl_get_tag_type(vfs_handle_struct *handle,
-                                              SMB_ACL_ENTRY_T entry_d,
-                                              SMB_ACL_TAG_T *tag_type_p)
+static void smb_time_audit_offload_read_done(struct tevent_req *subreq)
 {
-       int result;
-       struct timespec ts1,ts2;
-       double timediff;
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct time_audit_offload_read_state *state = tevent_req_data(
+               req, struct time_audit_offload_read_state);
+       NTSTATUS status;
 
-       clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_GET_TAG_TYPE(handle, entry_d,
-                                                  tag_type_p);
-       clock_gettime_mono(&ts2);
-       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
-
-       if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_get_tag_type", timediff);
+       status = SMB_VFS_NEXT_OFFLOAD_READ_RECV(subreq,
+                                               state->handle,
+                                               state,
+                                               &state->token_blob);
+       TALLOC_FREE(subreq);
+       if (tevent_req_nterror(req, status)) {
+               return;
        }
-
-       return result;
+       tevent_req_done(req);
 }
 
-static int smb_time_audit_sys_acl_get_permset(vfs_handle_struct *handle,
-                                             SMB_ACL_ENTRY_T entry_d,
-                                             SMB_ACL_PERMSET_T *permset_p)
+static NTSTATUS smb_time_audit_offload_read_recv(
+       struct tevent_req *req,
+       struct vfs_handle_struct *handle,
+       TALLOC_CTX *mem_ctx,
+       DATA_BLOB *_token_blob)
 {
-       int result;
-       struct timespec ts1,ts2;
+       struct time_audit_offload_read_state *state = tevent_req_data(
+               req, struct time_audit_offload_read_state);
+       struct timespec ts_recv;
        double timediff;
+       DATA_BLOB token_blob;
+       NTSTATUS status;
 
-       clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_GET_PERMSET(handle, entry_d,
-                                                 permset_p);
-       clock_gettime_mono(&ts2);
-       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
-
+       clock_gettime_mono(&ts_recv);
+       timediff = nsec_time_diff(&ts_recv, &state->ts_send) * 1.0e-9;
        if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_get_permset", timediff);
+               smb_time_audit_log("offload_read", timediff);
        }
 
-       return result;
-}
-
-static void * smb_time_audit_sys_acl_get_qualifier(vfs_handle_struct *handle,
-                                                  SMB_ACL_ENTRY_T entry_d)
-{
-       void *result;
-       struct timespec ts1,ts2;
-       double timediff;
-
-       clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_GET_QUALIFIER(handle, entry_d);
-       clock_gettime_mono(&ts2);
-       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
+       if (tevent_req_is_nterror(req, &status)) {
+               tevent_req_received(req);
+               return status;
+       }
 
-       if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_get_qualifier", timediff);
+       token_blob = data_blob_talloc(mem_ctx,
+                                     state->token_blob.data,
+                                     state->token_blob.length);
+       if (token_blob.data == NULL) {
+               tevent_req_received(req);
+               return NT_STATUS_NO_MEMORY;
        }
 
-       return result;
+       tevent_req_received(req);
+       return NT_STATUS_OK;
 }
 
-static SMB_ACL_T smb_time_audit_sys_acl_get_file(vfs_handle_struct *handle,
-                                                const char *path_p,
-                                                SMB_ACL_TYPE_T type)
+struct time_audit_offload_write_state {
+       struct timespec ts_send;
+       struct vfs_handle_struct *handle;
+       off_t copied;
+};
+static void smb_time_audit_offload_write_done(struct tevent_req *subreq);
+
+static struct tevent_req *smb_time_audit_offload_write_send(struct vfs_handle_struct *handle,
+                                                        TALLOC_CTX *mem_ctx,
+                                                        struct tevent_context *ev,
+                                                        uint32_t fsctl,
+                                                        DATA_BLOB *token,
+                                                        off_t transfer_offset,
+                                                        struct files_struct *dest_fsp,
+                                                        off_t dest_off,
+                                                        off_t num)
 {
-       SMB_ACL_T result;
-       struct timespec ts1,ts2;
-       double timediff;
+       struct tevent_req *req;
+       struct tevent_req *subreq;
+       struct time_audit_offload_write_state *state;
 
-       clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_GET_FILE(handle, path_p, type);
-       clock_gettime_mono(&ts2);
-       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
+       req = tevent_req_create(mem_ctx, &state,
+                               struct time_audit_offload_write_state);
+       if (req == NULL) {
+               return NULL;
+       }
 
-       if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_get_file", timediff);
+       state->handle = handle;
+       clock_gettime_mono(&state->ts_send);
+       subreq = SMB_VFS_NEXT_OFFLOAD_WRITE_SEND(handle, state, ev,
+                                             fsctl, token, transfer_offset,
+                                             dest_fsp, dest_off, num);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
        }
 
-       return result;
+       tevent_req_set_callback(subreq, smb_time_audit_offload_write_done, req);
+       return req;
 }
 
-static SMB_ACL_T smb_time_audit_sys_acl_get_fd(vfs_handle_struct *handle,
-                                              files_struct *fsp)
+static void smb_time_audit_offload_write_done(struct tevent_req *subreq)
 {
-       SMB_ACL_T result;
-       struct timespec ts1,ts2;
-       double timediff;
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct time_audit_offload_write_state *state = tevent_req_data(
+               req, struct time_audit_offload_write_state);
+       NTSTATUS status;
 
-       clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp);
-       clock_gettime_mono(&ts2);
-       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
-
-       if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_get_fd", timediff);
+       status = SMB_VFS_NEXT_OFFLOAD_WRITE_RECV(state->handle,
+                                             subreq,
+                                             &state->copied);
+       TALLOC_FREE(subreq);
+       if (tevent_req_nterror(req, status)) {
+               return;
        }
-
-       return result;
+       tevent_req_done(req);
 }
 
-static int smb_time_audit_sys_acl_clear_perms(vfs_handle_struct *handle,
-                                             SMB_ACL_PERMSET_T permset)
+static NTSTATUS smb_time_audit_offload_write_recv(struct vfs_handle_struct *handle,
+                                              struct tevent_req *req,
+                                              off_t *copied)
 {
-       int result;
-       struct timespec ts1,ts2;
+       struct time_audit_offload_write_state *state = tevent_req_data(
+               req, struct time_audit_offload_write_state);
+       struct timespec ts_recv;
        double timediff;
+       NTSTATUS status;
 
-       clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_CLEAR_PERMS(handle, permset);
-       clock_gettime_mono(&ts2);
-       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
-
+       clock_gettime_mono(&ts_recv);
+       timediff = nsec_time_diff(&ts_recv, &state->ts_send)*1.0e-9;
        if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_clear_perms", timediff);
+               smb_time_audit_log("offload_write", timediff);
        }
 
-       return result;
+       *copied = state->copied;
+       if (tevent_req_is_nterror(req, &status)) {
+               tevent_req_received(req);
+               return status;
+       }
+
+       tevent_req_received(req);
+       return NT_STATUS_OK;
 }
 
-static int smb_time_audit_sys_acl_add_perm(vfs_handle_struct *handle,
-                                          SMB_ACL_PERMSET_T permset,
-                                          SMB_ACL_PERM_T perm)
+static NTSTATUS smb_time_audit_get_compression(vfs_handle_struct *handle,
+                                              TALLOC_CTX *mem_ctx,
+                                              struct files_struct *fsp,
+                                              struct smb_filename *smb_fname,
+                                              uint16_t *_compression_fmt)
 {
-       int result;
+       NTSTATUS result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_ADD_PERM(handle, permset, perm);
+       result = SMB_VFS_NEXT_GET_COMPRESSION(handle, mem_ctx, fsp, smb_fname,
+                                             _compression_fmt);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_add_perm", timediff);
+               if (fsp !=  NULL) {
+                       smb_time_audit_log_fsp("get_compression",
+                                              timediff, fsp);
+               } else {
+                       smb_time_audit_log_smb_fname("get_compression",
+                                                    timediff, smb_fname);
+               }
        }
 
        return result;
 }
 
-static char * smb_time_audit_sys_acl_to_text(vfs_handle_struct *handle,
-                                            SMB_ACL_T theacl,
-                                            ssize_t *plen)
+static NTSTATUS smb_time_audit_set_compression(vfs_handle_struct *handle,
+                                              TALLOC_CTX *mem_ctx,
+                                              struct files_struct *fsp,
+                                              uint16_t compression_fmt)
 {
-       char * result;
+       NTSTATUS result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_TO_TEXT(handle, theacl, plen);
+       result = SMB_VFS_NEXT_SET_COMPRESSION(handle, mem_ctx, fsp,
+                                             compression_fmt);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_to_text", timediff);
+               smb_time_audit_log_fsp("set_compression", timediff, fsp);
        }
 
        return result;
 }
 
-static SMB_ACL_T smb_time_audit_sys_acl_init(vfs_handle_struct *handle,
-                                            int count)
+static NTSTATUS smb_time_audit_readdir_attr(struct vfs_handle_struct *handle,
+                                           const struct smb_filename *fname,
+                                           TALLOC_CTX *mem_ctx,
+                                           struct readdir_attr_data **pattr_data)
 {
-       SMB_ACL_T result;
+       NTSTATUS status;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_INIT(handle, count);
+       status = SMB_VFS_NEXT_READDIR_ATTR(handle, fname, mem_ctx, pattr_data);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_init", timediff);
+               smb_time_audit_log_smb_fname("readdir_attr", timediff, fname);
        }
 
-       return result;
+       return status;
 }
 
-static int smb_time_audit_sys_acl_create_entry(vfs_handle_struct *handle,
-                                              SMB_ACL_T *pacl,
-                                              SMB_ACL_ENTRY_T *pentry)
+static NTSTATUS smb_time_audit_fget_nt_acl(vfs_handle_struct *handle,
+                                          files_struct *fsp,
+                                          uint32_t security_info,
+                                          TALLOC_CTX *mem_ctx,
+                                          struct security_descriptor **ppdesc)
 {
-       int result;
+       NTSTATUS result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_CREATE_ENTRY(handle, pacl, pentry);
+       result = SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp, security_info,
+                                         mem_ctx, ppdesc);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_create_entry", timediff);
+               smb_time_audit_log_fsp("fget_nt_acl", timediff, fsp);
        }
 
        return result;
 }
 
-static int smb_time_audit_sys_acl_set_tag_type(vfs_handle_struct *handle,
-                                              SMB_ACL_ENTRY_T entry,
-                                              SMB_ACL_TAG_T tagtype)
+static NTSTATUS smb_time_audit_get_nt_acl(vfs_handle_struct *handle,
+                                         const struct smb_filename *smb_fname,
+                                         uint32_t security_info,
+                                         TALLOC_CTX *mem_ctx,
+                                         struct security_descriptor **ppdesc)
 {
-       int result;
+       NTSTATUS result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_SET_TAG_TYPE(handle, entry,
-                                                  tagtype);
+       result = SMB_VFS_NEXT_GET_NT_ACL(handle, smb_fname, security_info,
+                                        mem_ctx, ppdesc);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_set_tag_type", timediff);
+               smb_time_audit_log_fname("get_nt_acl",
+                       timediff,
+                       smb_fname->base_name);
        }
 
        return result;
 }
 
-static int smb_time_audit_sys_acl_set_qualifier(vfs_handle_struct *handle,
-                                               SMB_ACL_ENTRY_T entry,
-                                               void *qual)
+static NTSTATUS smb_time_audit_fset_nt_acl(vfs_handle_struct *handle,
+                                          files_struct *fsp,
+                                          uint32_t security_info_sent,
+                                          const struct security_descriptor *psd)
 {
-       int result;
+       NTSTATUS result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_SET_QUALIFIER(handle, entry, qual);
+       result = SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent,
+                                         psd);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_set_qualifier", timediff);
+               smb_time_audit_log_fsp("fset_nt_acl", timediff, fsp);
        }
 
        return result;
 }
 
-static int smb_time_audit_sys_acl_set_permset(vfs_handle_struct *handle,
-                                             SMB_ACL_ENTRY_T entry,
-                                             SMB_ACL_PERMSET_T permset)
+static NTSTATUS smb_time_audit_audit_file(struct vfs_handle_struct *handle,
+                               struct smb_filename *smb_fname,
+                               struct security_acl *sacl,
+                               uint32_t access_requested,
+                               uint32_t access_denied)
 {
-       int result;
+       NTSTATUS result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_SET_PERMSET(handle, entry, permset);
+       result = SMB_VFS_NEXT_AUDIT_FILE(handle,
+                                       smb_fname,
+                                       sacl,
+                                       access_requested,
+                                       access_denied);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_set_permset", timediff);
+               smb_time_audit_log_fname("audit_file",
+                       timediff,
+                       smb_fname->base_name);
        }
 
        return result;
 }
 
-static int smb_time_audit_sys_acl_valid(vfs_handle_struct *handle,
-                                       SMB_ACL_T theacl)
+
+
+static int smb_time_audit_chmod_acl(vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname,
+                       mode_t mode)
 {
        int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_VALID(handle, theacl);
+       result = SMB_VFS_NEXT_CHMOD_ACL(handle, smb_fname, mode);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_valid", timediff);
+               smb_time_audit_log_fname("chmod_acl",
+                       timediff,
+                       smb_fname->base_name);
        }
 
        return result;
 }
 
-static int smb_time_audit_sys_acl_set_file(vfs_handle_struct *handle,
-                                          const char *name,
-                                          SMB_ACL_TYPE_T acltype,
-                                          SMB_ACL_T theacl)
+static int smb_time_audit_fchmod_acl(vfs_handle_struct *handle,
+                                    files_struct *fsp, mode_t mode)
 {
        int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_SET_FILE(handle, name, acltype,
-                                              theacl);
+       result = SMB_VFS_NEXT_FCHMOD_ACL(handle, fsp, mode);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_set_file", timediff);
+               smb_time_audit_log_fsp("fchmod_acl", timediff, fsp);
        }
 
        return result;
 }
 
-static int smb_time_audit_sys_acl_set_fd(vfs_handle_struct *handle,
-                                        files_struct *fsp,
-                                        SMB_ACL_T theacl)
+static SMB_ACL_T smb_time_audit_sys_acl_get_file(vfs_handle_struct *handle,
+                                       const struct smb_filename *smb_fname,
+                                       SMB_ACL_TYPE_T type,
+                                       TALLOC_CTX *mem_ctx)
 {
-       int result;
+       SMB_ACL_T result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_SET_FD(handle, fsp, theacl);
+       result = SMB_VFS_NEXT_SYS_ACL_GET_FILE(handle, smb_fname,
+                               type, mem_ctx);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_set_fd", timediff);
+               smb_time_audit_log_fname("sys_acl_get_file", timediff,
+                       smb_fname->base_name);
        }
 
        return result;
 }
 
-static int smb_time_audit_sys_acl_delete_def_file(vfs_handle_struct *handle,
-                                                 const char *path)
+static SMB_ACL_T smb_time_audit_sys_acl_get_fd(vfs_handle_struct *handle,
+                                              files_struct *fsp,
+                                              TALLOC_CTX *mem_ctx)
 {
-       int result;
+       SMB_ACL_T result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_DELETE_DEF_FILE(handle, path);
+       result = SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp, mem_ctx);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_delete_def_file", timediff);
+               smb_time_audit_log_fsp("sys_acl_get_fd", timediff, fsp);
        }
 
        return result;
 }
 
-static int smb_time_audit_sys_acl_get_perm(vfs_handle_struct *handle,
-                                          SMB_ACL_PERMSET_T permset,
-                                          SMB_ACL_PERM_T perm)
+
+static int smb_time_audit_sys_acl_blob_get_file(vfs_handle_struct *handle,
+                               const struct smb_filename *smb_fname,
+                               TALLOC_CTX *mem_ctx,
+                               char **blob_description,
+                               DATA_BLOB *blob)
 {
        int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_GET_PERM(handle, permset, perm);
+       result = SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FILE(handle, smb_fname,
+                               mem_ctx, blob_description, blob);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_get_perm", timediff);
+               smb_time_audit_log("sys_acl_blob_get_file", timediff);
        }
 
        return result;
 }
 
-static int smb_time_audit_sys_acl_free_text(vfs_handle_struct *handle,
-                                           char *text)
+static int smb_time_audit_sys_acl_blob_get_fd(vfs_handle_struct *handle,
+                                             files_struct *fsp,
+                                             TALLOC_CTX *mem_ctx, 
+                                             char **blob_description,
+                                             DATA_BLOB *blob)
 {
        int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_FREE_TEXT(handle, text);
+       result = SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FD(handle, fsp, mem_ctx, blob_description, blob);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_free_text", timediff);
+               smb_time_audit_log("sys_acl_blob_get_fd", timediff);
        }
 
        return result;
 }
 
-static int smb_time_audit_sys_acl_free_acl(vfs_handle_struct *handle,
-                                          SMB_ACL_T posix_acl)
+static int smb_time_audit_sys_acl_set_file(vfs_handle_struct *handle,
+                                          const struct smb_filename *smb_fname,
+                                          SMB_ACL_TYPE_T acltype,
+                                          SMB_ACL_T theacl)
 {
        int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_FREE_ACL(handle, posix_acl);
+       result = SMB_VFS_NEXT_SYS_ACL_SET_FILE(handle, smb_fname, acltype,
+                                              theacl);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_free_acl", timediff);
+               smb_time_audit_log_fname("sys_acl_set_file", timediff,
+                       smb_fname->base_name);
        }
 
        return result;
 }
 
-static int smb_time_audit_sys_acl_free_qualifier(vfs_handle_struct *handle,
-                                                void *qualifier,
-                                                SMB_ACL_TAG_T tagtype)
+static int smb_time_audit_sys_acl_set_fd(vfs_handle_struct *handle,
+                                        files_struct *fsp,
+                                        SMB_ACL_T theacl)
 {
        int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SYS_ACL_FREE_QUALIFIER(handle, qualifier,
-                                                    tagtype);
+       result = SMB_VFS_NEXT_SYS_ACL_SET_FD(handle, fsp, theacl);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("sys_acl_free_qualifier", timediff);
+               smb_time_audit_log_fsp("sys_acl_set_fd", timediff, fsp);
        }
 
        return result;
 }
 
-static ssize_t smb_time_audit_getxattr(struct vfs_handle_struct *handle,
-                                      const char *path, const char *name,
-                                      void *value, size_t size)
+static int smb_time_audit_sys_acl_delete_def_file(vfs_handle_struct *handle,
+                               const struct smb_filename *smb_fname)
 {
-       ssize_t result;
+       int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_GETXATTR(handle, path, name, value, size);
+       result = SMB_VFS_NEXT_SYS_ACL_DELETE_DEF_FILE(handle, smb_fname);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("getxattr", timediff);
+               smb_time_audit_log_fname("sys_acl_delete_def_file", timediff,
+                       smb_fname->base_name);
        }
 
        return result;
 }
 
-static ssize_t smb_time_audit_lgetxattr(struct vfs_handle_struct *handle,
-                                       const char *path, const char *name,
-                                       void *value, size_t size)
+static ssize_t smb_time_audit_getxattr(struct vfs_handle_struct *handle,
+                               const struct smb_filename *smb_fname,
+                               const char *name,
+                               void *value,
+                               size_t size)
 {
        ssize_t result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_LGETXATTR(handle, path, name, value, size);
+       result = SMB_VFS_NEXT_GETXATTR(handle, smb_fname, name, value, size);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("lgetxattr", timediff);
+               smb_time_audit_log_fname("getxattr", timediff,
+                       smb_fname->base_name);
        }
 
        return result;
@@ -1984,14 +2449,15 @@ static ssize_t smb_time_audit_fgetxattr(struct vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("fgetxattr", timediff);
+               smb_time_audit_log_fsp("fgetxattr", timediff, fsp);
        }
 
        return result;
 }
 
 static ssize_t smb_time_audit_listxattr(struct vfs_handle_struct *handle,
-                                       const char *path, char *list,
+                                       const struct smb_filename *smb_fname,
+                                       char *list,
                                        size_t size)
 {
        ssize_t result;
@@ -1999,32 +2465,13 @@ static ssize_t smb_time_audit_listxattr(struct vfs_handle_struct *handle,
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_LISTXATTR(handle, path, list, size);
-       clock_gettime_mono(&ts2);
-       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
-
-       if (timediff > audit_timeout) {
-               smb_time_audit_log("listxattr", timediff);
-       }
-
-       return result;
-}
-
-static ssize_t smb_time_audit_llistxattr(struct vfs_handle_struct *handle,
-                                        const char *path, char *list,
-                                        size_t size)
-{
-       ssize_t result;
-       struct timespec ts1,ts2;
-       double timediff;
-
-       clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_LLISTXATTR(handle, path, list, size);
+       result = SMB_VFS_NEXT_LISTXATTR(handle, smb_fname, list, size);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("llistxattr", timediff);
+               smb_time_audit_log_fname("listxattr", timediff,
+                               smb_fname->base_name);
        }
 
        return result;
@@ -2044,45 +2491,28 @@ static ssize_t smb_time_audit_flistxattr(struct vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("flistxattr", timediff);
+               smb_time_audit_log_fsp("flistxattr", timediff, fsp);
        }
 
        return result;
 }
 
 static int smb_time_audit_removexattr(struct vfs_handle_struct *handle,
-                                     const char *path, const char *name)
-{
-       int result;
-       struct timespec ts1,ts2;
-       double timediff;
-
-       clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_REMOVEXATTR(handle, path, name);
-       clock_gettime_mono(&ts2);
-       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
-
-       if (timediff > audit_timeout) {
-               smb_time_audit_log("removexattr", timediff);
-       }
-
-       return result;
-}
-
-static int smb_time_audit_lremovexattr(struct vfs_handle_struct *handle,
-                                      const char *path, const char *name)
+                               const struct smb_filename *smb_fname,
+                               const char *name)
 {
        int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_LREMOVEXATTR(handle, path, name);
+       result = SMB_VFS_NEXT_REMOVEXATTR(handle, smb_fname, name);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("lremovexattr", timediff);
+               smb_time_audit_log_fname("removexattr", timediff,
+                       smb_fname->base_name);
        }
 
        return result;
@@ -2102,51 +2532,32 @@ static int smb_time_audit_fremovexattr(struct vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("fremovexattr", timediff);
+               smb_time_audit_log_fsp("fremovexattr", timediff, fsp);
        }
 
        return result;
 }
 
 static int smb_time_audit_setxattr(struct vfs_handle_struct *handle,
-                                  const char *path, const char *name,
-                                  const void *value, size_t size,
-                                  int flags)
+                               const struct smb_filename *smb_fname,
+                               const char *name,
+                               const void *value,
+                               size_t size,
+                               int flags)
 {
        int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_SETXATTR(handle, path, name, value, size,
+       result = SMB_VFS_NEXT_SETXATTR(handle, smb_fname, name, value, size,
                                       flags);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("setxattr", timediff);
-       }
-
-       return result;
-}
-
-static int smb_time_audit_lsetxattr(struct vfs_handle_struct *handle,
-                                   const char *path, const char *name,
-                                   const void *value, size_t size,
-                                   int flags)
-{
-       int result;
-       struct timespec ts1,ts2;
-       double timediff;
-
-       clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_LSETXATTR(handle, path, name, value, size,
-                                       flags);
-       clock_gettime_mono(&ts2);
-       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
-
-       if (timediff > audit_timeout) {
-               smb_time_audit_log("lsetxattr", timediff);
+               smb_time_audit_log_fname("setxattr", timediff,
+                               smb_fname->base_name);
        }
 
        return result;
@@ -2166,296 +2577,221 @@ static int smb_time_audit_fsetxattr(struct vfs_handle_struct *handle,
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("fsetxattr", timediff);
-       }
-
-       return result;
-}
-
-static int smb_time_audit_aio_read(struct vfs_handle_struct *handle,
-                                  struct files_struct *fsp,
-                                  SMB_STRUCT_AIOCB *aiocb)
-{
-       int result;
-       struct timespec ts1,ts2;
-       double timediff;
-
-       clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_AIO_READ(handle, fsp, aiocb);
-       clock_gettime_mono(&ts2);
-       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
-
-       if (timediff > audit_timeout) {
-               smb_time_audit_log("aio_read", timediff);
+               smb_time_audit_log_fsp("fsetxattr", timediff, fsp);
        }
 
        return result;
 }
 
-static int smb_time_audit_aio_write(struct vfs_handle_struct *handle,
-                                   struct files_struct *fsp,
-                                   SMB_STRUCT_AIOCB *aiocb)
-{
-       int result;
-       struct timespec ts1,ts2;
-       double timediff;
-
-       clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_AIO_WRITE(handle, fsp, aiocb);
-       clock_gettime_mono(&ts2);
-       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
-
-       if (timediff > audit_timeout) {
-               smb_time_audit_log("aio_write", timediff);
-       }
-
-       return result;
-}
-
-static ssize_t smb_time_audit_aio_return(struct vfs_handle_struct *handle,
-                                        struct files_struct *fsp,
-                                        SMB_STRUCT_AIOCB *aiocb)
-{
-       ssize_t result;
-       struct timespec ts1,ts2;
-       double timediff;
-
-       clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_AIO_RETURN(handle, fsp, aiocb);
-       clock_gettime_mono(&ts2);
-       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
-
-       if (timediff > audit_timeout) {
-               smb_time_audit_log("aio_return", timediff);
-       }
-
-       return result;
-}
-
-static int smb_time_audit_aio_cancel(struct vfs_handle_struct *handle,
-                                    struct files_struct *fsp,
-                                    SMB_STRUCT_AIOCB *aiocb)
-{
-       int result;
-       struct timespec ts1,ts2;
-       double timediff;
-
-       clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_AIO_CANCEL(handle, fsp, aiocb);
-       clock_gettime_mono(&ts2);
-       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
-
-       if (timediff > audit_timeout) {
-               smb_time_audit_log("aio_cancel", timediff);
-       }
-
-       return result;
-}
-
-static int smb_time_audit_aio_error(struct vfs_handle_struct *handle,
-                                   struct files_struct *fsp,
-                                   SMB_STRUCT_AIOCB *aiocb)
+static bool smb_time_audit_aio_force(struct vfs_handle_struct *handle,
+                                    struct files_struct *fsp)
 {
-       int result;
+       bool result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_AIO_ERROR(handle, fsp, aiocb);
+       result = SMB_VFS_NEXT_AIO_FORCE(handle, fsp);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("aio_error", timediff);
+               smb_time_audit_log_fsp("aio_force", timediff, fsp);
        }
 
        return result;
 }
 
-static int smb_time_audit_aio_fsync(struct vfs_handle_struct *handle,
-                                   struct files_struct *fsp, int op,
-                                   SMB_STRUCT_AIOCB *aiocb)
+static NTSTATUS smb_time_audit_durable_cookie(struct vfs_handle_struct *handle,
+                                             struct files_struct *fsp,
+                                             TALLOC_CTX *mem_ctx,
+                                             DATA_BLOB *cookie)
 {
-       int result;
+       NTSTATUS result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_AIO_FSYNC(handle, fsp, op, aiocb);
+       result = SMB_VFS_NEXT_DURABLE_COOKIE(handle, fsp, mem_ctx, cookie);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("aio_fsync", timediff);
+               smb_time_audit_log_fsp("durable_cookie", timediff, fsp);
        }
 
        return result;
 }
 
-static int smb_time_audit_aio_suspend(struct vfs_handle_struct *handle,
-                                     struct files_struct *fsp,
-                                     const SMB_STRUCT_AIOCB * const aiocb[],
-                                     int n, const struct timespec *ts)
+static NTSTATUS smb_time_audit_durable_disconnect(struct vfs_handle_struct *handle,
+                                                 struct files_struct *fsp,
+                                                 const DATA_BLOB old_cookie,
+                                                 TALLOC_CTX *mem_ctx,
+                                                 DATA_BLOB *new_cookie)
 {
-       int result;
+       NTSTATUS result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_AIO_SUSPEND(handle, fsp, aiocb, n, ts);
+       result = SMB_VFS_NEXT_DURABLE_DISCONNECT(handle, fsp, old_cookie,
+                                                mem_ctx, new_cookie);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("aio_suspend", timediff);
+               smb_time_audit_log_fsp("durable_disconnect", timediff, fsp);
        }
 
        return result;
 }
 
-static bool smb_time_audit_aio_force(struct vfs_handle_struct *handle,
-                                    struct files_struct *fsp)
+static NTSTATUS smb_time_audit_durable_reconnect(struct vfs_handle_struct *handle,
+                                                struct smb_request *smb1req,
+                                                struct smbXsrv_open *op,
+                                                const DATA_BLOB old_cookie,
+                                                TALLOC_CTX *mem_ctx,
+                                                struct files_struct **fsp,
+                                                DATA_BLOB *new_cookie)
 {
-       bool result;
+       NTSTATUS result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_AIO_FORCE(handle, fsp);
+       result = SMB_VFS_NEXT_DURABLE_RECONNECT(handle, smb1req, op, old_cookie,
+                                               mem_ctx, fsp, new_cookie);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("aio_force", timediff);
+               smb_time_audit_log("durable_reconnect", timediff);
        }
 
        return result;
 }
 
-
-
 /* VFS operations */
 
 static struct vfs_fn_pointers vfs_time_audit_fns = {
        .connect_fn = smb_time_audit_connect,
-       .disconnect = smb_time_audit_disconnect,
-       .disk_free = smb_time_audit_disk_free,
-       .get_quota = smb_time_audit_get_quota,
-       .set_quota = smb_time_audit_set_quota,
-       .get_shadow_copy_data = smb_time_audit_get_shadow_copy_data,
-       .statvfs = smb_time_audit_statvfs,
-       .fs_capabilities = smb_time_audit_fs_capabilities,
-       .opendir = smb_time_audit_opendir,
-       .fdopendir = smb_time_audit_fdopendir,
-       .readdir = smb_time_audit_readdir,
-       .seekdir = smb_time_audit_seekdir,
-       .telldir = smb_time_audit_telldir,
-       .rewind_dir = smb_time_audit_rewinddir,
-       .mkdir = smb_time_audit_mkdir,
-       .rmdir = smb_time_audit_rmdir,
-       .closedir = smb_time_audit_closedir,
-       .init_search_op = smb_time_audit_init_search_op,
+       .disconnect_fn = smb_time_audit_disconnect,
+       .disk_free_fn = smb_time_audit_disk_free,
+       .get_quota_fn = smb_time_audit_get_quota,
+       .set_quota_fn = smb_time_audit_set_quota,
+       .get_shadow_copy_data_fn = smb_time_audit_get_shadow_copy_data,
+       .statvfs_fn = smb_time_audit_statvfs,
+       .fs_capabilities_fn = smb_time_audit_fs_capabilities,
+       .get_dfs_referrals_fn = smb_time_audit_get_dfs_referrals,
+       .opendir_fn = smb_time_audit_opendir,
+       .fdopendir_fn = smb_time_audit_fdopendir,
+       .readdir_fn = smb_time_audit_readdir,
+       .seekdir_fn = smb_time_audit_seekdir,
+       .telldir_fn = smb_time_audit_telldir,
+       .rewind_dir_fn = smb_time_audit_rewinddir,
+       .mkdir_fn = smb_time_audit_mkdir,
+       .rmdir_fn = smb_time_audit_rmdir,
+       .closedir_fn = smb_time_audit_closedir,
        .open_fn = smb_time_audit_open,
-       .create_file = smb_time_audit_create_file,
+       .create_file_fn = smb_time_audit_create_file,
        .close_fn = smb_time_audit_close,
-       .vfs_read = smb_time_audit_read,
-       .pread = smb_time_audit_pread,
-       .write = smb_time_audit_write,
-       .pwrite = smb_time_audit_pwrite,
-       .lseek = smb_time_audit_lseek,
-       .sendfile = smb_time_audit_sendfile,
-       .recvfile = smb_time_audit_recvfile,
-       .rename = smb_time_audit_rename,
-       .fsync = smb_time_audit_fsync,
-       .stat = smb_time_audit_stat,
-       .fstat = smb_time_audit_fstat,
-       .lstat = smb_time_audit_lstat,
-       .get_alloc_size = smb_time_audit_get_alloc_size,
-       .unlink = smb_time_audit_unlink,
-       .chmod = smb_time_audit_chmod,
-       .fchmod = smb_time_audit_fchmod,
-       .chown = smb_time_audit_chown,
-       .fchown = smb_time_audit_fchown,
-       .lchown = smb_time_audit_lchown,
-       .chdir = smb_time_audit_chdir,
-       .getwd = smb_time_audit_getwd,
-       .ntimes = smb_time_audit_ntimes,
-       .ftruncate = smb_time_audit_ftruncate,
-       .fallocate = smb_time_audit_fallocate,
-       .lock = smb_time_audit_lock,
-       .kernel_flock = smb_time_audit_kernel_flock,
-       .linux_setlease = smb_time_audit_linux_setlease,
-       .getlock = smb_time_audit_getlock,
-       .symlink = smb_time_audit_symlink,
-       .vfs_readlink = smb_time_audit_readlink,
-       .link = smb_time_audit_link,
-       .mknod = smb_time_audit_mknod,
-       .realpath = smb_time_audit_realpath,
-       .notify_watch = smb_time_audit_notify_watch,
-       .chflags = smb_time_audit_chflags,
-       .file_id_create = smb_time_audit_file_id_create,
-       .streaminfo = smb_time_audit_streaminfo,
-       .get_real_filename = smb_time_audit_get_real_filename,
-       .connectpath = smb_time_audit_connectpath,
-       .brl_lock_windows = smb_time_audit_brl_lock_windows,
-       .brl_unlock_windows = smb_time_audit_brl_unlock_windows,
-       .brl_cancel_windows = smb_time_audit_brl_cancel_windows,
-       .strict_lock = smb_time_audit_strict_lock,
-       .strict_unlock = smb_time_audit_strict_unlock,
-       .translate_name = smb_time_audit_translate_name,
-       .fget_nt_acl = smb_time_audit_fget_nt_acl,
-       .get_nt_acl = smb_time_audit_get_nt_acl,
-       .fset_nt_acl = smb_time_audit_fset_nt_acl,
-       .chmod_acl = smb_time_audit_chmod_acl,
-       .fchmod_acl = smb_time_audit_fchmod_acl,
-       .sys_acl_get_entry = smb_time_audit_sys_acl_get_entry,
-       .sys_acl_get_tag_type = smb_time_audit_sys_acl_get_tag_type,
-       .sys_acl_get_permset = smb_time_audit_sys_acl_get_permset,
-       .sys_acl_get_qualifier = smb_time_audit_sys_acl_get_qualifier,
-       .sys_acl_get_file = smb_time_audit_sys_acl_get_file,
-       .sys_acl_get_fd = smb_time_audit_sys_acl_get_fd,
-       .sys_acl_clear_perms = smb_time_audit_sys_acl_clear_perms,
-       .sys_acl_add_perm = smb_time_audit_sys_acl_add_perm,
-       .sys_acl_to_text = smb_time_audit_sys_acl_to_text,
-       .sys_acl_init = smb_time_audit_sys_acl_init,
-       .sys_acl_create_entry = smb_time_audit_sys_acl_create_entry,
-       .sys_acl_set_tag_type = smb_time_audit_sys_acl_set_tag_type,
-       .sys_acl_set_qualifier = smb_time_audit_sys_acl_set_qualifier,
-       .sys_acl_set_permset = smb_time_audit_sys_acl_set_permset,
-       .sys_acl_valid = smb_time_audit_sys_acl_valid,
-       .sys_acl_set_file = smb_time_audit_sys_acl_set_file,
-       .sys_acl_set_fd = smb_time_audit_sys_acl_set_fd,
-       .sys_acl_delete_def_file = smb_time_audit_sys_acl_delete_def_file,
-       .sys_acl_get_perm = smb_time_audit_sys_acl_get_perm,
-       .sys_acl_free_text = smb_time_audit_sys_acl_free_text,
-       .sys_acl_free_acl = smb_time_audit_sys_acl_free_acl,
-       .sys_acl_free_qualifier = smb_time_audit_sys_acl_free_qualifier,
-       .getxattr = smb_time_audit_getxattr,
-       .lgetxattr = smb_time_audit_lgetxattr,
-       .fgetxattr = smb_time_audit_fgetxattr,
-       .listxattr = smb_time_audit_listxattr,
-       .llistxattr = smb_time_audit_llistxattr,
-       .flistxattr = smb_time_audit_flistxattr,
-       .removexattr = smb_time_audit_removexattr,
-       .lremovexattr = smb_time_audit_lremovexattr,
-       .fremovexattr = smb_time_audit_fremovexattr,
-       .setxattr = smb_time_audit_setxattr,
-       .lsetxattr = smb_time_audit_lsetxattr,
-       .fsetxattr = smb_time_audit_fsetxattr,
-       .aio_read = smb_time_audit_aio_read,
-       .aio_write = smb_time_audit_aio_write,
-       .aio_return_fn = smb_time_audit_aio_return,
-       .aio_cancel = smb_time_audit_aio_cancel,
-       .aio_error_fn = smb_time_audit_aio_error,
-       .aio_fsync = smb_time_audit_aio_fsync,
-       .aio_suspend = smb_time_audit_aio_suspend,
-       .aio_force = smb_time_audit_aio_force,
+       .read_fn = smb_time_audit_read,
+       .pread_fn = smb_time_audit_pread,
+       .pread_send_fn = smb_time_audit_pread_send,
+       .pread_recv_fn = smb_time_audit_pread_recv,
+       .write_fn = smb_time_audit_write,
+       .pwrite_fn = smb_time_audit_pwrite,
+       .pwrite_send_fn = smb_time_audit_pwrite_send,
+       .pwrite_recv_fn = smb_time_audit_pwrite_recv,
+       .lseek_fn = smb_time_audit_lseek,
+       .sendfile_fn = smb_time_audit_sendfile,
+       .recvfile_fn = smb_time_audit_recvfile,
+       .rename_fn = smb_time_audit_rename,
+       .fsync_fn = smb_time_audit_fsync,
+       .fsync_send_fn = smb_time_audit_fsync_send,
+       .fsync_recv_fn = smb_time_audit_fsync_recv,
+       .stat_fn = smb_time_audit_stat,
+       .fstat_fn = smb_time_audit_fstat,
+       .lstat_fn = smb_time_audit_lstat,
+       .get_alloc_size_fn = smb_time_audit_get_alloc_size,
+       .unlink_fn = smb_time_audit_unlink,
+       .chmod_fn = smb_time_audit_chmod,
+       .fchmod_fn = smb_time_audit_fchmod,
+       .chown_fn = smb_time_audit_chown,
+       .fchown_fn = smb_time_audit_fchown,
+       .lchown_fn = smb_time_audit_lchown,
+       .chdir_fn = smb_time_audit_chdir,
+       .getwd_fn = smb_time_audit_getwd,
+       .ntimes_fn = smb_time_audit_ntimes,
+       .ftruncate_fn = smb_time_audit_ftruncate,
+       .fallocate_fn = smb_time_audit_fallocate,
+       .lock_fn = smb_time_audit_lock,
+       .kernel_flock_fn = smb_time_audit_kernel_flock,
+       .linux_setlease_fn = smb_time_audit_linux_setlease,
+       .getlock_fn = smb_time_audit_getlock,
+       .symlink_fn = smb_time_audit_symlink,
+       .readlink_fn = smb_time_audit_readlink,
+       .link_fn = smb_time_audit_link,
+       .mknod_fn = smb_time_audit_mknod,
+       .realpath_fn = smb_time_audit_realpath,
+       .chflags_fn = smb_time_audit_chflags,
+       .file_id_create_fn = smb_time_audit_file_id_create,
+       .offload_read_send_fn = smb_time_audit_offload_read_send,
+       .offload_read_recv_fn = smb_time_audit_offload_read_recv,
+       .offload_write_send_fn = smb_time_audit_offload_write_send,
+       .offload_write_recv_fn = smb_time_audit_offload_write_recv,
+       .get_compression_fn = smb_time_audit_get_compression,
+       .set_compression_fn = smb_time_audit_set_compression,
+       .snap_check_path_fn = smb_time_audit_snap_check_path,
+       .snap_create_fn = smb_time_audit_snap_create,
+       .snap_delete_fn = smb_time_audit_snap_delete,
+       .streaminfo_fn = smb_time_audit_streaminfo,
+       .get_real_filename_fn = smb_time_audit_get_real_filename,
+       .connectpath_fn = smb_time_audit_connectpath,
+       .brl_lock_windows_fn = smb_time_audit_brl_lock_windows,
+       .brl_unlock_windows_fn = smb_time_audit_brl_unlock_windows,
+       .brl_cancel_windows_fn = smb_time_audit_brl_cancel_windows,
+       .strict_lock_check_fn = smb_time_audit_strict_lock_check,
+       .translate_name_fn = smb_time_audit_translate_name,
+       .fsctl_fn = smb_time_audit_fsctl,
+       .get_dos_attributes_fn = smb_time_get_dos_attributes,
+       .fget_dos_attributes_fn = smb_time_fget_dos_attributes,
+       .set_dos_attributes_fn = smb_time_set_dos_attributes,
+       .fset_dos_attributes_fn = smb_time_fset_dos_attributes,
+       .fget_nt_acl_fn = smb_time_audit_fget_nt_acl,
+       .get_nt_acl_fn = smb_time_audit_get_nt_acl,
+       .fset_nt_acl_fn = smb_time_audit_fset_nt_acl,
+       .audit_file_fn = smb_time_audit_audit_file,
+       .chmod_acl_fn = smb_time_audit_chmod_acl,
+       .fchmod_acl_fn = smb_time_audit_fchmod_acl,
+       .sys_acl_get_file_fn = smb_time_audit_sys_acl_get_file,
+       .sys_acl_get_fd_fn = smb_time_audit_sys_acl_get_fd,
+       .sys_acl_blob_get_file_fn = smb_time_audit_sys_acl_blob_get_file,
+       .sys_acl_blob_get_fd_fn = smb_time_audit_sys_acl_blob_get_fd,
+       .sys_acl_set_file_fn = smb_time_audit_sys_acl_set_file,
+       .sys_acl_set_fd_fn = smb_time_audit_sys_acl_set_fd,
+       .sys_acl_delete_def_file_fn = smb_time_audit_sys_acl_delete_def_file,
+       .getxattr_fn = smb_time_audit_getxattr,
+       .fgetxattr_fn = smb_time_audit_fgetxattr,
+       .listxattr_fn = smb_time_audit_listxattr,
+       .flistxattr_fn = smb_time_audit_flistxattr,
+       .removexattr_fn = smb_time_audit_removexattr,
+       .fremovexattr_fn = smb_time_audit_fremovexattr,
+       .setxattr_fn = smb_time_audit_setxattr,
+       .fsetxattr_fn = smb_time_audit_fsetxattr,
+       .aio_force_fn = smb_time_audit_aio_force,
+       .durable_cookie_fn = smb_time_audit_durable_cookie,
+       .durable_disconnect_fn = smb_time_audit_durable_disconnect,
+       .durable_reconnect_fn = smb_time_audit_durable_reconnect,
+       .readdir_attr_fn = smb_time_audit_readdir_attr,
 };
 
 
-NTSTATUS vfs_time_audit_init(void);
-NTSTATUS vfs_time_audit_init(void)
+NTSTATUS vfs_time_audit_init(TALLOC_CTX *);
+NTSTATUS vfs_time_audit_init(TALLOC_CTX *ctx)
 {
+       smb_vfs_assert_all_fns(&vfs_time_audit_fns, "time_audit");
+
        audit_timeout = (double)lp_parm_int(-1, "time_audit", "timeout",
                                            10000) / 1000.0;
        return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "time_audit",