s3-vfs: Add pwrite_send/recv to vfs modules
[kai/samba.git] / source3 / modules / vfs_time_audit.c
index e9481b5d6754e85ff64bb5f21301032f6deceae6..a9b806a69a50617aeea8a41df4af5b12463103e9 100644 (file)
@@ -26,6 +26,9 @@
 
 
 #include "includes.h"
+#include "smbd/smbd.h"
+#include "ntioctl.h"
+#include "lib/util/tevent_unix.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
@@ -142,7 +145,7 @@ static int smb_time_audit_set_quota(struct vfs_handle_struct *handle,
 
 static int smb_time_audit_get_shadow_copy_data(struct vfs_handle_struct *handle,
                                               struct files_struct *fsp,
-                                              SHADOW_COPY_DATA *shadow_copy_data,
+                                              struct shadow_copy_data *shadow_copy_data,
                                               bool labels)
 {
        int result;
@@ -201,11 +204,11 @@ 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,
+static DIR *smb_time_audit_opendir(vfs_handle_struct *handle,
                                              const char *fname,
                                              const char *mask, uint32 attr)
 {
-       SMB_STRUCT_DIR *result;
+       DIR *result;
        struct timespec ts1,ts2;
        double timediff;
 
@@ -221,11 +224,31 @@ static SMB_STRUCT_DIR *smb_time_audit_opendir(vfs_handle_struct *handle,
        return result;
 }
 
-static SMB_STRUCT_DIRENT *smb_time_audit_readdir(vfs_handle_struct *handle,
-                                                SMB_STRUCT_DIR *dirp,
+static DIR *smb_time_audit_fdopendir(vfs_handle_struct *handle,
+                                             files_struct *fsp,
+                                             const char *mask, uint32 attr)
+{
+       DIR *result;
+       struct timespec ts1,ts2;
+       double timediff;
+
+       clock_gettime_mono(&ts1);
+       result = SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr);
+       clock_gettime_mono(&ts2);
+       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
+
+       if (timediff > audit_timeout) {
+               smb_time_audit_log("fdopendir", timediff);
+       }
+
+       return result;
+}
+
+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;
 
@@ -242,7 +265,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;
@@ -260,7 +283,7 @@ static void smb_time_audit_seekdir(vfs_handle_struct *handle,
 }
 
 static long smb_time_audit_telldir(vfs_handle_struct *handle,
-                                  SMB_STRUCT_DIR *dirp)
+                                  DIR *dirp)
 {
        long result;
        struct timespec ts1,ts2;
@@ -279,7 +302,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;
@@ -335,7 +358,7 @@ static int smb_time_audit_rmdir(vfs_handle_struct *handle,
 }
 
 static int smb_time_audit_closedir(vfs_handle_struct *handle,
-                                  SMB_STRUCT_DIR *dirp)
+                                  DIR *dirp)
 {
        int result;
        struct timespec ts1,ts2;
@@ -354,7 +377,7 @@ static int smb_time_audit_closedir(vfs_handle_struct *handle,
 }
 
 static void smb_time_audit_init_search_op(vfs_handle_struct *handle,
-                                         SMB_STRUCT_DIR *dirp)
+                                         DIR *dirp)
 {
        struct timespec ts1,ts2;
        double timediff;
@@ -479,7 +502,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;
@@ -497,6 +520,71 @@ static ssize_t smb_time_audit_pread(vfs_handle_struct *handle,
        return result;
 }
 
+struct smb_time_audit_pread_state {
+       struct timespec ts1;
+       ssize_t ret;
+       int err;
+};
+
+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;
+       }
+       clock_gettime_mono(&state->ts1);
+
+       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->err);
+       TALLOC_FREE(subreq);
+       tevent_req_done(req);
+}
+
+static ssize_t smb_time_audit_pread_recv(struct tevent_req *req, int *err)
+{
+       struct smb_time_audit_pread_state *state = tevent_req_data(
+               req, struct smb_time_audit_pread_state);
+       struct timespec ts2;
+       double timediff;
+
+       clock_gettime_mono(&ts2);
+       timediff = nsec_time_diff(&ts2,&state->ts1)*1.0e-9;
+
+       if (timediff > audit_timeout) {
+               smb_time_audit_log("pread", timediff);
+       }
+
+       if (tevent_req_is_unix_error(req, err)) {
+               return -1;
+       }
+       *err = state->err;
+       return state->ret;
+}
+
 static ssize_t smb_time_audit_write(vfs_handle_struct *handle,
                                    files_struct *fsp,
                                    const void *data, size_t n)
@@ -520,7 +608,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;
@@ -538,11 +626,76 @@ static ssize_t smb_time_audit_pwrite(vfs_handle_struct *handle,
        return result;
 }
 
-static SMB_OFF_T smb_time_audit_lseek(vfs_handle_struct *handle,
+struct smb_time_audit_pwrite_state {
+       struct timespec ts1;
+       ssize_t ret;
+       int err;
+};
+
+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;
+       }
+       clock_gettime_mono(&state->ts1);
+
+       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->err);
+       TALLOC_FREE(subreq);
+       tevent_req_done(req);
+}
+
+static ssize_t smb_time_audit_pwrite_recv(struct tevent_req *req, int *err)
+{
+       struct smb_time_audit_pwrite_state *state = tevent_req_data(
+               req, struct smb_time_audit_pwrite_state);
+       struct timespec ts2;
+       double timediff;
+
+       clock_gettime_mono(&ts2);
+       timediff = nsec_time_diff(&ts2,&state->ts1)*1.0e-9;
+
+       if (timediff > audit_timeout) {
+               smb_time_audit_log("pwrite", timediff);
+       }
+
+       if (tevent_req_is_unix_error(req, err)) {
+               return -1;
+       }
+       *err = state->err;
+       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)
 {
-       ssize_t result;
+       off_t result;
        struct timespec ts1,ts2;
        double timediff;
 
@@ -560,7 +713,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;
@@ -581,7 +734,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;
@@ -699,7 +852,7 @@ static uint64_t smb_time_audit_get_alloc_size(vfs_handle_struct *handle,
                                              files_struct *fsp,
                                              const SMB_STRUCT_STAT *sbuf)
 {
-       int result;
+       uint64_t result;
        struct timespec ts1,ts2;
        double timediff;
 
@@ -847,14 +1000,14 @@ static int smb_time_audit_chdir(vfs_handle_struct *handle, const char *path)
        return result;
 }
 
-static char *smb_time_audit_getwd(vfs_handle_struct *handle, char *path)
+static char *smb_time_audit_getwd(vfs_handle_struct *handle)
 {
        char *result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_GETWD(handle, path);
+       result = SMB_VFS_NEXT_GETWD(handle);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
@@ -887,7 +1040,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;
@@ -905,29 +1058,30 @@ static int smb_time_audit_ftruncate(vfs_handle_struct *handle,
        return result;
 }
 
-static int smb_time_audit_posix_fallocate(vfs_handle_struct *handle,
+static int smb_time_audit_fallocate(vfs_handle_struct *handle,
                                    files_struct *fsp,
-                                   SMB_OFF_T offset,
-                                   SMB_OFF_T len)
+                                   enum vfs_fallocate_mode mode,
+                                   off_t offset,
+                                   off_t len)
 {
        int result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_POSIX_FALLOCATE(handle, fsp, offset, len);
+       result = SMB_VFS_NEXT_FALLOCATE(handle, fsp, mode, offset, len);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
 
        if (timediff > audit_timeout) {
-               smb_time_audit_log("posix_fallocate", timediff);
+               smb_time_audit_log("fallocate", timediff);
        }
 
        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;
@@ -989,7 +1143,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;
@@ -1107,7 +1261,9 @@ static char *smb_time_audit_realpath(vfs_handle_struct *handle,
 
 static NTSTATUS smb_time_audit_notify_watch(struct vfs_handle_struct *handle,
                        struct sys_notify_context *ctx,
-                       struct notify_entry *e,
+                       const char *path,
+                       uint32_t *filter,
+                       uint32_t *subdir_filter,
                        void (*callback)(struct sys_notify_context *ctx,
                                        void *private_data,
                                        struct notify_event *ev),
@@ -1118,7 +1274,8 @@ static NTSTATUS smb_time_audit_notify_watch(struct vfs_handle_struct *handle,
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_NOTIFY_WATCH(handle, ctx, e, callback,
+       result = SMB_VFS_NEXT_NOTIFY_WATCH(handle, ctx, path,
+                                          filter, subdir_filter, callback,
                                           private_data, handle_p);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
@@ -1926,26 +2083,6 @@ static ssize_t smb_time_audit_getxattr(struct vfs_handle_struct *handle,
        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)
-{
-       ssize_t result;
-       struct timespec ts1,ts2;
-       double timediff;
-
-       clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_LGETXATTR(handle, path, 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);
-       }
-
-       return result;
-}
-
 static ssize_t smb_time_audit_fgetxattr(struct vfs_handle_struct *handle,
                                        struct files_struct *fsp,
                                        const char *name, void *value,
@@ -1987,26 +2124,6 @@ static ssize_t smb_time_audit_listxattr(struct vfs_handle_struct *handle,
        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);
-       clock_gettime_mono(&ts2);
-       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
-
-       if (timediff > audit_timeout) {
-               smb_time_audit_log("llistxattr", timediff);
-       }
-
-       return result;
-}
-
 static ssize_t smb_time_audit_flistxattr(struct vfs_handle_struct *handle,
                                         struct files_struct *fsp, char *list,
                                         size_t size)
@@ -2046,25 +2163,6 @@ static int smb_time_audit_removexattr(struct vfs_handle_struct *handle,
        return result;
 }
 
-static int smb_time_audit_lremovexattr(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_LREMOVEXATTR(handle, path, name);
-       clock_gettime_mono(&ts2);
-       timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
-
-       if (timediff > audit_timeout) {
-               smb_time_audit_log("lremovexattr", timediff);
-       }
-
-       return result;
-}
-
 static int smb_time_audit_fremovexattr(struct vfs_handle_struct *handle,
                                       struct files_struct *fsp,
                                       const char *name)
@@ -2107,28 +2205,6 @@ static int smb_time_audit_setxattr(struct vfs_handle_struct *handle,
        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);
-       }
-
-       return result;
-}
-
 static int smb_time_audit_fsetxattr(struct vfs_handle_struct *handle,
                                    struct files_struct *fsp, const char *name,
                                    const void *value, size_t size, int flags)
@@ -2193,7 +2269,7 @@ static ssize_t smb_time_audit_aio_return(struct vfs_handle_struct *handle,
                                         struct files_struct *fsp,
                                         SMB_STRUCT_AIOCB *aiocb)
 {
-       int result;
+       ssize_t result;
        struct timespec ts1,ts2;
        double timediff;
 
@@ -2315,117 +2391,118 @@ static bool smb_time_audit_aio_force(struct vfs_handle_struct *handle,
 
 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,
-       .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,
-       .open = smb_time_audit_open,
-       .create_file = smb_time_audit_create_file,
+       .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,
+       .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,
+       .init_search_op_fn = smb_time_audit_init_search_op,
+       .open_fn = smb_time_audit_open,
+       .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,
-       .posix_fallocate = smb_time_audit_posix_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,
+       .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,
+       .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,
+       .notify_watch_fn = smb_time_audit_notify_watch,
+       .chflags_fn = smb_time_audit_chflags,
+       .file_id_create_fn = smb_time_audit_file_id_create,
+       .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_fn = smb_time_audit_strict_lock,
+       .strict_unlock_fn = smb_time_audit_strict_unlock,
+       .translate_name_fn = smb_time_audit_translate_name,
+       .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,
+       .chmod_acl_fn = smb_time_audit_chmod_acl,
+       .fchmod_acl_fn = smb_time_audit_fchmod_acl,
+       .sys_acl_get_entry_fn = smb_time_audit_sys_acl_get_entry,
+       .sys_acl_get_tag_type_fn = smb_time_audit_sys_acl_get_tag_type,
+       .sys_acl_get_permset_fn = smb_time_audit_sys_acl_get_permset,
+       .sys_acl_get_qualifier_fn = smb_time_audit_sys_acl_get_qualifier,
+       .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_clear_perms_fn = smb_time_audit_sys_acl_clear_perms,
+       .sys_acl_add_perm_fn = smb_time_audit_sys_acl_add_perm,
+       .sys_acl_to_text_fn = smb_time_audit_sys_acl_to_text,
+       .sys_acl_init_fn = smb_time_audit_sys_acl_init,
+       .sys_acl_create_entry_fn = smb_time_audit_sys_acl_create_entry,
+       .sys_acl_set_tag_type_fn = smb_time_audit_sys_acl_set_tag_type,
+       .sys_acl_set_qualifier_fn = smb_time_audit_sys_acl_set_qualifier,
+       .sys_acl_set_permset_fn = smb_time_audit_sys_acl_set_permset,
+       .sys_acl_valid_fn = smb_time_audit_sys_acl_valid,
+       .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,
+       .sys_acl_get_perm_fn = smb_time_audit_sys_acl_get_perm,
+       .sys_acl_free_text_fn = smb_time_audit_sys_acl_free_text,
+       .sys_acl_free_acl_fn = smb_time_audit_sys_acl_free_acl,
+       .sys_acl_free_qualifier_fn = smb_time_audit_sys_acl_free_qualifier,
+       .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_read_fn = smb_time_audit_aio_read,
+       .aio_write_fn = smb_time_audit_aio_write,
        .aio_return_fn = smb_time_audit_aio_return,
-       .aio_cancel = smb_time_audit_aio_cancel,
+       .aio_cancel_fn = 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,
+       .aio_fsync_fn = smb_time_audit_aio_fsync,
+       .aio_suspend_fn = smb_time_audit_aio_suspend,
+       .aio_force_fn = smb_time_audit_aio_force,
 };