s3: smbd: Change open_streams_for_delete() to take a struct smb_filename *.
[samba.git] / examples / VFS / skel_transparent.c
index 10b10b88d6f64e59d440432d77c785018d3a52a4..9fc943819d6b7e937c1797ea9b4308614ebf86e8 100644 (file)
@@ -5,6 +5,7 @@
  * Copyright (C) Tim Potter, 1999-2000
  * Copyright (C) Alexander Bokovoy, 2002
  * Copyright (C) Stefan (metze) Metzmacher, 2003
+ * Copyright (C) Jeremy Allison 2009
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include "includes.h"
+#include "../source3/include/includes.h"
+#include "lib/util/tevent_unix.h"
+#include "lib/util/tevent_ntstatus.h"
 
 /* PLEASE,PLEASE READ THE VFS MODULES CHAPTER OF THE 
    SAMBA DEVELOPERS GUIDE!!!!!!
  */
 
 /* If you take this file as template for your module
- * please make sure that you remove all functions you didn't
- * want to implement!!
- *
- * This passthrough operations are useless in reall vfs modules!
+ * please make sure that you remove all skel_XXX() functions you don't
+ * want to implement!! The passthrough operations are not
+ * neccessary in a real module.
  *
  * --metze
  */
 
-static int skel_connect(vfs_handle_struct *handle,  const char *service, const char *user)    
+static int skel_connect(vfs_handle_struct *handle, const char *service,
+                       const char *user)
 {
        return SMB_VFS_NEXT_CONNECT(handle, service, user);
 }
@@ -46,642 +48,1054 @@ static void skel_disconnect(vfs_handle_struct *handle)
        SMB_VFS_NEXT_DISCONNECT(handle);
 }
 
-static uint64_t skel_disk_free(vfs_handle_struct *handle,  const char *path,
-       bool small_query, uint64_t *bsize,
-       uint64_t *dfree, uint64_t *dsize)
+static uint64_t skel_disk_free(vfs_handle_struct *handle, const char *path,
+                              uint64_t *bsize,
+                              uint64_t *dfree, uint64_t *dsize)
 {
-       return SMB_VFS_NEXT_DISK_FREE(handle, path, small_query, bsize, 
-                                        dfree, dsize);
+       return SMB_VFS_NEXT_DISK_FREE(handle, path, bsize, dfree, dsize);
 }
 
-static int skel_get_quota(vfs_handle_struct *handle,  enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dq)
+static int skel_get_quota(vfs_handle_struct *handle, const char *path,
+                         enum SMB_QUOTA_TYPE qtype, unid_t id,
+                         SMB_DISK_QUOTA *dq)
 {
-       return SMB_VFS_NEXT_GET_QUOTA(handle, qtype, id, dq);
+       return SMB_VFS_NEXT_GET_QUOTA(handle, path, qtype, id, dq);
 }
 
-static int skel_set_quota(vfs_handle_struct *handle,  enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dq)
+static int skel_set_quota(vfs_handle_struct *handle, enum SMB_QUOTA_TYPE qtype,
+                         unid_t id, SMB_DISK_QUOTA *dq)
 {
        return SMB_VFS_NEXT_SET_QUOTA(handle, qtype, id, dq);
 }
 
-static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
+static int skel_get_shadow_copy_data(vfs_handle_struct *handle,
+                                    files_struct *fsp,
+                                    struct shadow_copy_data *shadow_copy_data,
+                                    bool labels)
 {
-       return SMB_VFS_NEXT_GET_SHADOW_COPY_DATA(handle, fsp, shadow_copy_data, labels);
+       return SMB_VFS_NEXT_GET_SHADOW_COPY_DATA(handle, fsp, shadow_copy_data,
+                                                labels);
 }
 
-static int skel_statvfs(struct vfs_handle_struct *handle, const char *path, struct vfs_statvfs_struct *statbuf)
+static int skel_statvfs(struct vfs_handle_struct *handle, const char *path,
+                       struct vfs_statvfs_struct *statbuf)
 {
        return SMB_VFS_NEXT_STATVFS(handle, path, statbuf);
 }
 
-static SMB_STRUCT_DIR *skel_opendir(vfs_handle_struct *handle,  const char *fname, const char *mask, uint32 attr)
+static uint32_t skel_fs_capabilities(struct vfs_handle_struct *handle,
+                                    enum timestamp_set_resolution *p_ts_res)
+{
+       return SMB_VFS_NEXT_FS_CAPABILITIES(handle, p_ts_res);
+}
+
+static NTSTATUS skel_get_dfs_referrals(struct vfs_handle_struct *handle,
+                                      struct dfs_GetDFSReferral *r)
+{
+       return SMB_VFS_NEXT_GET_DFS_REFERRALS(handle, r);
+}
+
+static DIR *skel_opendir(vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname,
+                       const char *mask,
+                       uint32_t attr)
+{
+       return SMB_VFS_NEXT_OPENDIR(handle, smb_fname, mask, attr);
+}
+
+static NTSTATUS skel_snap_check_path(struct vfs_handle_struct *handle,
+                                    TALLOC_CTX *mem_ctx,
+                                    const char *service_path,
+                                    char **base_volume)
+{
+       return SMB_VFS_NEXT_SNAP_CHECK_PATH(handle, mem_ctx, service_path,
+                                           base_volume);
+}
+
+static NTSTATUS skel_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)
 {
-       return SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
+       return SMB_VFS_NEXT_SNAP_CREATE(handle, mem_ctx, base_volume, tstamp,
+                                       rw, base_path, snap_path);
 }
 
-static SMB_STRUCT_DIRENT *skel_readdir(vfs_handle_struct *handle,
-                                      SMB_STRUCT_DIR *dirp,
-                                      SMB_STRUCT_STAT *sbuf)
+static NTSTATUS skel_snap_delete(struct vfs_handle_struct *handle,
+                                TALLOC_CTX *mem_ctx,
+                                char *base_path,
+                                char *snap_path)
+{
+       return SMB_VFS_NEXT_SNAP_DELETE(handle, mem_ctx, base_path, snap_path);
+}
+
+static DIR *skel_fdopendir(vfs_handle_struct *handle, files_struct *fsp,
+                          const char *mask, uint32_t attr)
+{
+       return SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr);
+}
+
+static struct dirent *skel_readdir(vfs_handle_struct *handle,
+                                  DIR *dirp, SMB_STRUCT_STAT *sbuf)
 {
        return SMB_VFS_NEXT_READDIR(handle, dirp, sbuf);
 }
 
-static void skel_seekdir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp, long offset)
+static void skel_seekdir(vfs_handle_struct *handle, DIR *dirp, long offset)
 {
-       return SMB_VFS_NEXT_SEEKDIR(handle, dirp, offset);
+       SMB_VFS_NEXT_SEEKDIR(handle, dirp, offset);
 }
 
-static long skel_telldir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp)
+static long skel_telldir(vfs_handle_struct *handle, DIR *dirp)
 {
        return SMB_VFS_NEXT_TELLDIR(handle, dirp);
 }
 
-static void skel_rewinddir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp)
+static void skel_rewind_dir(vfs_handle_struct *handle, DIR *dirp)
 {
-       return SMB_VFS_NEXT_REWINDDIR(handle, dirp);
+       SMB_VFS_NEXT_REWINDDIR(handle, dirp);
 }
 
-static int skel_mkdir(vfs_handle_struct *handle,  const char *path, mode_t mode)
+static int skel_mkdir(vfs_handle_struct *handle,
+               const struct smb_filename *smb_fname,
+               mode_t mode)
 {
-       return SMB_VFS_NEXT_MKDIR(handle, path, mode);
+       return SMB_VFS_NEXT_MKDIR(handle, smb_fname, mode);
 }
 
-static int skel_rmdir(vfs_handle_struct *handle,  const char *path)
+static int skel_rmdir(vfs_handle_struct *handle,
+               const struct smb_filename *smb_fname)
 {
-       return SMB_VFS_NEXT_RMDIR(handle, path);
+       return SMB_VFS_NEXT_RMDIR(handle, smb_fname);
 }
 
-static int skel_closedir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dir)
+static int skel_closedir(vfs_handle_struct *handle, DIR *dir)
 {
        return SMB_VFS_NEXT_CLOSEDIR(handle, dir);
 }
 
+static void skel_init_search_op(struct vfs_handle_struct *handle, DIR *dirp)
+{
+       SMB_VFS_NEXT_INIT_SEARCH_OP(handle, dirp);
+}
+
 static int skel_open(vfs_handle_struct *handle, struct smb_filename *smb_fname,
                     files_struct *fsp, int flags, mode_t mode)
 {
        return SMB_VFS_NEXT_OPEN(handle, smb_fname, fsp, flags, mode);
 }
 
-static int skel_close(vfs_handle_struct *handle, files_struct *fsp)
+static NTSTATUS skel_create_file(struct vfs_handle_struct *handle,
+                                struct smb_request *req,
+                                uint16_t root_dir_fid,
+                                struct smb_filename *smb_fname,
+                                uint32_t access_mask,
+                                uint32_t share_access,
+                                uint32_t create_disposition,
+                                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, int *pinfo,
+                                const struct smb2_create_blobs *in_context_blobs,
+                                struct smb2_create_blobs *out_context_blobs)
+{
+       return SMB_VFS_NEXT_CREATE_FILE(handle,
+                                       req,
+                                       root_dir_fid,
+                                       smb_fname,
+                                       access_mask,
+                                       share_access,
+                                       create_disposition,
+                                       create_options,
+                                       file_attributes,
+                                       oplock_request,
+                                       lease,
+                                       allocation_size,
+                                       private_flags,
+                                       sd, ea_list, result, pinfo,
+                                       in_context_blobs, out_context_blobs);
+}
+
+static int skel_close_fn(vfs_handle_struct *handle, files_struct *fsp)
 {
        return SMB_VFS_NEXT_CLOSE(handle, fsp);
 }
 
-static ssize_t skel_read(vfs_handle_struct *handle, files_struct *fsp, void *data, size_t n)
+static ssize_t skel_vfs_read(vfs_handle_struct *handle, files_struct *fsp,
+                            void *data, size_t n)
 {
        return SMB_VFS_NEXT_READ(handle, fsp, data, n);
 }
 
-static ssize_t skel_pread(vfs_handle_struct *handle, files_struct *fsp, void *data, size_t n, SMB_OFF_T offset)
+static ssize_t skel_pread(vfs_handle_struct *handle, files_struct *fsp,
+                         void *data, size_t n, off_t offset)
 {
        return SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);
 }
 
-static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, const void *data, size_t n)
+struct skel_pread_state {
+       ssize_t ret;
+       struct vfs_aio_state vfs_aio_state;
+};
+
+static void skel_pread_done(struct tevent_req *subreq);
+
+static struct tevent_req *skel_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)
 {
-       return SMB_VFS_NEXT_WRITE(handle, fsp, data, n);
+       struct tevent_req *req, *subreq;
+       struct skel_pread_state *state;
+
+       req = tevent_req_create(mem_ctx, &state, struct skel_pread_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       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, skel_pread_done, req);
+       return req;
 }
 
-static ssize_t skel_pwrite(vfs_handle_struct *handle, files_struct *fsp, const void *data, size_t n, SMB_OFF_T offset)
+static void skel_pread_done(struct tevent_req *subreq)
 {
-       return SMB_VFS_NEXT_PWRITE(handle, fsp, data, n, offset);
+       struct tevent_req *req =
+           tevent_req_callback_data(subreq, struct tevent_req);
+       struct skel_pread_state *state =
+           tevent_req_data(req, struct skel_pread_state);
+
+       state->ret = SMB_VFS_PREAD_RECV(subreq, &state->vfs_aio_state);
+       TALLOC_FREE(subreq);
+       tevent_req_done(req);
 }
 
-static SMB_OFF_T skel_lseek(vfs_handle_struct *handle, files_struct *fsp, SMB_OFF_T offset, int whence)
+static ssize_t skel_pread_recv(struct tevent_req *req,
+                              struct vfs_aio_state *vfs_aio_state)
 {
-       return SMB_VFS_NEXT_LSEEK(handle, fsp, offset, whence);
+       struct skel_pread_state *state =
+           tevent_req_data(req, struct skel_pread_state);
+
+       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 skel_sendfile(vfs_handle_struct *handle, int tofd, files_struct *fromfsp, const DATA_BLOB *hdr, SMB_OFF_T offset, size_t n)
+static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp,
+                         const void *data, size_t n)
 {
-       return SMB_VFS_NEXT_SENDFILE(handle, tofd, fromfsp, hdr, offset, n);
+       return SMB_VFS_NEXT_WRITE(handle, fsp, data, n);
 }
 
-static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, files_struct *tofsp, SMB_OFF_T offset, size_t n)
+static ssize_t skel_pwrite(vfs_handle_struct *handle, files_struct *fsp,
+                          const void *data, size_t n, off_t offset)
 {
-       return SMB_VFS_NEXT_RECVFILE(handle, fromfd, tofsp, offset, n);
+       return SMB_VFS_NEXT_PWRITE(handle, fsp, data, n, offset);
 }
 
-static int skel_rename(vfs_handle_struct *handle,  const char *oldname, const char *newname)
+struct skel_pwrite_state {
+       ssize_t ret;
+       struct vfs_aio_state vfs_aio_state;
+};
+
+static void skel_pwrite_done(struct tevent_req *subreq);
+
+static struct tevent_req *skel_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)
 {
-       return SMB_VFS_NEXT_RENAME(handle, oldname, newname);
+       struct tevent_req *req, *subreq;
+       struct skel_pwrite_state *state;
+
+       req = tevent_req_create(mem_ctx, &state, struct skel_pwrite_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       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, skel_pwrite_done, req);
+       return req;
 }
 
-static int skel_fsync(vfs_handle_struct *handle, files_struct *fsp)
+static void skel_pwrite_done(struct tevent_req *subreq)
 {
-       return SMB_VFS_NEXT_FSYNC(handle, fsp);
+       struct tevent_req *req =
+           tevent_req_callback_data(subreq, struct tevent_req);
+       struct skel_pwrite_state *state =
+           tevent_req_data(req, struct skel_pwrite_state);
+
+       state->ret = SMB_VFS_PWRITE_RECV(subreq, &state->vfs_aio_state);
+       TALLOC_FREE(subreq);
+       tevent_req_done(req);
 }
 
-static int skel_stat(vfs_handle_struct *handle, struct smb_filename *smb_fname)
+static ssize_t skel_pwrite_recv(struct tevent_req *req,
+                               struct vfs_aio_state *vfs_aio_state)
 {
-       return SMB_VFS_NEXT_STAT(handle, smb_fname);
+       struct skel_pwrite_state *state =
+           tevent_req_data(req, struct skel_pwrite_state);
+
+       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 skel_fstat(vfs_handle_struct *handle, files_struct *fsp, SMB_STRUCT_STAT *sbuf)
+static off_t skel_lseek(vfs_handle_struct *handle, files_struct *fsp,
+                       off_t offset, int whence)
 {
-       return SMB_VFS_NEXT_FSTAT(handle, fsp, sbuf);
+       return SMB_VFS_NEXT_LSEEK(handle, fsp, offset, whence);
 }
 
-static int skel_lstat(vfs_handle_struct *handle, struct smb_filename *smb_fname)
+static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd,
+                            files_struct *fromfsp, const DATA_BLOB *hdr,
+                            off_t offset, size_t n)
 {
-       return SMB_VFS_NEXT_LSTAT(handle, smb_fname);
+       return SMB_VFS_NEXT_SENDFILE(handle, tofd, fromfsp, hdr, offset, n);
 }
 
-static int skel_unlink(vfs_handle_struct *handle,  const char *path)
+static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd,
+                            files_struct *tofsp, off_t offset, size_t n)
 {
-       return SMB_VFS_NEXT_UNLINK(handle, path);
+       return SMB_VFS_NEXT_RECVFILE(handle, fromfd, tofsp, offset, n);
 }
 
-static int skel_chmod(vfs_handle_struct *handle,  const char *path, mode_t mode)
+static int skel_rename(vfs_handle_struct *handle,
+                      const struct smb_filename *smb_fname_src,
+                      const struct smb_filename *smb_fname_dst)
 {
-       return SMB_VFS_NEXT_CHMOD(handle, path, mode);
+       return SMB_VFS_NEXT_RENAME(handle, smb_fname_src, smb_fname_dst);
 }
 
-static int skel_fchmod(vfs_handle_struct *handle, files_struct *fsp, mode_t mode)
+static int skel_fsync(vfs_handle_struct *handle, files_struct *fsp)
 {
-       return SMB_VFS_NEXT_FCHMOD(handle, fsp, mode);
+       return SMB_VFS_NEXT_FSYNC(handle, fsp);
 }
 
-static int skel_chown(vfs_handle_struct *handle,  const char *path, uid_t uid, gid_t gid)
+struct skel_fsync_state {
+       int ret;
+       struct vfs_aio_state vfs_aio_state;
+};
+
+static void skel_fsync_done(struct tevent_req *subreq);
+
+static struct tevent_req *skel_fsync_send(struct vfs_handle_struct *handle,
+                                         TALLOC_CTX *mem_ctx,
+                                         struct tevent_context *ev,
+                                         struct files_struct *fsp)
 {
-       return SMB_VFS_NEXT_CHOWN(handle, path, uid, gid);
+       struct tevent_req *req, *subreq;
+       struct skel_fsync_state *state;
+
+       req = tevent_req_create(mem_ctx, &state, struct skel_fsync_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       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, skel_fsync_done, req);
+       return req;
 }
 
-static int skel_fchown(vfs_handle_struct *handle, files_struct *fsp, uid_t uid, gid_t gid)
+static void skel_fsync_done(struct tevent_req *subreq)
 {
-       return SMB_VFS_NEXT_FCHOWN(handle, fsp, uid, gid);
+       struct tevent_req *req =
+           tevent_req_callback_data(subreq, struct tevent_req);
+       struct skel_fsync_state *state =
+           tevent_req_data(req, struct skel_fsync_state);
+
+       state->ret = SMB_VFS_FSYNC_RECV(subreq, &state->vfs_aio_state);
+       TALLOC_FREE(subreq);
+       tevent_req_done(req);
 }
 
-static int skel_lchown(vfs_handle_struct *handle,  const char *path, uid_t uid, gid_t gid)
+static int skel_fsync_recv(struct tevent_req *req,
+                          struct vfs_aio_state *vfs_aio_state)
 {
-       return SMB_VFS_NEXT_LCHOWN(handle, path, uid, gid);
+       struct skel_fsync_state *state =
+           tevent_req_data(req, struct skel_fsync_state);
+
+       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 skel_chdir(vfs_handle_struct *handle,  const char *path)
+static int skel_stat(vfs_handle_struct *handle, struct smb_filename *smb_fname)
 {
-       return SMB_VFS_NEXT_CHDIR(handle, path);
+       return SMB_VFS_NEXT_STAT(handle, smb_fname);
 }
 
-static char *skel_getwd(vfs_handle_struct *handle,  char *buf)
+static int skel_fstat(vfs_handle_struct *handle, files_struct *fsp,
+                     SMB_STRUCT_STAT *sbuf)
 {
-       return SMB_VFS_NEXT_GETWD(handle, buf);
+       return SMB_VFS_NEXT_FSTAT(handle, fsp, sbuf);
 }
 
-static int skel_ntimes(vfs_handle_struct *handle,  const char *path, struct smb_file_time *ft)
+static int skel_lstat(vfs_handle_struct *handle,
+                     struct smb_filename *smb_fname)
 {
-       return SMB_VFS_NEXT_NTIMES(handle, path, ft);
+       return SMB_VFS_NEXT_LSTAT(handle, smb_fname);
 }
 
-static int skel_ftruncate(vfs_handle_struct *handle, files_struct *fsp, SMB_OFF_T offset)
+static uint64_t skel_get_alloc_size(struct vfs_handle_struct *handle,
+                                   struct files_struct *fsp,
+                                   const SMB_STRUCT_STAT *sbuf)
 {
-       return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, offset);
+       return SMB_VFS_NEXT_GET_ALLOC_SIZE(handle, fsp, sbuf);
 }
 
-static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int op, SMB_OFF_T offset, SMB_OFF_T count, int type)
+static int skel_unlink(vfs_handle_struct *handle,
+                      const struct smb_filename *smb_fname)
 {
-       return SMB_VFS_NEXT_LOCK(handle, fsp, op, offset, count, type);
+       return SMB_VFS_NEXT_UNLINK(handle, smb_fname);
 }
 
-static bool skel_getlock(vfs_handle_struct *handle, files_struct *fsp, SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid)
+static int skel_chmod(vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname,
+                       mode_t mode)
 {
-       return SMB_VFS_NEXT_GETLOCK(handle, fsp, poffset, pcount, ptype, ppid);
+       return SMB_VFS_NEXT_CHMOD(handle, smb_fname, mode);
 }
 
-static int skel_symlink(vfs_handle_struct *handle,  const char *oldpath, const char *newpath)
+static int skel_fchmod(vfs_handle_struct *handle, files_struct *fsp,
+                      mode_t mode)
 {
-       return SMB_VFS_NEXT_SYMLINK(handle, oldpath, newpath);
+       return SMB_VFS_NEXT_FCHMOD(handle, fsp, mode);
 }
 
-static int skel_readlink(vfs_handle_struct *handle,  const char *path, char *buf, size_t bufsiz)
+static int skel_chown(vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname,
+                       uid_t uid,
+                       gid_t gid)
 {
-       return SMB_VFS_NEXT_READLINK(handle, path, buf, bufsiz);
+       return SMB_VFS_NEXT_CHOWN(handle, smb_fname, uid, gid);
 }
 
-static int skel_link(vfs_handle_struct *handle,  const char *oldpath, const char *newpath)
+static int skel_fchown(vfs_handle_struct *handle, files_struct *fsp,
+                      uid_t uid, gid_t gid)
 {
-       return SMB_VFS_NEXT_LINK(handle, oldpath, newpath);
+       return SMB_VFS_NEXT_FCHOWN(handle, fsp, uid, gid);
 }
 
-static int skel_mknod(vfs_handle_struct *handle,  const char *path, mode_t mode, SMB_DEV_T dev)
+static int skel_lchown(vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname,
+                       uid_t uid,
+                       gid_t gid)
 {
-       return SMB_VFS_NEXT_MKNOD(handle, path, mode, dev);
+       return SMB_VFS_NEXT_LCHOWN(handle, smb_fname, uid, gid);
 }
 
-static char *skel_realpath(vfs_handle_struct *handle,  const char *path, char *resolved_path)
+static int skel_chdir(vfs_handle_struct *handle, const char *path)
 {
-       return SMB_VFS_NEXT_REALPATH(handle, path, resolved_path);
+       return SMB_VFS_NEXT_CHDIR(handle, path);
 }
 
-static NTSTATUS skel_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)
+static char *skel_getwd(vfs_handle_struct *handle)
 {
-       return SMB_VFS_NEXT_NOTIFY_WATCH(handle, ctx, e, callback,
-               private_data, handle_p);
+       return SMB_VFS_NEXT_GETWD(handle);
 }
 
-static int skel_chflags(vfs_handle_struct *handle,  const char *path, uint flags)
+static int skel_ntimes(vfs_handle_struct *handle,
+                      const struct smb_filename *smb_fname,
+                      struct smb_file_time *ft)
 {
-       return SMB_VFS_NEXT_CHFLAGS(handle, path, flags);
+       return SMB_VFS_NEXT_NTIMES(handle, smb_fname, ft);
 }
 
-static struct file_id skel_file_id_create(vfs_handle_struct *handle,
-                                         const SMB_STRUCT_STAT *sbuf)
+static int skel_ftruncate(vfs_handle_struct *handle, files_struct *fsp,
+                         off_t offset)
 {
-       return SMB_VFS_NEXT_FILE_ID_CREATE(handle, sbuf);
+       return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, offset);
 }
 
-static NTSTATUS skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-       uint32 security_info, SEC_DESC **ppdesc)
+static int skel_fallocate(vfs_handle_struct *handle, files_struct *fsp,
+                         uint32_t mode, off_t offset, off_t len)
 {
-       return SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp, security_info, ppdesc);
+       return SMB_VFS_NEXT_FALLOCATE(handle, fsp, mode, offset, len);
 }
 
-static NTSTATUS skel_get_nt_acl(vfs_handle_struct *handle,
-       const char *name, uint32 security_info, SEC_DESC **ppdesc)
+static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int op,
+                     off_t offset, off_t count, int type)
 {
-       return SMB_VFS_NEXT_GET_NT_ACL(handle, name, security_info, ppdesc);
+       return SMB_VFS_NEXT_LOCK(handle, fsp, op, offset, count, type);
 }
 
-static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-       uint32 security_info_sent, const SEC_DESC *psd)
+static int skel_kernel_flock(struct vfs_handle_struct *handle,
+                            struct files_struct *fsp, uint32_t share_mode,
+                            uint32_t access_mask)
 {
-       return SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd);
+       return SMB_VFS_NEXT_KERNEL_FLOCK(handle, fsp, share_mode, access_mask);
 }
 
-static int skel_chmod_acl(vfs_handle_struct *handle,  const char *name, mode_t mode)
+static int skel_linux_setlease(struct vfs_handle_struct *handle,
+                              struct files_struct *fsp, int leasetype)
 {
-       /* If the underlying VFS doesn't have ACL support... */
-       if (!handle->vfs_next.ops.chmod_acl) {
-               errno = ENOSYS;
-               return -1;
-       }
-       return SMB_VFS_NEXT_CHMOD_ACL(handle, name, mode);
+       return SMB_VFS_NEXT_LINUX_SETLEASE(handle, fsp, leasetype);
 }
 
-static int skel_fchmod_acl(vfs_handle_struct *handle, files_struct *fsp, mode_t mode)
+static bool skel_getlock(vfs_handle_struct *handle, files_struct *fsp,
+                        off_t *poffset, off_t *pcount, int *ptype,
+                        pid_t *ppid)
 {
-       /* If the underlying VFS doesn't have ACL support... */
-       if (!handle->vfs_next.ops.fchmod_acl) {
-               errno = ENOSYS;
-               return -1;
-       }
-       return SMB_VFS_NEXT_FCHMOD_ACL(handle, fsp, mode);
+       return SMB_VFS_NEXT_GETLOCK(handle, fsp, poffset, pcount, ptype, ppid);
 }
 
-static int skel_sys_acl_get_entry(vfs_handle_struct *handle,  SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
+static int skel_symlink(vfs_handle_struct *handle, const char *oldpath,
+                       const char *newpath)
 {
-       return SMB_VFS_NEXT_SYS_ACL_GET_ENTRY(handle, theacl, entry_id, entry_p);
+       return SMB_VFS_NEXT_SYMLINK(handle, oldpath, newpath);
 }
 
-static int skel_sys_acl_get_tag_type(vfs_handle_struct *handle,  SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
+static int skel_vfs_readlink(vfs_handle_struct *handle, const char *path,
+                            char *buf, size_t bufsiz)
 {
-       return SMB_VFS_NEXT_SYS_ACL_GET_TAG_TYPE(handle, entry_d, tag_type_p);
+       return SMB_VFS_NEXT_READLINK(handle, path, buf, bufsiz);
 }
 
-static int skel_sys_acl_get_permset(vfs_handle_struct *handle,  SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
+static int skel_link(vfs_handle_struct *handle, const char *oldpath,
+                    const char *newpath)
 {
-       return SMB_VFS_NEXT_SYS_ACL_GET_PERMSET(handle, entry_d, permset_p);
+       return SMB_VFS_NEXT_LINK(handle, oldpath, newpath);
 }
 
-static void *skel_sys_acl_get_qualifier(vfs_handle_struct *handle,  SMB_ACL_ENTRY_T entry_d)
+static int skel_mknod(vfs_handle_struct *handle, const char *path, mode_t mode,
+                     SMB_DEV_T dev)
 {
-       return SMB_VFS_NEXT_SYS_ACL_GET_QUALIFIER(handle, entry_d);
+       return SMB_VFS_NEXT_MKNOD(handle, path, mode, dev);
 }
 
-static SMB_ACL_T skel_sys_acl_get_file(vfs_handle_struct *handle,  const char *path_p, SMB_ACL_TYPE_T type)
+static char *skel_realpath(vfs_handle_struct *handle, const char *path)
 {
-       return SMB_VFS_NEXT_SYS_ACL_GET_FILE(handle, path_p, type);
+       return SMB_VFS_NEXT_REALPATH(handle, path);
 }
 
-static SMB_ACL_T skel_sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp)
+static int skel_chflags(vfs_handle_struct *handle, const char *path,
+                       uint flags)
 {
-       return SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp);
+       return SMB_VFS_NEXT_CHFLAGS(handle, path, flags);
 }
 
-static int skel_sys_acl_clear_perms(vfs_handle_struct *handle,  SMB_ACL_PERMSET_T permset)
+static struct file_id skel_file_id_create(vfs_handle_struct *handle,
+                                         const SMB_STRUCT_STAT *sbuf)
 {
-       return SMB_VFS_NEXT_SYS_ACL_CLEAR_PERMS(handle, permset);
+       return SMB_VFS_NEXT_FILE_ID_CREATE(handle, sbuf);
 }
 
-static int skel_sys_acl_add_perm(vfs_handle_struct *handle,  SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
+struct skel_cc_state {
+       struct vfs_handle_struct *handle;
+       off_t copied;
+};
+static void skel_copy_chunk_done(struct tevent_req *subreq);
+
+static struct tevent_req *skel_copy_chunk_send(struct vfs_handle_struct *handle,
+                                              TALLOC_CTX *mem_ctx,
+                                              struct tevent_context *ev,
+                                              struct files_struct *src_fsp,
+                                              off_t src_off,
+                                              struct files_struct *dest_fsp,
+                                              off_t dest_off,
+                                              off_t num)
+{
+       struct tevent_req *req;
+       struct tevent_req *subreq;
+       struct skel_cc_state *cc_state;
+
+       req = tevent_req_create(mem_ctx, &cc_state, struct skel_cc_state);
+       if (req == NULL) {
+               return NULL;
+       }
+
+       cc_state->handle = handle;
+       subreq = SMB_VFS_NEXT_COPY_CHUNK_SEND(handle, cc_state, ev,
+                                             src_fsp, src_off,
+                                             dest_fsp, dest_off, num);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+
+       tevent_req_set_callback(subreq, skel_copy_chunk_done, req);
+       return req;
+}
+
+static void skel_copy_chunk_done(struct tevent_req *subreq)
 {
-       return SMB_VFS_NEXT_SYS_ACL_ADD_PERM(handle, permset, perm);
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct skel_cc_state *cc_state
+                       = tevent_req_data(req, struct skel_cc_state);
+       NTSTATUS status;
+
+       status = SMB_VFS_NEXT_COPY_CHUNK_RECV(cc_state->handle,
+                                             subreq,
+                                             &cc_state->copied);
+       TALLOC_FREE(subreq);
+       if (tevent_req_nterror(req, status)) {
+               return;
+       }
+       tevent_req_done(req);
 }
 
-static char *skel_sys_acl_to_text(vfs_handle_struct *handle,  SMB_ACL_T theacl, ssize_t *plen)
+static NTSTATUS skel_copy_chunk_recv(struct vfs_handle_struct *handle,
+                                    struct tevent_req *req,
+                                    off_t *copied)
 {
-       return SMB_VFS_NEXT_SYS_ACL_TO_TEXT(handle, theacl, plen);
+       struct skel_cc_state *cc_state
+                       = tevent_req_data(req, struct skel_cc_state);
+       NTSTATUS status;
+
+       *copied = cc_state->copied;
+       if (tevent_req_is_nterror(req, &status)) {
+               tevent_req_received(req);
+               return status;
+       }
+
+       tevent_req_received(req);
+       return NT_STATUS_OK;
 }
 
-static SMB_ACL_T skel_sys_acl_init(vfs_handle_struct *handle,  int count)
+static NTSTATUS skel_get_compression(struct vfs_handle_struct *handle,
+                                    TALLOC_CTX *mem_ctx,
+                                    struct files_struct *fsp,
+                                    struct smb_filename *smb_fname,
+                                    uint16_t *_compression_fmt)
 {
-       return SMB_VFS_NEXT_SYS_ACL_INIT(handle, count);
+       return SMB_VFS_NEXT_GET_COMPRESSION(handle, mem_ctx, fsp, smb_fname,
+                                           _compression_fmt);
 }
 
-static int skel_sys_acl_create_entry(vfs_handle_struct *handle,  SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
+static NTSTATUS skel_set_compression(struct vfs_handle_struct *handle,
+                                    TALLOC_CTX *mem_ctx,
+                                    struct files_struct *fsp,
+                                    uint16_t compression_fmt)
 {
-       return SMB_VFS_NEXT_SYS_ACL_CREATE_ENTRY(handle, pacl, pentry);
+       return SMB_VFS_NEXT_SET_COMPRESSION(handle, mem_ctx, fsp,
+                                           compression_fmt);
 }
 
-static int skel_sys_acl_set_tag_type(vfs_handle_struct *handle,  SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
+static NTSTATUS skel_streaminfo(struct vfs_handle_struct *handle,
+                               struct files_struct *fsp,
+                               const struct smb_filename *smb_fname,
+                               TALLOC_CTX *mem_ctx,
+                               unsigned int *num_streams,
+                               struct stream_struct **streams)
 {
-       return SMB_VFS_NEXT_SYS_ACL_SET_TAG_TYPE(handle, entry, tagtype);
+       return SMB_VFS_NEXT_STREAMINFO(handle,
+                               fsp,
+                               smb_fname,
+                               mem_ctx,
+                               num_streams,
+                               streams);
 }
 
-static int skel_sys_acl_set_qualifier(vfs_handle_struct *handle,  SMB_ACL_ENTRY_T entry, void *qual)
+static int skel_get_real_filename(struct vfs_handle_struct *handle,
+                                 const char *path,
+                                 const char *name,
+                                 TALLOC_CTX *mem_ctx, char **found_name)
 {
-       return SMB_VFS_NEXT_SYS_ACL_SET_QUALIFIER(handle, entry, qual);
+       return SMB_VFS_NEXT_GET_REAL_FILENAME(handle,
+                                             path, name, mem_ctx, found_name);
 }
 
-static int skel_sys_acl_set_permset(vfs_handle_struct *handle,  SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
+static const char *skel_connectpath(struct vfs_handle_struct *handle,
+                                   const char *filename)
 {
-       return SMB_VFS_NEXT_SYS_ACL_SET_PERMSET(handle, entry, permset);
+       return SMB_VFS_NEXT_CONNECTPATH(handle, filename);
 }
 
-static int skel_sys_acl_valid(vfs_handle_struct *handle,  SMB_ACL_T theacl )
+static NTSTATUS skel_brl_lock_windows(struct vfs_handle_struct *handle,
+                                     struct byte_range_lock *br_lck,
+                                     struct lock_struct *plock,
+                                     bool blocking_lock)
 {
-       return SMB_VFS_NEXT_SYS_ACL_VALID(handle, theacl);
+       return SMB_VFS_NEXT_BRL_LOCK_WINDOWS(handle,
+                                            br_lck, plock, blocking_lock);
 }
 
-static int skel_sys_acl_set_file(vfs_handle_struct *handle,  const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
+static bool skel_brl_unlock_windows(struct vfs_handle_struct *handle,
+                                   struct messaging_context *msg_ctx,
+                                   struct byte_range_lock *br_lck,
+                                   const struct lock_struct *plock)
 {
-       return SMB_VFS_NEXT_SYS_ACL_SET_FILE(handle, name, acltype, theacl);
+       return SMB_VFS_NEXT_BRL_UNLOCK_WINDOWS(handle, msg_ctx, br_lck, plock);
 }
 
-static int skel_sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp, SMB_ACL_T theacl)
+static bool skel_brl_cancel_windows(struct vfs_handle_struct *handle,
+                                   struct byte_range_lock *br_lck,
+                                   struct lock_struct *plock)
 {
-       return SMB_VFS_NEXT_SYS_ACL_SET_FD(handle, fsp, theacl);
+       return SMB_VFS_NEXT_BRL_CANCEL_WINDOWS(handle, br_lck, plock);
 }
 
-static int skel_sys_acl_delete_def_file(vfs_handle_struct *handle,  const char *path)
+static bool skel_strict_lock(struct vfs_handle_struct *handle,
+                            struct files_struct *fsp,
+                            struct lock_struct *plock)
 {
-       return SMB_VFS_NEXT_SYS_ACL_DELETE_DEF_FILE(handle, path);
+       return SMB_VFS_NEXT_STRICT_LOCK(handle, fsp, plock);
 }
 
-static int skel_sys_acl_get_perm(vfs_handle_struct *handle,  SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
+static void skel_strict_unlock(struct vfs_handle_struct *handle,
+                              struct files_struct *fsp,
+                              struct lock_struct *plock)
 {
-       return SMB_VFS_NEXT_SYS_ACL_GET_PERM(handle, permset, perm);
+       SMB_VFS_NEXT_STRICT_UNLOCK(handle, fsp, plock);
 }
 
-static int skel_sys_acl_free_text(vfs_handle_struct *handle,  char *text)
+static NTSTATUS skel_translate_name(struct vfs_handle_struct *handle,
+                                   const char *mapped_name,
+                                   enum vfs_translate_direction direction,
+                                   TALLOC_CTX *mem_ctx, char **pmapped_name)
 {
-       return SMB_VFS_NEXT_SYS_ACL_FREE_TEXT(handle, text);
+       return SMB_VFS_NEXT_TRANSLATE_NAME(handle, mapped_name, direction,
+                                          mem_ctx, pmapped_name);
 }
 
-static int skel_sys_acl_free_acl(vfs_handle_struct *handle,  SMB_ACL_T posix_acl)
+static NTSTATUS skel_fsctl(struct vfs_handle_struct *handle,
+                          struct files_struct *fsp,
+                          TALLOC_CTX *ctx,
+                          uint32_t function,
+                          uint16_t req_flags,  /* Needed for UNICODE ... */
+                          const uint8_t *_in_data,
+                          uint32_t in_len,
+                          uint8_t ** _out_data,
+                          uint32_t max_out_len, uint32_t *out_len)
 {
-       return SMB_VFS_NEXT_SYS_ACL_FREE_ACL(handle, posix_acl);
+       return SMB_VFS_NEXT_FSCTL(handle,
+                                 fsp,
+                                 ctx,
+                                 function,
+                                 req_flags,
+                                 _in_data,
+                                 in_len, _out_data, max_out_len, out_len);
 }
 
-static int skel_sys_acl_free_qualifier(vfs_handle_struct *handle,  void *qualifier, SMB_ACL_TAG_T tagtype)
+static NTSTATUS skel_readdir_attr(struct vfs_handle_struct *handle,
+                                 const struct smb_filename *fname,
+                                 TALLOC_CTX *mem_ctx,
+                                 struct readdir_attr_data **pattr_data)
 {
-       return SMB_VFS_NEXT_SYS_ACL_FREE_QUALIFIER(handle, qualifier, tagtype);
+       return SMB_VFS_NEXT_READDIR_ATTR(handle, fname, mem_ctx, pattr_data);
 }
 
-static ssize_t skel_getxattr(vfs_handle_struct *handle, const char *path, const char *name, void *value, size_t size)
+static NTSTATUS skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+                                uint32_t security_info,
+                                TALLOC_CTX *mem_ctx,
+                                struct security_descriptor **ppdesc)
 {
-        return SMB_VFS_NEXT_GETXATTR(handle, path, name, value, size);
+       return SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp, security_info, mem_ctx,
+                                       ppdesc);
 }
 
-static ssize_t skel_lgetxattr(vfs_handle_struct *handle, const char *path, const char *name, void *value, size_t
-size)
+static NTSTATUS skel_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)
 {
-        return SMB_VFS_NEXT_LGETXATTR(handle, path, name, value, size);
+       return SMB_VFS_NEXT_GET_NT_ACL(handle,
+                               smb_fname,
+                               security_info,
+                               mem_ctx,
+                               ppdesc);
 }
 
-static ssize_t skel_fgetxattr(vfs_handle_struct *handle, struct files_struct *fsp, const char *name, void *value, size_t size)
+static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+                                uint32_t security_info_sent,
+                                const struct security_descriptor *psd)
 {
-        return SMB_VFS_NEXT_FGETXATTR(handle, fsp, name, value, size);
+       return SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd);
 }
 
-static ssize_t skel_listxattr(vfs_handle_struct *handle, const char *path, char *list, size_t size)
+static int skel_chmod_acl(vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname,
+                       mode_t mode)
 {
-        return SMB_VFS_NEXT_LISTXATTR(handle, path, list, size);
+       return SMB_VFS_NEXT_CHMOD_ACL(handle, smb_fname, mode);
 }
 
-static ssize_t skel_llistxattr(vfs_handle_struct *handle, const char *path, char *list, size_t size)
+static int skel_fchmod_acl(vfs_handle_struct *handle, files_struct *fsp,
+                          mode_t mode)
 {
-        return SMB_VFS_NEXT_LLISTXATTR(handle, path, list, size);
+       return SMB_VFS_NEXT_FCHMOD_ACL(handle, fsp, mode);
 }
 
-static ssize_t skel_flistxattr(vfs_handle_struct *handle, struct files_struct *fsp, char *list, size_t size)
+static SMB_ACL_T skel_sys_acl_get_file(vfs_handle_struct *handle,
+                                      const char *path_p,
+                                      SMB_ACL_TYPE_T type,
+                                      TALLOC_CTX *mem_ctx)
 {
-        return SMB_VFS_NEXT_FLISTXATTR(handle, fsp, list, size);
+       return SMB_VFS_NEXT_SYS_ACL_GET_FILE(handle, path_p, type, mem_ctx);
 }
 
-static int skel_removexattr(vfs_handle_struct *handle, const char *path, const char *name)
+static SMB_ACL_T skel_sys_acl_get_fd(vfs_handle_struct *handle,
+                                    files_struct *fsp, TALLOC_CTX *mem_ctx)
 {
-        return SMB_VFS_NEXT_REMOVEXATTR(handle, path, name);
+       return SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp, mem_ctx);
 }
 
-static int skel_lremovexattr(vfs_handle_struct *handle, const char *path, const char *name)
+static int skel_sys_acl_blob_get_file(vfs_handle_struct *handle,
+                                     const char *path_p, TALLOC_CTX *mem_ctx,
+                                     char **blob_description, DATA_BLOB *blob)
 {
-        return SMB_VFS_NEXT_LREMOVEXATTR(handle, path, name);
+       return SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FILE(handle, path_p, mem_ctx,
+                                                 blob_description, blob);
 }
 
-static int skel_fremovexattr(vfs_handle_struct *handle, struct files_struct *fsp, const char *name)
+static int skel_sys_acl_blob_get_fd(vfs_handle_struct *handle,
+                                   files_struct *fsp, TALLOC_CTX *mem_ctx,
+                                   char **blob_description, DATA_BLOB *blob)
 {
-        return SMB_VFS_NEXT_FREMOVEXATTR(handle, fsp, name);
+       return SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FD(handle, fsp, mem_ctx,
+                                               blob_description, blob);
 }
 
-static int skel_setxattr(vfs_handle_struct *handle, const char *path, const char *name, const void *value, size_t size, int flags)
+static int skel_sys_acl_set_file(vfs_handle_struct *handle, const char *name,
+                                SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
 {
-        return SMB_VFS_NEXT_SETXATTR(handle, path, name, value, size, flags);
+       return SMB_VFS_NEXT_SYS_ACL_SET_FILE(handle, name, acltype, theacl);
 }
 
-static int skel_lsetxattr(vfs_handle_struct *handle, const char *path, const char *name, const void *value, size_t size, int flags)
+static int skel_sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
+                              SMB_ACL_T theacl)
 {
-        return SMB_VFS_NEXT_LSETXATTR(handle, path, name, value, size, flags);
+       return SMB_VFS_NEXT_SYS_ACL_SET_FD(handle, fsp, theacl);
 }
 
-static int skel_fsetxattr(vfs_handle_struct *handle, struct files_struct *fsp, const char *name, const void *value, size_t size, int flags)
+static int skel_sys_acl_delete_def_file(vfs_handle_struct *handle,
+                                       const char *path)
 {
-        return SMB_VFS_NEXT_FSETXATTR(handle, fsp, name, value, size, flags);
+       return SMB_VFS_NEXT_SYS_ACL_DELETE_DEF_FILE(handle, path);
 }
 
-static int skel_aio_read(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
+static ssize_t skel_getxattr(vfs_handle_struct *handle, const char *path,
+                            const char *name, void *value, size_t size)
 {
-       return SMB_VFS_NEXT_AIO_READ(handle, fsp, aiocb);
+       return SMB_VFS_NEXT_GETXATTR(handle, path, name, value, size);
 }
 
-static int skel_aio_write(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
+static ssize_t skel_fgetxattr(vfs_handle_struct *handle,
+                             struct files_struct *fsp, const char *name,
+                             void *value, size_t size)
 {
-       return SMB_VFS_NEXT_AIO_WRITE(handle, fsp, aiocb);
+       return SMB_VFS_NEXT_FGETXATTR(handle, fsp, name, value, size);
 }
 
-static ssize_t skel_aio_return(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
+static ssize_t skel_listxattr(vfs_handle_struct *handle, const char *path,
+                             char *list, size_t size)
 {
-       return SMB_VFS_NEXT_AIO_RETURN(handle, fsp, aiocb);
+       return SMB_VFS_NEXT_LISTXATTR(handle, path, list, size);
 }
 
-static int skel_aio_cancel(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
+static ssize_t skel_flistxattr(vfs_handle_struct *handle,
+                              struct files_struct *fsp, char *list,
+                              size_t size)
 {
-       return SMB_VFS_NEXT_AIO_CANCEL(handle, fsp, aiocb);
+       return SMB_VFS_NEXT_FLISTXATTR(handle, fsp, list, size);
 }
 
-static int skel_aio_error(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
+static int skel_removexattr(vfs_handle_struct *handle, const char *path,
+                           const char *name)
 {
-       return SMB_VFS_NEXT_AIO_ERROR(handle, fsp, aiocb);
+       return SMB_VFS_NEXT_REMOVEXATTR(handle, path, name);
 }
 
-static int skel_aio_fsync(struct vfs_handle_struct *handle, struct files_struct *fsp, int op, SMB_STRUCT_AIOCB *aiocb)
+static int skel_fremovexattr(vfs_handle_struct *handle,
+                            struct files_struct *fsp, const char *name)
 {
-       return SMB_VFS_NEXT_AIO_FSYNC(handle, fsp, op, aiocb);
+       return SMB_VFS_NEXT_FREMOVEXATTR(handle, fsp, name);
 }
 
-static int skel_aio_suspend(struct vfs_handle_struct *handle, struct files_struct *fsp, const SMB_STRUCT_AIOCB * const aiocb[], int n, const struct timespec *ts)
+static int skel_setxattr(vfs_handle_struct *handle, const char *path,
+                        const char *name, const void *value, size_t size,
+                        int flags)
 {
-       return SMB_VFS_NEXT_AIO_SUSPEND(handle, fsp, aiocb, n, ts);
+       return SMB_VFS_NEXT_SETXATTR(handle, path, name, value, size, flags);
 }
 
-static bool skel_aio_force(struct vfs_handle_struct *handle, struct files_struct *fsp)
+static int skel_fsetxattr(vfs_handle_struct *handle, struct files_struct *fsp,
+                         const char *name, const void *value, size_t size,
+                         int flags)
 {
-        return SMB_VFS_NEXT_AIO_FORCE(handle, fsp);
+       return SMB_VFS_NEXT_FSETXATTR(handle, fsp, name, value, size, flags);
 }
 
-static bool skel_is_offline(struct vfs_handle_struct *handle, const char *path, SMB_STRUCT_STAT *sbuf)
+static bool skel_aio_force(struct vfs_handle_struct *handle,
+                          struct files_struct *fsp)
 {
-       return SMB_VFS_NEXT_IS_OFFLINE(handle, path, sbuf);
+       return SMB_VFS_NEXT_AIO_FORCE(handle, fsp);
 }
 
-static int skel_set_offline(struct vfs_handle_struct *handle, const char *path)
+static bool skel_is_offline(struct vfs_handle_struct *handle,
+                           const struct smb_filename *fname,
+                           SMB_STRUCT_STAT *sbuf)
 {
-       return SMB_VFS_NEXT_SET_OFFLINE(handle, path);
+       return SMB_VFS_NEXT_IS_OFFLINE(handle, fname, sbuf);
 }
 
-static bool skel_is_remotestorage(struct vfs_handle_struct *handle, const char *path)
+static int skel_set_offline(struct vfs_handle_struct *handle,
+                           const struct smb_filename *fname)
 {
-       return SMB_VFS_NEXT_IS_REMOTESTORAGE(handle, path);
+       return SMB_VFS_NEXT_SET_OFFLINE(handle, fname);
 }
 
 /* VFS operations structure */
 
-static vfs_op_tuple skel_op_tuples[] = {
-
+struct vfs_fn_pointers skel_transparent_fns = {
        /* Disk operations */
 
-       {SMB_VFS_OP(skel_connect),                      SMB_VFS_OP_CONNECT,             SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_disconnect),                   SMB_VFS_OP_DISCONNECT,          SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_disk_free),                    SMB_VFS_OP_DISK_FREE,           SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_get_quota),                    SMB_VFS_OP_GET_QUOTA,           SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_set_quota),                    SMB_VFS_OP_SET_QUOTA,           SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_get_shadow_copy_data),         SMB_VFS_OP_GET_SHADOW_COPY_DATA,SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_statvfs),                      SMB_VFS_OP_STATVFS,             SMB_VFS_LAYER_TRANSPARENT},
+       .connect_fn = skel_connect,
+       .disconnect_fn = skel_disconnect,
+       .disk_free_fn = skel_disk_free,
+       .get_quota_fn = skel_get_quota,
+       .set_quota_fn = skel_set_quota,
+       .get_shadow_copy_data_fn = skel_get_shadow_copy_data,
+       .statvfs_fn = skel_statvfs,
+       .fs_capabilities_fn = skel_fs_capabilities,
+       .get_dfs_referrals_fn = skel_get_dfs_referrals,
+       .snap_check_path_fn = skel_snap_check_path,
+       .snap_create_fn = skel_snap_create,
+       .snap_delete_fn = skel_snap_delete,
 
        /* Directory operations */
 
-       {SMB_VFS_OP(skel_opendir),                      SMB_VFS_OP_OPENDIR,             SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_readdir),                      SMB_VFS_OP_READDIR,             SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_seekdir),                      SMB_VFS_OP_SEEKDIR,             SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_telldir),                      SMB_VFS_OP_TELLDIR,             SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_rewinddir),                    SMB_VFS_OP_REWINDDIR,           SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_mkdir),                        SMB_VFS_OP_MKDIR,               SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_rmdir),                        SMB_VFS_OP_RMDIR,               SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_closedir),                     SMB_VFS_OP_CLOSEDIR,            SMB_VFS_LAYER_TRANSPARENT},
+       .opendir_fn = skel_opendir,
+       .fdopendir_fn = skel_fdopendir,
+       .readdir_fn = skel_readdir,
+       .seekdir_fn = skel_seekdir,
+       .telldir_fn = skel_telldir,
+       .rewind_dir_fn = skel_rewind_dir,
+       .mkdir_fn = skel_mkdir,
+       .rmdir_fn = skel_rmdir,
+       .closedir_fn = skel_closedir,
+       .init_search_op_fn = skel_init_search_op,
 
        /* File operations */
 
-       {SMB_VFS_OP(skel_open),                         SMB_VFS_OP_OPEN,                SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_close),                        SMB_VFS_OP_CLOSE,               SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_read),                         SMB_VFS_OP_READ,                SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_write),                        SMB_VFS_OP_WRITE,               SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_lseek),                        SMB_VFS_OP_LSEEK,               SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sendfile),                     SMB_VFS_OP_SENDFILE,            SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_recvfile),                     SMB_VFS_OP_RECVFILE,            SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_rename),                       SMB_VFS_OP_RENAME,              SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_fsync),                        SMB_VFS_OP_FSYNC,               SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_stat),                         SMB_VFS_OP_STAT,                SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_fstat),                        SMB_VFS_OP_FSTAT,               SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_lstat),                        SMB_VFS_OP_LSTAT,               SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_unlink),                       SMB_VFS_OP_UNLINK,              SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_chmod),                        SMB_VFS_OP_CHMOD,               SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_fchmod),                       SMB_VFS_OP_FCHMOD,              SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_chown),                        SMB_VFS_OP_CHOWN,               SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_fchown),                       SMB_VFS_OP_FCHOWN,              SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_lchown),                       SMB_VFS_OP_LCHOWN,              SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_chdir),                        SMB_VFS_OP_CHDIR,               SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_getwd),                        SMB_VFS_OP_GETWD,               SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_ntimes),                       SMB_VFS_OP_NTIMES,              SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_ftruncate),                    SMB_VFS_OP_FTRUNCATE,           SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_lock),                         SMB_VFS_OP_LOCK,                SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_getlock),                      SMB_VFS_OP_GETLOCK,             SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_symlink),                      SMB_VFS_OP_SYMLINK,             SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_readlink),                     SMB_VFS_OP_READLINK,            SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_link),                         SMB_VFS_OP_LINK,                SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_mknod),                        SMB_VFS_OP_MKNOD,               SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_realpath),                     SMB_VFS_OP_REALPATH,            SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_notify_watch),                 SMB_VFS_OP_NOTIFY_WATCH,        SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_chflags),                      SMB_VFS_OP_CHFLAGS,             SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_file_id_create),               SMB_VFS_OP_FILE_ID_CREATE,      SMB_VFS_LAYER_TRANSPARENT},
-
-       /* NT File ACL operations */
-
-       {SMB_VFS_OP(skel_fget_nt_acl),                  SMB_VFS_OP_FGET_NT_ACL,         SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_get_nt_acl),                   SMB_VFS_OP_GET_NT_ACL,          SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_fset_nt_acl),                  SMB_VFS_OP_FSET_NT_ACL,         SMB_VFS_LAYER_TRANSPARENT},
-
-       /* POSIX ACL operations */
-
-       {SMB_VFS_OP(skel_chmod_acl),                    SMB_VFS_OP_CHMOD_ACL,           SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_fchmod_acl),                   SMB_VFS_OP_FCHMOD_ACL,          SMB_VFS_LAYER_TRANSPARENT},
-
-       {SMB_VFS_OP(skel_sys_acl_get_entry),            SMB_VFS_OP_SYS_ACL_GET_ENTRY,           SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_get_tag_type),         SMB_VFS_OP_SYS_ACL_GET_TAG_TYPE,        SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_get_permset),          SMB_VFS_OP_SYS_ACL_GET_PERMSET,         SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_get_qualifier),        SMB_VFS_OP_SYS_ACL_GET_QUALIFIER,       SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_get_file),             SMB_VFS_OP_SYS_ACL_GET_FILE,            SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_get_fd),               SMB_VFS_OP_SYS_ACL_GET_FD,              SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_clear_perms),          SMB_VFS_OP_SYS_ACL_CLEAR_PERMS,         SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_add_perm),             SMB_VFS_OP_SYS_ACL_ADD_PERM,            SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_to_text),              SMB_VFS_OP_SYS_ACL_TO_TEXT,             SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_init),                 SMB_VFS_OP_SYS_ACL_INIT,                SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_create_entry),         SMB_VFS_OP_SYS_ACL_CREATE_ENTRY,        SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_set_tag_type),         SMB_VFS_OP_SYS_ACL_SET_TAG_TYPE,        SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_set_qualifier),        SMB_VFS_OP_SYS_ACL_SET_QUALIFIER,       SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_set_permset),          SMB_VFS_OP_SYS_ACL_SET_PERMSET,         SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_valid),                SMB_VFS_OP_SYS_ACL_VALID,               SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_set_file),             SMB_VFS_OP_SYS_ACL_SET_FILE,            SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_set_fd),               SMB_VFS_OP_SYS_ACL_SET_FD,              SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_delete_def_file),      SMB_VFS_OP_SYS_ACL_DELETE_DEF_FILE,     SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_get_perm),             SMB_VFS_OP_SYS_ACL_GET_PERM,            SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_free_text),            SMB_VFS_OP_SYS_ACL_FREE_TEXT,           SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_free_acl),             SMB_VFS_OP_SYS_ACL_FREE_ACL,            SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_sys_acl_free_qualifier),       SMB_VFS_OP_SYS_ACL_FREE_QUALIFIER,      SMB_VFS_LAYER_TRANSPARENT},
+       .open_fn = skel_open,
+       .create_file_fn = skel_create_file,
+       .close_fn = skel_close_fn,
+       .read_fn = skel_vfs_read,
+       .pread_fn = skel_pread,
+       .pread_send_fn = skel_pread_send,
+       .pread_recv_fn = skel_pread_recv,
+       .write_fn = skel_write,
+       .pwrite_fn = skel_pwrite,
+       .pwrite_send_fn = skel_pwrite_send,
+       .pwrite_recv_fn = skel_pwrite_recv,
+       .lseek_fn = skel_lseek,
+       .sendfile_fn = skel_sendfile,
+       .recvfile_fn = skel_recvfile,
+       .rename_fn = skel_rename,
+       .fsync_fn = skel_fsync,
+       .fsync_send_fn = skel_fsync_send,
+       .fsync_recv_fn = skel_fsync_recv,
+       .stat_fn = skel_stat,
+       .fstat_fn = skel_fstat,
+       .lstat_fn = skel_lstat,
+       .get_alloc_size_fn = skel_get_alloc_size,
+       .unlink_fn = skel_unlink,
+       .chmod_fn = skel_chmod,
+       .fchmod_fn = skel_fchmod,
+       .chown_fn = skel_chown,
+       .fchown_fn = skel_fchown,
+       .lchown_fn = skel_lchown,
+       .chdir_fn = skel_chdir,
+       .getwd_fn = skel_getwd,
+       .ntimes_fn = skel_ntimes,
+       .ftruncate_fn = skel_ftruncate,
+       .fallocate_fn = skel_fallocate,
+       .lock_fn = skel_lock,
+       .kernel_flock_fn = skel_kernel_flock,
+       .linux_setlease_fn = skel_linux_setlease,
+       .getlock_fn = skel_getlock,
+       .symlink_fn = skel_symlink,
+       .readlink_fn = skel_vfs_readlink,
+       .link_fn = skel_link,
+       .mknod_fn = skel_mknod,
+       .realpath_fn = skel_realpath,
+       .chflags_fn = skel_chflags,
+       .file_id_create_fn = skel_file_id_create,
+       .copy_chunk_send_fn = skel_copy_chunk_send,
+       .copy_chunk_recv_fn = skel_copy_chunk_recv,
+       .get_compression_fn = skel_get_compression,
+       .set_compression_fn = skel_set_compression,
+
+       .streaminfo_fn = skel_streaminfo,
+       .get_real_filename_fn = skel_get_real_filename,
+       .connectpath_fn = skel_connectpath,
+       .brl_lock_windows_fn = skel_brl_lock_windows,
+       .brl_unlock_windows_fn = skel_brl_unlock_windows,
+       .brl_cancel_windows_fn = skel_brl_cancel_windows,
+       .strict_lock_fn = skel_strict_lock,
+       .strict_unlock_fn = skel_strict_unlock,
+       .translate_name_fn = skel_translate_name,
+       .fsctl_fn = skel_fsctl,
+       .readdir_attr_fn = skel_readdir_attr,
+
+       /* NT ACL operations. */
+
+       .fget_nt_acl_fn = skel_fget_nt_acl,
+       .get_nt_acl_fn = skel_get_nt_acl,
+       .fset_nt_acl_fn = skel_fset_nt_acl,
+
+       /* POSIX ACL operations. */
+
+       .chmod_acl_fn = skel_chmod_acl,
+       .fchmod_acl_fn = skel_fchmod_acl,
+
+       .sys_acl_get_file_fn = skel_sys_acl_get_file,
+       .sys_acl_get_fd_fn = skel_sys_acl_get_fd,
+       .sys_acl_blob_get_file_fn = skel_sys_acl_blob_get_file,
+       .sys_acl_blob_get_fd_fn = skel_sys_acl_blob_get_fd,
+       .sys_acl_set_file_fn = skel_sys_acl_set_file,
+       .sys_acl_set_fd_fn = skel_sys_acl_set_fd,
+       .sys_acl_delete_def_file_fn = skel_sys_acl_delete_def_file,
 
        /* EA operations. */
-       {SMB_VFS_OP(skel_getxattr),                     SMB_VFS_OP_GETXATTR,                    SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_lgetxattr),                    SMB_VFS_OP_LGETXATTR,                   SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_fgetxattr),                    SMB_VFS_OP_FGETXATTR,                   SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_listxattr),                    SMB_VFS_OP_LISTXATTR,                   SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_llistxattr),                   SMB_VFS_OP_LLISTXATTR,                  SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_flistxattr),                   SMB_VFS_OP_FLISTXATTR,                  SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_removexattr),                  SMB_VFS_OP_REMOVEXATTR,                 SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_lremovexattr),                 SMB_VFS_OP_LREMOVEXATTR,                SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_fremovexattr),                 SMB_VFS_OP_FREMOVEXATTR,                SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_setxattr),                     SMB_VFS_OP_SETXATTR,                    SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_lsetxattr),                    SMB_VFS_OP_LSETXATTR,                   SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_fsetxattr),                    SMB_VFS_OP_FSETXATTR,                   SMB_VFS_LAYER_TRANSPARENT},
-
-       /* AIO operations. */
-       {SMB_VFS_OP(skel_aio_read),                     SMB_VFS_OP_AIO_READ,                    SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_aio_write),                    SMB_VFS_OP_AIO_WRITE,                   SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_aio_return),                   SMB_VFS_OP_AIO_RETURN,                  SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_aio_cancel),                   SMB_VFS_OP_AIO_CANCEL,                  SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_aio_error),                    SMB_VFS_OP_AIO_ERROR,                   SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_aio_fsync),                    SMB_VFS_OP_AIO_FSYNC,                   SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_aio_suspend),                  SMB_VFS_OP_AIO_SUSPEND,                 SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_aio_force),                    SMB_VFS_OP_AIO_FORCE,                   SMB_VFS_LAYER_TRANSPARENT},
+       .getxattr_fn = skel_getxattr,
+       .fgetxattr_fn = skel_fgetxattr,
+       .listxattr_fn = skel_listxattr,
+       .flistxattr_fn = skel_flistxattr,
+       .removexattr_fn = skel_removexattr,
+       .fremovexattr_fn = skel_fremovexattr,
+       .setxattr_fn = skel_setxattr,
+       .fsetxattr_fn = skel_fsetxattr,
+
+       /* aio operations */
+       .aio_force_fn = skel_aio_force,
 
        /* offline operations */
-       {SMB_VFS_OP(skel_is_offline),                   SMB_VFS_OP_IS_OFFLINE,                  SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(skel_set_offline),                  SMB_VFS_OP_SET_OFFLINE,                 SMB_VFS_LAYER_TRANSPARENT},
-
-       {NULL,                                          SMB_VFS_OP_NOOP,                        SMB_VFS_LAYER_NOOP}
+       .is_offline_fn = skel_is_offline,
+       .set_offline_fn = skel_set_offline
 };
 
-NTSTATUS init_module(void)
+static_decl_vfs;
+NTSTATUS vfs_skel_transparent_init(void)
 {
-       return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "skel_transparent", skel_op_tuples);
+       return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "skel_transparent",
+                               &skel_transparent_fns);
 }