s3/vfs: remove now unused is_offline/set_offline VFS functions
[samba.git] / source3 / include / vfs.h
index b2880b76253c4bfd4ef520f28b20b4c29dbd4e4c..0810fc29fc87a598cd2ed6ea71f2c7394d416b94 100644 (file)
 /* Version 32 - Remove unnecessary SMB_VFS_DISK_FREE() small_query parameter */
 /* Bump to version 33 - Samba 4.3 will ship with that. */
 /* Version 33 - change fallocate mode flags param from enum->uint32_t */
-
-#define SMB_VFS_INTERFACE_VERSION 33
+/* Version 33 - Add snapshot create/delete calls */
+/* Version 33 - Add OS X SMB2 AAPL copyfile extension flag to fsp */
+/* Version 33 - Remove notify_watch_fn */
+/* Bump to version 34 - Samba 4.4 will ship with that */
+/* Version 34 - Remove bool posix_open, add uint64_t posix_flags */
+/* Version 34 - Added bool posix_pathnames to struct smb_request */
+/* Bump to version 35 - Samba 4.5 will ship with that */
+/* Version 35 - Change get_nt_acl_fn from const char *, to
+               const struct smb_filename * */
+/* Version 35 - Change mkdir from const char *, to
+               const struct smb_filename * */
+/* Version 35 - Change rmdir from const char *, to
+               const struct smb_filename * */
+/* Version 35 - Change opendir from const char *, to
+               const struct smb_filename * */
+/* Version 35 - Wrap aio async funtions args in a struct vfs_aio_state */
+/* Version 35 - Change chmod from const char *, to
+               const struct smb_filename * */
+/* Version 35 - Change chmod_acl from const char *, to
+               const struct smb_filename * */
+/* Version 35 - Change chown from const char *, to
+               const struct smb_filename * */
+/* Version 35 - Change lchown from const char *, to
+               const struct smb_filename * */
+/* Version 35 - Change streaminfo from const char *, to
+               const struct smb_filename * */
+/* Version 35 - Add uint32_t flags to struct smb_filename */
+/* Version 35 - Add get/set/fget/fset dos attribute functions. */
+/* Version 35 - Add bool use_ofd_locks to struct files_struct */
+/* Bump to version 36 - Samba 4.6 will ship with that */
+/* Version 36 - Remove is_offline and set_offline */
+
+#define SMB_VFS_INTERFACE_VERSION 36
 
 /*
     All intercepted VFS operations must be declared as static functions inside module source
@@ -197,7 +228,7 @@ struct fd_handle {
        int fd;
        uint64_t position_information;
        off_t pos;
-       uint32 private_options; /* NT Create options, but we only look at
+       uint32_t private_options;       /* NT Create options, but we only look at
                                 * NTCREATEX_OPTIONS_PRIVATE_DENY_DOS and
                                 * NTCREATEX_OPTIONS_PRIVATE_DENY_FCB and
                                 * NTCREATEX_OPTIONS_PRIVATE_DELETE_ON_CLOSE
@@ -224,12 +255,14 @@ typedef struct files_struct {
        unsigned int num_smb_operations;
        struct file_id file_id;
        uint64_t initial_allocation_size; /* Faked up initial allocation on disk. */
-       uint16 file_pid;
+       uint16_t file_pid;
        uint64_t vuid; /* SMB2 compat */
        struct write_cache *wcp;
        struct timeval open_time;
-       uint32 access_mask;             /* NTCreateX access bits (FILE_READ_DATA etc.) */
-       uint32 share_access;            /* NTCreateX share constants (FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE). */
+       uint32_t access_mask;           /* NTCreateX access bits (FILE_READ_DATA etc.) */
+       uint32_t share_access;          /* NTCreateX share constants (FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE). */
+
+       bool kernel_share_modes_taken;
 
        bool update_write_time_triggered;
        struct tevent_timer *update_write_time_event;
@@ -238,7 +271,7 @@ typedef struct files_struct {
        bool write_time_forced;
 
        int oplock_type;
-       struct fsp_lease *lease; /* Not yet used. Placeholder for leases. */
+       struct fsp_lease *lease;
        int sent_oplock_break;
        struct tevent_timer *oplock_timeout;
        struct lock_struct last_lock_failure;
@@ -252,10 +285,12 @@ typedef struct files_struct {
        bool aio_write_behind;
        bool initial_delete_on_close; /* Only set at NTCreateX if file was created. */
        bool delete_on_close;
-       bool posix_open;
+       uint64_t posix_flags;
        bool is_sparse;
        bool backup_intent; /* Handle was successfully opened with backup intent
                                and opener has privilege to do so. */
+       bool aapl_copyfile_supported;
+       bool use_ofd_locks; /* Are we using open file description locks ? */
        struct smb_filename *fsp_name;
        uint32_t name_hash;             /* Jenkins hash of full pathname. */
        uint64_t mid;                   /* Mid of the operation that created us. */
@@ -293,6 +328,15 @@ typedef struct files_struct {
        struct tevent_req *deferred_close;
 } files_struct;
 
+#define FSP_POSIX_FLAGS_OPEN           0x01
+#define FSP_POSIX_FLAGS_RENAME         0x02
+#define FSP_POSIX_FLAGS_PATHNAMES      0x04
+
+#define FSP_POSIX_FLAGS_ALL                    \
+       (FSP_POSIX_FLAGS_OPEN |                 \
+        FSP_POSIX_FLAGS_PATHNAMES |            \
+        FSP_POSIX_FLAGS_RENAME)
+
 struct vuid_cache_entry {
        struct auth_session_info *session_info;
        uint64_t vuid; /* SMB2 compat */
@@ -392,17 +436,17 @@ struct privilege_paths;
 
 struct smb_request {
        uint8_t cmd;
-       uint16 flags2;
-       uint16 smbpid;
+       uint16_t flags2;
+       uint16_t smbpid;
        uint64_t mid; /* For compatibility with SMB2. */
        uint32_t seqnum;
        uint64_t vuid; /* For compatibility with SMB2. */
        uint32_t tid;
-       uint8  wct;
+       uint8_t  wct;
        const uint16_t *vwv;
        uint16_t buflen;
        const uint8_t *buf;
-       const uint8 *inbuf;
+       const uint8_t *inbuf;
 
        /*
         * Async handling in the main smb processing loop is directed by
@@ -413,7 +457,7 @@ struct smb_request {
         * If async handling is wanted, the reply_xxx routine must make sure
         * that it talloc_move()s the smb_req somewhere else.
         */
-       uint8 *outbuf;
+       uint8_t *outbuf;
 
        size_t unread_bytes;
        bool encrypted;
@@ -449,6 +493,8 @@ struct smb_request {
        struct smb_request **chain;
 
        struct timeval request_time;
+
+       bool posix_pathnames;
 };
 
 /*
@@ -476,9 +522,17 @@ struct smb_filename {
        char *base_name;
        char *stream_name;
        char *original_lcomp;
+       uint32_t flags;
        SMB_STRUCT_STAT st;
 };
 
+/*
+ * smb_filename flags. Define in terms of the FSP_POSIX_FLAGS_XX
+ * to keep the numeric values consistent.
+ */
+
+#define SMB_FILENAME_POSIX_PATH                FSP_POSIX_FLAGS_PATHNAMES
+
 #define VFS_FIND(__fn__) while (handle->fns->__fn__##_fn==NULL) { \
                                handle = handle->next; \
                         }
@@ -493,6 +547,11 @@ enum vfs_fallocate_flags {
        VFS_FALLOCATE_FL_PUNCH_HOLE             = 0x0002,
 };
 
+struct vfs_aio_state {
+       int error;
+       uint64_t duration;
+};
+
 /*
     Available VFS operations. These values must be in sync with vfs_ops struct
     (struct vfs_fn_pointers and struct vfs_handle_pointers inside of struct vfs_ops).
@@ -508,7 +567,9 @@ struct vfs_fn_pointers {
        void (*disconnect_fn)(struct vfs_handle_struct *handle);
        uint64_t (*disk_free_fn)(struct vfs_handle_struct *handle, const char *path, uint64_t *bsize,
                              uint64_t *dfree, uint64_t *dsize);
-       int (*get_quota_fn)(struct vfs_handle_struct *handle, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *qt);
+       int (*get_quota_fn)(struct vfs_handle_struct *handle, const char *path,
+                           enum SMB_QUOTA_TYPE qtype, unid_t id,
+                           SMB_DISK_QUOTA *qt);
        int (*set_quota_fn)(struct vfs_handle_struct *handle, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *qt);
        int (*get_shadow_copy_data_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, struct shadow_copy_data *shadow_copy_data, bool labels);
        int (*statvfs_fn)(struct vfs_handle_struct *handle, const char *path, struct vfs_statvfs_struct *statbuf);
@@ -523,16 +584,22 @@ struct vfs_fn_pointers {
 
        /* Directory operations */
 
-       DIR *(*opendir_fn)(struct vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attributes);
-       DIR *(*fdopendir_fn)(struct vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attributes);
+       DIR *(*opendir_fn)(struct vfs_handle_struct *handle,
+                                       const struct smb_filename *smb_fname,
+                                       const char *mask,
+                                       uint32_t attributes);
+       DIR *(*fdopendir_fn)(struct vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32_t attributes);
        struct dirent *(*readdir_fn)(struct vfs_handle_struct *handle,
                                         DIR *dirp,
                                         SMB_STRUCT_STAT *sbuf);
        void (*seekdir_fn)(struct vfs_handle_struct *handle, DIR *dirp, long offset);
        long (*telldir_fn)(struct vfs_handle_struct *handle, DIR *dirp);
        void (*rewind_dir_fn)(struct vfs_handle_struct *handle, DIR *dirp);
-       int (*mkdir_fn)(struct vfs_handle_struct *handle, const char *path, mode_t mode);
-       int (*rmdir_fn)(struct vfs_handle_struct *handle, const char *path);
+       int (*mkdir_fn)(struct vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname,
+                       mode_t mode);
+       int (*rmdir_fn)(struct vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname);
        int (*closedir_fn)(struct vfs_handle_struct *handle, DIR *dir);
        void (*init_search_op_fn)(struct vfs_handle_struct *handle, DIR *dirp);
 
@@ -569,7 +636,7 @@ struct vfs_fn_pointers {
                                            struct files_struct *fsp,
                                            void *data,
                                            size_t n, off_t offset);
-       ssize_t (*pread_recv_fn)(struct tevent_req *req, int *err);
+       ssize_t (*pread_recv_fn)(struct tevent_req *req, struct vfs_aio_state *state);
        ssize_t (*write_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const void *data, size_t n);
        ssize_t (*pwrite_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const void *data, size_t n, off_t offset);
        struct tevent_req *(*pwrite_send_fn)(struct vfs_handle_struct *handle,
@@ -578,7 +645,7 @@ struct vfs_fn_pointers {
                                             struct files_struct *fsp,
                                             const void *data,
                                             size_t n, off_t offset);
-       ssize_t (*pwrite_recv_fn)(struct tevent_req *req, int *err);
+       ssize_t (*pwrite_recv_fn)(struct tevent_req *req, struct vfs_aio_state *state);
        off_t (*lseek_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, off_t offset, int whence);
        ssize_t (*sendfile_fn)(struct vfs_handle_struct *handle, int tofd, files_struct *fromfsp, const DATA_BLOB *header, off_t offset, size_t count);
        ssize_t (*recvfile_fn)(struct vfs_handle_struct *handle, int fromfd, files_struct *tofsp, off_t offset, size_t count);
@@ -590,18 +657,26 @@ struct vfs_fn_pointers {
                                            TALLOC_CTX *mem_ctx,
                                            struct tevent_context *ev,
                                            struct files_struct *fsp);
-       int (*fsync_recv_fn)(struct tevent_req *req, int *err);
+       int (*fsync_recv_fn)(struct tevent_req *req, struct vfs_aio_state *state);
        int (*stat_fn)(struct vfs_handle_struct *handle, struct smb_filename *smb_fname);
        int (*fstat_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_STAT *sbuf);
        int (*lstat_fn)(struct vfs_handle_struct *handle, struct smb_filename *smb_filename);
        uint64_t (*get_alloc_size_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const SMB_STRUCT_STAT *sbuf);
        int (*unlink_fn)(struct vfs_handle_struct *handle,
                         const struct smb_filename *smb_fname);
-       int (*chmod_fn)(struct vfs_handle_struct *handle, const char *path, mode_t mode);
+       int (*chmod_fn)(struct vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname,
+                       mode_t mode);
        int (*fchmod_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, mode_t mode);
-       int (*chown_fn)(struct vfs_handle_struct *handle, const char *path, uid_t uid, gid_t gid);
+       int (*chown_fn)(struct vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname,
+                       uid_t uid,
+                       gid_t gid);
        int (*fchown_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, uid_t uid, gid_t gid);
-       int (*lchown_fn)(struct vfs_handle_struct *handle, const char *path, uid_t uid, gid_t gid);
+       int (*lchown_fn)(struct vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname,
+                       uid_t uid,
+                       gid_t gid);
        int (*chdir_fn)(struct vfs_handle_struct *handle, const char *path);
        char *(*getwd_fn)(struct vfs_handle_struct *handle);
        int (*ntimes_fn)(struct vfs_handle_struct *handle,
@@ -615,7 +690,7 @@ struct vfs_fn_pointers {
                            off_t len);
        bool (*lock_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, int op, off_t offset, off_t count, int type);
        int (*kernel_flock_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp,
-                              uint32 share_mode, uint32_t access_mask);
+                              uint32_t share_mode, uint32_t access_mask);
        int (*linux_setlease_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, int leasetype);
        bool (*getlock_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid);
        int (*symlink_fn)(struct vfs_handle_struct *handle, const char *oldpath, const char *newpath);
@@ -623,16 +698,6 @@ struct vfs_fn_pointers {
        int (*link_fn)(struct vfs_handle_struct *handle, const char *oldpath, const char *newpath);
        int (*mknod_fn)(struct vfs_handle_struct *handle, const char *path, mode_t mode, SMB_DEV_T dev);
        char *(*realpath_fn)(struct vfs_handle_struct *handle, const char *path);
-       NTSTATUS (*notify_watch_fn)(struct vfs_handle_struct *handle,
-                                   struct sys_notify_context *ctx,
-                                   const char *path,
-                                   uint32_t *filter,
-                                   uint32_t *subdir_filter,
-                                   void (*callback)(struct sys_notify_context *ctx,
-                                                    void *private_data,
-                                                    struct notify_event *ev),
-                                   void *private_data, 
-                                   void *handle_p);
        int (*chflags_fn)(struct vfs_handle_struct *handle, const char *path, unsigned int flags);
        struct file_id (*file_id_create_fn)(struct vfs_handle_struct *handle,
                                            const SMB_STRUCT_STAT *sbuf);
@@ -656,10 +721,25 @@ struct vfs_fn_pointers {
                                       TALLOC_CTX *mem_ctx,
                                       struct files_struct *fsp,
                                       uint16_t compression_fmt);
+       NTSTATUS (*snap_check_path_fn)(struct vfs_handle_struct *handle,
+                                      TALLOC_CTX *mem_ctx,
+                                      const char *service_path,
+                                      char **base_volume);
+       NTSTATUS (*snap_create_fn)(struct vfs_handle_struct *handle,
+                                  TALLOC_CTX *mem_ctx,
+                                  const char *base_volume,
+                                  time_t *tstamp,
+                                  bool rw,
+                                  char **base_path,
+                                  char **snap_path);
+       NTSTATUS (*snap_delete_fn)(struct vfs_handle_struct *handle,
+                                  TALLOC_CTX *mem_ctx,
+                                  char *base_path,
+                                  char *snap_path);
 
        NTSTATUS (*streaminfo_fn)(struct vfs_handle_struct *handle,
                                  struct files_struct *fsp,
-                                 const char *fname,
+                                 const struct smb_filename *smb_fname,
                                  TALLOC_CTX *mem_ctx,
                                  unsigned int *num_streams,
                                  struct stream_struct **streams);
@@ -712,21 +792,37 @@ struct vfs_fn_pointers {
                             uint32_t max_out_len,
                             uint32_t *out_len); 
 
+       NTSTATUS (*get_dos_attributes_fn)(struct vfs_handle_struct *handle,
+                                         struct smb_filename *smb_fname,
+                                         uint32_t *dosmode);
+
+       NTSTATUS (*fget_dos_attributes_fn)(struct vfs_handle_struct *handle,
+                                          struct files_struct *fsp,
+                                          uint32_t *dosmode);
+
+       NTSTATUS (*set_dos_attributes_fn)(struct vfs_handle_struct *handle,
+                                         const struct smb_filename *smb_fname,
+                                         uint32_t dosmode);
+
+       NTSTATUS (*fset_dos_attributes_fn)(struct vfs_handle_struct *hande,
+                                          struct files_struct *fsp,
+                                          uint32_t dosmode);
+
        /* NT ACL operations. */
 
        NTSTATUS (*fget_nt_acl_fn)(struct vfs_handle_struct *handle,
                                   struct files_struct *fsp,
-                                  uint32 security_info,
+                                  uint32_t security_info,
                                   TALLOC_CTX *mem_ctx,
                                   struct security_descriptor **ppdesc);
        NTSTATUS (*get_nt_acl_fn)(struct vfs_handle_struct *handle,
-                                 const char *name,
-                                 uint32 security_info,
+                                 const struct smb_filename *smb_fname,
+                                 uint32_t security_info,
                                   TALLOC_CTX *mem_ctx,
                                  struct security_descriptor **ppdesc);
        NTSTATUS (*fset_nt_acl_fn)(struct vfs_handle_struct *handle,
                                   struct files_struct *fsp,
-                                  uint32 security_info_sent,
+                                  uint32_t security_info_sent,
                                   const struct security_descriptor *psd);
 
        NTSTATUS (*audit_file_fn)(struct vfs_handle_struct *handle,
@@ -737,7 +833,9 @@ struct vfs_fn_pointers {
 
        /* POSIX ACL operations. */
 
-       int (*chmod_acl_fn)(struct vfs_handle_struct *handle, const char *name, mode_t mode);
+       int (*chmod_acl_fn)(struct vfs_handle_struct *handle,
+                                       const struct smb_filename *smb_fname,
+                                       mode_t mode);
        int (*fchmod_acl_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, mode_t mode);
 
        SMB_ACL_T (*sys_acl_get_file_fn)(struct vfs_handle_struct *handle,
@@ -772,13 +870,6 @@ struct vfs_fn_pointers {
        /* aio operations */
        bool (*aio_force_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp);
 
-       /* offline operations */
-       bool (*is_offline_fn)(struct vfs_handle_struct *handle,
-                          const struct smb_filename *fname,
-                          SMB_STRUCT_STAT *sbuf);
-       int (*set_offline_fn)(struct vfs_handle_struct *handle,
-                          const struct smb_filename *fname);
-
        /* durable handle operations */
        NTSTATUS (*durable_cookie_fn)(struct vfs_handle_struct *handle,
                                      struct files_struct *fsp,
@@ -822,8 +913,8 @@ typedef struct vfs_handle_struct {
 
 typedef struct vfs_statvfs_struct {
        /* For undefined recommended transfer size return -1 in that field */
-       uint32 OptimalTransferSize;  /* bsize on some os, iosize on other os */
-       uint32 BlockSize;
+       uint32_t OptimalTransferSize;  /* bsize on some os, iosize on other os */
+       uint32_t BlockSize;
 
        /*
         The next three fields are in terms of the block size.
@@ -908,7 +999,7 @@ void smb_vfs_call_disconnect(struct vfs_handle_struct *handle);
 uint64_t smb_vfs_call_disk_free(struct vfs_handle_struct *handle,
                                const char *path, uint64_t *bsize,
                                uint64_t *dfree, uint64_t *dsize);
-int smb_vfs_call_get_quota(struct vfs_handle_struct *handle,
+int smb_vfs_call_get_quota(struct vfs_handle_struct *handle, const char *path,
                           enum SMB_QUOTA_TYPE qtype, unid_t id,
                           SMB_DISK_QUOTA *qt);
 int smb_vfs_call_set_quota(struct vfs_handle_struct *handle,
@@ -928,12 +1019,13 @@ uint32_t smb_vfs_call_fs_capabilities(struct vfs_handle_struct *handle,
 NTSTATUS smb_vfs_call_get_dfs_referrals(struct vfs_handle_struct *handle,
                                        struct dfs_GetDFSReferral *r);
 DIR *smb_vfs_call_opendir(struct vfs_handle_struct *handle,
-                                    const char *fname, const char *mask,
-                                    uint32 attributes);
+                       const struct smb_filename *smb_fname,
+                       const char *mask,
+                       uint32_t attributes);
 DIR *smb_vfs_call_fdopendir(struct vfs_handle_struct *handle,
                                        struct files_struct *fsp,
                                        const char *mask,
-                                       uint32 attributes);
+                                       uint32_t attributes);
 struct dirent *smb_vfs_call_readdir(struct vfs_handle_struct *handle,
                                        DIR *dirp,
                                        SMB_STRUCT_STAT *sbuf);
@@ -943,9 +1035,11 @@ long smb_vfs_call_telldir(struct vfs_handle_struct *handle,
                          DIR *dirp);
 void smb_vfs_call_rewind_dir(struct vfs_handle_struct *handle,
                             DIR *dirp);
-int smb_vfs_call_mkdir(struct vfs_handle_struct *handle, const char *path,
-                      mode_t mode);
-int smb_vfs_call_rmdir(struct vfs_handle_struct *handle, const char *path);
+int smb_vfs_call_mkdir(struct vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname,
+                       mode_t mode);
+int smb_vfs_call_rmdir(struct vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname);
 int smb_vfs_call_closedir(struct vfs_handle_struct *handle,
                          DIR *dir);
 void smb_vfs_call_init_search_op(struct vfs_handle_struct *handle,
@@ -985,7 +1079,7 @@ struct tevent_req *smb_vfs_call_pread_send(struct vfs_handle_struct *handle,
                                           struct files_struct *fsp,
                                           void *data,
                                           size_t n, off_t offset);
-ssize_t SMB_VFS_PREAD_RECV(struct tevent_req *req, int *perrno);
+ssize_t SMB_VFS_PREAD_RECV(struct tevent_req *req, struct vfs_aio_state *state);
 
 ssize_t smb_vfs_call_write(struct vfs_handle_struct *handle,
                           struct files_struct *fsp, const void *data,
@@ -999,7 +1093,7 @@ struct tevent_req *smb_vfs_call_pwrite_send(struct vfs_handle_struct *handle,
                                            struct files_struct *fsp,
                                            const void *data,
                                            size_t n, off_t offset);
-ssize_t SMB_VFS_PWRITE_RECV(struct tevent_req *req, int *perrno);
+ssize_t SMB_VFS_PWRITE_RECV(struct tevent_req *req, struct vfs_aio_state *state);
 
 off_t smb_vfs_call_lseek(struct vfs_handle_struct *handle,
                             struct files_struct *fsp, off_t offset,
@@ -1020,7 +1114,7 @@ struct tevent_req *smb_vfs_call_fsync_send(struct vfs_handle_struct *handle,
                                           TALLOC_CTX *mem_ctx,
                                           struct tevent_context *ev,
                                           struct files_struct *fsp);
-int SMB_VFS_FSYNC_RECV(struct tevent_req *req, int *perrno);
+int SMB_VFS_FSYNC_RECV(struct tevent_req *req, struct vfs_aio_state *state);
 
 int smb_vfs_call_stat(struct vfs_handle_struct *handle,
                      struct smb_filename *smb_fname);
@@ -1033,16 +1127,21 @@ uint64_t smb_vfs_call_get_alloc_size(struct vfs_handle_struct *handle,
                                     const SMB_STRUCT_STAT *sbuf);
 int smb_vfs_call_unlink(struct vfs_handle_struct *handle,
                        const struct smb_filename *smb_fname);
-int smb_vfs_call_chmod(struct vfs_handle_struct *handle, const char *path,
-                      mode_t mode);
+int smb_vfs_call_chmod(struct vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname,
+                       mode_t mode);
 int smb_vfs_call_fchmod(struct vfs_handle_struct *handle,
                        struct files_struct *fsp, mode_t mode);
-int smb_vfs_call_chown(struct vfs_handle_struct *handle, const char *path,
-                      uid_t uid, gid_t gid);
+int smb_vfs_call_chown(struct vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname,
+                       uid_t uid,
+                       gid_t gid);
 int smb_vfs_call_fchown(struct vfs_handle_struct *handle,
                        struct files_struct *fsp, uid_t uid, gid_t gid);
-int smb_vfs_call_lchown(struct vfs_handle_struct *handle, const char *path,
-                       uid_t uid, gid_t gid);
+int smb_vfs_call_lchown(struct vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname,
+                       uid_t uid,
+                       gid_t gid);
 int smb_vfs_call_chdir(struct vfs_handle_struct *handle, const char *path);
 char *smb_vfs_call_getwd(struct vfs_handle_struct *handle);
 int smb_vfs_call_ntimes(struct vfs_handle_struct *handle,
@@ -1059,7 +1158,7 @@ bool smb_vfs_call_lock(struct vfs_handle_struct *handle,
                       struct files_struct *fsp, int op, off_t offset,
                       off_t count, int type);
 int smb_vfs_call_kernel_flock(struct vfs_handle_struct *handle,
-                             struct files_struct *fsp, uint32 share_mode,
+                             struct files_struct *fsp, uint32_t share_mode,
                              uint32_t access_mask);
 int smb_vfs_call_linux_setlease(struct vfs_handle_struct *handle,
                                struct files_struct *fsp, int leasetype);
@@ -1075,22 +1174,13 @@ int smb_vfs_call_link(struct vfs_handle_struct *handle, const char *oldpath,
 int smb_vfs_call_mknod(struct vfs_handle_struct *handle, const char *path,
                       mode_t mode, SMB_DEV_T dev);
 char *smb_vfs_call_realpath(struct vfs_handle_struct *handle, const char *path);
-NTSTATUS smb_vfs_call_notify_watch(struct vfs_handle_struct *handle,
-                                  struct sys_notify_context *ctx,
-                                  const char *name,
-                                  uint32_t *filter,
-                                  uint32_t *subdir_filter,
-                                  void (*callback)(struct sys_notify_context *ctx,
-                                                   void *private_data,
-                                                   struct notify_event *ev),
-                                  void *private_data, void *handle_p);
 int smb_vfs_call_chflags(struct vfs_handle_struct *handle, const char *path,
                         unsigned int flags);
 struct file_id smb_vfs_call_file_id_create(struct vfs_handle_struct *handle,
                                           const SMB_STRUCT_STAT *sbuf);
 NTSTATUS smb_vfs_call_streaminfo(struct vfs_handle_struct *handle,
                                 struct files_struct *fsp,
-                                const char *fname,
+                                const struct smb_filename *smb_fname,
                                 TALLOC_CTX *mem_ctx,
                                 unsigned int *num_streams,
                                 struct stream_struct **streams);
@@ -1131,6 +1221,18 @@ NTSTATUS smb_vfs_call_fsctl(struct vfs_handle_struct *handle,
                            uint8_t **_out_data,
                            uint32_t max_out_len,
                            uint32_t *out_len);
+NTSTATUS smb_vfs_call_get_dos_attributes(struct vfs_handle_struct *handle,
+                                        struct smb_filename *smb_fname,
+                                        uint32_t *dosmode);
+NTSTATUS smb_vfs_call_fget_dos_attributes(struct vfs_handle_struct *handle,
+                                         struct files_struct *fsp,
+                                         uint32_t *dosmode);
+NTSTATUS smb_vfs_call_set_dos_attributes(struct vfs_handle_struct *handle,
+                                        const struct smb_filename *smb_fname,
+                                        uint32_t dosmode);
+NTSTATUS smb_vfs_call_fset_dos_attributes(struct vfs_handle_struct *handle,
+                                         struct files_struct *fsp,
+                                         uint32_t dosmode);
 struct tevent_req *smb_vfs_call_copy_chunk_send(struct vfs_handle_struct *handle,
                                                TALLOC_CTX *mem_ctx,
                                                struct tevent_context *ev,
@@ -1151,27 +1253,43 @@ NTSTATUS smb_vfs_call_set_compression(struct vfs_handle_struct *handle,
                                      TALLOC_CTX *mem_ctx,
                                      struct files_struct *fsp,
                                      uint16_t compression_fmt);
+NTSTATUS smb_vfs_call_snap_check_path(vfs_handle_struct *handle,
+                                     TALLOC_CTX *mem_ctx,
+                                     const char *service_path,
+                                     char **base_volume);
+NTSTATUS smb_vfs_call_snap_create(struct vfs_handle_struct *handle,
+                                 TALLOC_CTX *mem_ctx,
+                                 const char *base_volume,
+                                 time_t *tstamp,
+                                 bool rw,
+                                 char **base_path,
+                                 char **snap_path);
+NTSTATUS smb_vfs_call_snap_delete(struct vfs_handle_struct *handle,
+                                 TALLOC_CTX *mem_ctx,
+                                 char *base_path,
+                                 char *snap_path);
 NTSTATUS smb_vfs_call_fget_nt_acl(struct vfs_handle_struct *handle,
                                  struct files_struct *fsp,
-                                 uint32 security_info,
+                                 uint32_t security_info,
                                  TALLOC_CTX *mem_ctx,
                                  struct security_descriptor **ppdesc);
 NTSTATUS smb_vfs_call_get_nt_acl(struct vfs_handle_struct *handle,
-                                const char *name,
-                                uint32 security_info,
+                                const struct smb_filename *smb_fname,
+                                uint32_t security_info,
                                 TALLOC_CTX *mem_ctx,
                                 struct security_descriptor **ppdesc);
 NTSTATUS smb_vfs_call_fset_nt_acl(struct vfs_handle_struct *handle,
                                  struct files_struct *fsp,
-                                 uint32 security_info_sent,
+                                 uint32_t security_info_sent,
                                  const struct security_descriptor *psd);
 NTSTATUS smb_vfs_call_audit_file(struct vfs_handle_struct *handle,
                                 struct smb_filename *file,
                                 struct security_acl *sacl,
                                 uint32_t access_requested,
                                 uint32_t access_denied);
-int smb_vfs_call_chmod_acl(struct vfs_handle_struct *handle, const char *name,
-                          mode_t mode);
+int smb_vfs_call_chmod_acl(struct vfs_handle_struct *handle,
+                               const struct smb_filename *file,
+                               mode_t mode);
 int smb_vfs_call_fchmod_acl(struct vfs_handle_struct *handle,
                            struct files_struct *fsp, mode_t mode);
 SMB_ACL_T smb_vfs_call_sys_acl_get_file(struct vfs_handle_struct *handle,
@@ -1262,4 +1380,7 @@ void vfs_remove_all_fsp_extensions(struct files_struct *fsp);
 void *vfs_memctx_fsp_extension(vfs_handle_struct *handle, files_struct *fsp);
 void *vfs_fetch_fsp_extension(vfs_handle_struct *handle, files_struct *fsp);
 
+void smb_vfs_assert_all_fns(const struct vfs_fn_pointers* fns,
+                           const char *module);
+
 #endif /* _VFS_H */