diff options
Diffstat (limited to 'source3/modules')
45 files changed, 702 insertions, 702 deletions
diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c index 35b8ab70c7..67d0540fef 100644 --- a/source3/modules/vfs_acl_tdb.c +++ b/source3/modules/vfs_acl_tdb.c @@ -399,18 +399,18 @@ static int sys_acl_set_fd_tdb(vfs_handle_struct *handle, static struct vfs_fn_pointers vfs_acl_tdb_fns = { .connect_fn = connect_acl_tdb, - .disconnect = disconnect_acl_tdb, - .rmdir = rmdir_acl_tdb, - .unlink = unlink_acl_tdb, - .chmod = chmod_acl_module_common, - .fchmod = fchmod_acl_module_common, - .fget_nt_acl = fget_nt_acl_common, - .get_nt_acl = get_nt_acl_common, - .fset_nt_acl = fset_nt_acl_common, - .chmod_acl = chmod_acl_acl_module_common, - .fchmod_acl = fchmod_acl_acl_module_common, - .sys_acl_set_file = sys_acl_set_file_tdb, - .sys_acl_set_fd = sys_acl_set_fd_tdb + .disconnect_fn = disconnect_acl_tdb, + .rmdir_fn = rmdir_acl_tdb, + .unlink_fn = unlink_acl_tdb, + .chmod_fn = chmod_acl_module_common, + .fchmod_fn = fchmod_acl_module_common, + .fget_nt_acl_fn = fget_nt_acl_common, + .get_nt_acl_fn = get_nt_acl_common, + .fset_nt_acl_fn = fset_nt_acl_common, + .chmod_acl_fn = chmod_acl_acl_module_common, + .fchmod_acl_fn = fchmod_acl_acl_module_common, + .sys_acl_set_file_fn = sys_acl_set_file_tdb, + .sys_acl_set_fd_fn = sys_acl_set_fd_tdb }; NTSTATUS vfs_acl_tdb_init(void) diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c index 25a3c54ef2..5653657066 100644 --- a/source3/modules/vfs_acl_xattr.c +++ b/source3/modules/vfs_acl_xattr.c @@ -201,17 +201,17 @@ static int connect_acl_xattr(struct vfs_handle_struct *handle, static struct vfs_fn_pointers vfs_acl_xattr_fns = { .connect_fn = connect_acl_xattr, - .rmdir = rmdir_acl_common, - .unlink = unlink_acl_common, - .chmod = chmod_acl_module_common, - .fchmod = fchmod_acl_module_common, - .fget_nt_acl = fget_nt_acl_common, - .get_nt_acl = get_nt_acl_common, - .fset_nt_acl = fset_nt_acl_common, - .chmod_acl = chmod_acl_acl_module_common, - .fchmod_acl = fchmod_acl_acl_module_common, - .sys_acl_set_file = sys_acl_set_file_xattr, - .sys_acl_set_fd = sys_acl_set_fd_xattr + .rmdir_fn = rmdir_acl_common, + .unlink_fn = unlink_acl_common, + .chmod_fn = chmod_acl_module_common, + .fchmod_fn = fchmod_acl_module_common, + .fget_nt_acl_fn = fget_nt_acl_common, + .get_nt_acl_fn = get_nt_acl_common, + .fset_nt_acl_fn = fset_nt_acl_common, + .chmod_acl_fn = chmod_acl_acl_module_common, + .fchmod_acl_fn = fchmod_acl_acl_module_common, + .sys_acl_set_file_fn = sys_acl_set_file_xattr, + .sys_acl_set_fd_fn = sys_acl_set_fd_xattr }; NTSTATUS vfs_acl_xattr_init(void) diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c index 6301469db0..e965e4c8b1 100644 --- a/source3/modules/vfs_afsacl.c +++ b/source3/modules/vfs_afsacl.c @@ -1087,9 +1087,9 @@ static int afsacl_connect(vfs_handle_struct *handle, static struct vfs_fn_pointers vfs_afsacl_fns = { .connect_fn = afsacl_connect, - .fget_nt_acl = afsacl_fget_nt_acl, - .get_nt_acl = afsacl_get_nt_acl, - .fset_nt_acl = afsacl_fset_nt_acl + .fget_nt_acl_fn = afsacl_fget_nt_acl, + .get_nt_acl_fn = afsacl_get_nt_acl, + .fset_nt_acl_fn = afsacl_fset_nt_acl }; NTSTATUS vfs_afsacl_init(void); diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c index 961efd85de..01eb97de86 100644 --- a/source3/modules/vfs_aio_fork.c +++ b/source3/modules/vfs_aio_fork.c @@ -879,12 +879,12 @@ static int aio_fork_suspend(struct vfs_handle_struct *handle, } static struct vfs_fn_pointers vfs_aio_fork_fns = { - .aio_read = aio_fork_read, - .aio_write = aio_fork_write, + .aio_read_fn = aio_fork_read, + .aio_write_fn = aio_fork_write, .aio_return_fn = aio_fork_return_fn, - .aio_cancel = aio_fork_cancel, + .aio_cancel_fn = aio_fork_cancel, .aio_error_fn = aio_fork_error_fn, - .aio_suspend = aio_fork_suspend, + .aio_suspend_fn = aio_fork_suspend, }; NTSTATUS vfs_aio_fork_init(void); diff --git a/source3/modules/vfs_aixacl.c b/source3/modules/vfs_aixacl.c index c09bdb5bb8..c4bb02eebf 100644 --- a/source3/modules/vfs_aixacl.c +++ b/source3/modules/vfs_aixacl.c @@ -180,11 +180,11 @@ int aixacl_sys_acl_delete_def_file(vfs_handle_struct *handle, } static struct vfs_fn_pointers vfs_aixacl_fns = { - .sys_acl_get_file = aixacl_sys_acl_get_file, - .sys_acl_get_fd = aixacl_sys_acl_get_fd, - .sys_acl_set_file = aixacl_sys_acl_set_file, - .sys_acl_set_fd = aixacl_sys_acl_set_fd, - .sys_acl_delete_def_file = aixacl_sys_acl_delete_def_file, + .sys_acl_get_file_fn = aixacl_sys_acl_get_file, + .sys_acl_get_fd_fn = aixacl_sys_acl_get_fd, + .sys_acl_set_file_fn = aixacl_sys_acl_set_file, + .sys_acl_set_fd_fn = aixacl_sys_acl_set_fd, + .sys_acl_delete_def_file_fn = aixacl_sys_acl_delete_def_file, }; NTSTATUS vfs_aixacl_init(void); diff --git a/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c index 5ded2a8f2e..3f13a6fa87 100644 --- a/source3/modules/vfs_aixacl2.c +++ b/source3/modules/vfs_aixacl2.c @@ -487,14 +487,14 @@ int aixjfs2_sys_acl_delete_def_file(vfs_handle_struct *handle, } static struct vfs_fn_pointers vfs_aixacl2_fns = { - .fget_nt_acl = aixjfs2_fget_nt_acl, - .get_nt_acl = aixjfs2_get_nt_acl, - .fset_nt_acl = aixjfs2_fset_nt_acl, - .sys_acl_get_file = aixjfs2_sys_acl_get_file, - .sys_acl_get_fd = aixjfs2_sys_acl_get_fd, - .sys_acl_set_file = aixjfs2_sys_acl_set_file, - .sys_acl_set_fd = aixjfs2_sys_acl_set_fd, - .sys_acl_delete_def_file = aixjfs2_sys_acl_delete_def_file + .fget_nt_acl_fn = aixjfs2_fget_nt_acl, + .get_nt_acl_fn = aixjfs2_get_nt_acl, + .fset_nt_acl_fn = aixjfs2_fset_nt_acl, + .sys_acl_get_file_fn = aixjfs2_sys_acl_get_file, + .sys_acl_get_fd_fn = aixjfs2_sys_acl_get_fd, + .sys_acl_set_file_fn = aixjfs2_sys_acl_set_file, + .sys_acl_set_fd_fn = aixjfs2_sys_acl_set_fd, + .sys_acl_delete_def_file_fn = aixjfs2_sys_acl_delete_def_file }; NTSTATUS vfs_aixacl2_init(void); diff --git a/source3/modules/vfs_audit.c b/source3/modules/vfs_audit.c index eeeea8aafa..1da8755410 100644 --- a/source3/modules/vfs_audit.c +++ b/source3/modules/vfs_audit.c @@ -269,18 +269,18 @@ static int audit_fchmod_acl(vfs_handle_struct *handle, files_struct *fsp, mode_t static struct vfs_fn_pointers vfs_audit_fns = { .connect_fn = audit_connect, - .disconnect = audit_disconnect, - .opendir = audit_opendir, - .mkdir = audit_mkdir, - .rmdir = audit_rmdir, + .disconnect_fn = audit_disconnect, + .opendir_fn = audit_opendir, + .mkdir_fn = audit_mkdir, + .rmdir_fn = audit_rmdir, .open_fn = audit_open, .close_fn = audit_close, - .rename = audit_rename, - .unlink = audit_unlink, - .chmod = audit_chmod, - .fchmod = audit_fchmod, - .chmod_acl = audit_chmod_acl, - .fchmod_acl = audit_fchmod_acl + .rename_fn = audit_rename, + .unlink_fn = audit_unlink, + .chmod_fn = audit_chmod, + .fchmod_fn = audit_fchmod, + .chmod_acl_fn = audit_chmod_acl, + .fchmod_acl_fn = audit_fchmod_acl }; NTSTATUS vfs_audit_init(void) diff --git a/source3/modules/vfs_cacheprime.c b/source3/modules/vfs_cacheprime.c index 167b93580f..bd11797f6b 100644 --- a/source3/modules/vfs_cacheprime.c +++ b/source3/modules/vfs_cacheprime.c @@ -177,10 +177,10 @@ static ssize_t cprime_pread( } static struct vfs_fn_pointers vfs_cacheprime_fns = { - .sendfile = cprime_sendfile, - .pread = cprime_pread, - .vfs_read = cprime_read, - .connect_fn = cprime_connect, + .sendfile_fn = cprime_sendfile, + .pread_fn = cprime_pread, + .read_fn = cprime_read, + .connect_fn = cprime_connect, }; /* ------------------------------------------------------------------------- diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c index 15bebf6fea..06ff89d89b 100644 --- a/source3/modules/vfs_cap.c +++ b/source3/modules/vfs_cap.c @@ -571,41 +571,41 @@ static int cap_fsetxattr(vfs_handle_struct *handle, struct files_struct *fsp, co } static struct vfs_fn_pointers vfs_cap_fns = { - .disk_free = cap_disk_free, - .opendir = cap_opendir, - .readdir = cap_readdir, - .mkdir = cap_mkdir, - .rmdir = cap_rmdir, + .disk_free_fn = cap_disk_free, + .opendir_fn = cap_opendir, + .readdir_fn = cap_readdir, + .mkdir_fn = cap_mkdir, + .rmdir_fn = cap_rmdir, .open_fn = cap_open, - .rename = cap_rename, - .stat = cap_stat, - .lstat = cap_lstat, - .unlink = cap_unlink, - .chmod = cap_chmod, - .chown = cap_chown, - .lchown = cap_lchown, - .chdir = cap_chdir, - .ntimes = cap_ntimes, - .symlink = cap_symlink, - .vfs_readlink = cap_readlink, - .link = cap_link, - .mknod = cap_mknod, - .realpath = cap_realpath, - .chmod_acl = cap_chmod_acl, - .sys_acl_get_file = cap_sys_acl_get_file, - .sys_acl_set_file = cap_sys_acl_set_file, - .sys_acl_delete_def_file = cap_sys_acl_delete_def_file, - .getxattr = cap_getxattr, - .lgetxattr = cap_lgetxattr, - .fgetxattr = cap_fgetxattr, - .listxattr = cap_listxattr, - .llistxattr = cap_llistxattr, - .removexattr = cap_removexattr, - .lremovexattr = cap_lremovexattr, - .fremovexattr = cap_fremovexattr, - .setxattr = cap_setxattr, - .lsetxattr = cap_lsetxattr, - .fsetxattr = cap_fsetxattr + .rename_fn = cap_rename, + .stat_fn = cap_stat, + .lstat_fn = cap_lstat, + .unlink_fn = cap_unlink, + .chmod_fn = cap_chmod, + .chown_fn = cap_chown, + .lchown_fn = cap_lchown, + .chdir_fn = cap_chdir, + .ntimes_fn = cap_ntimes, + .symlink_fn = cap_symlink, + .readlink_fn = cap_readlink, + .link_fn = cap_link, + .mknod_fn = cap_mknod, + .realpath_fn = cap_realpath, + .chmod_acl_fn = cap_chmod_acl, + .sys_acl_get_file_fn = cap_sys_acl_get_file, + .sys_acl_set_file_fn = cap_sys_acl_set_file, + .sys_acl_delete_def_file_fn = cap_sys_acl_delete_def_file, + .getxattr_fn = cap_getxattr, + .lgetxattr_fn = cap_lgetxattr, + .fgetxattr_fn = cap_fgetxattr, + .listxattr_fn = cap_listxattr, + .llistxattr_fn = cap_llistxattr, + .removexattr_fn = cap_removexattr, + .lremovexattr_fn = cap_lremovexattr, + .fremovexattr_fn = cap_fremovexattr, + .setxattr_fn = cap_setxattr, + .lsetxattr_fn = cap_lsetxattr, + .fsetxattr_fn = cap_fsetxattr }; NTSTATUS vfs_cap_init(void); diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c index 31b9f188d3..d18977d6fe 100644 --- a/source3/modules/vfs_catia.c +++ b/source3/modules/vfs_catia.c @@ -987,35 +987,35 @@ catia_lsetxattr(vfs_handle_struct *handle, const char *path, } static struct vfs_fn_pointers vfs_catia_fns = { - .mkdir = catia_mkdir, - .rmdir = catia_rmdir, - .opendir = catia_opendir, - .open_fn = catia_open, - .rename = catia_rename, - .stat = catia_stat, - .lstat = catia_lstat, - .unlink = catia_unlink, - .chown = catia_chown, - .lchown = catia_lchown, - .chdir = catia_chdir, - .ntimes = catia_ntimes, - .realpath = catia_realpath, - .chflags = catia_chflags, - .streaminfo = catia_streaminfo, - .translate_name = catia_translate_name, - .get_nt_acl = catia_get_nt_acl, - .chmod_acl = catia_chmod_acl, - .sys_acl_get_file = catia_sys_acl_get_file, - .sys_acl_set_file = catia_sys_acl_set_file, - .sys_acl_delete_def_file = catia_sys_acl_delete_def_file, - .getxattr = catia_getxattr, - .lgetxattr = catia_lgetxattr, - .listxattr = catia_listxattr, - .llistxattr = catia_llistxattr, - .removexattr = catia_removexattr, - .lremovexattr = catia_lremovexattr, - .setxattr = catia_setxattr, - .lsetxattr = catia_lsetxattr, + .mkdir_fn = catia_mkdir, + .rmdir_fn = catia_rmdir, + .opendir_fn = catia_opendir, + .open_fn = catia_open, + .rename_fn = catia_rename, + .stat_fn = catia_stat, + .lstat_fn = catia_lstat, + .unlink_fn = catia_unlink, + .chown_fn = catia_chown, + .lchown_fn = catia_lchown, + .chdir_fn = catia_chdir, + .ntimes_fn = catia_ntimes, + .realpath_fn = catia_realpath, + .chflags_fn = catia_chflags, + .streaminfo_fn = catia_streaminfo, + .translate_name_fn = catia_translate_name, + .get_nt_acl_fn = catia_get_nt_acl, + .chmod_acl_fn = catia_chmod_acl, + .sys_acl_get_file_fn = catia_sys_acl_get_file, + .sys_acl_set_file_fn = catia_sys_acl_set_file, + .sys_acl_delete_def_file_fn = catia_sys_acl_delete_def_file, + .getxattr_fn = catia_getxattr, + .lgetxattr_fn = catia_lgetxattr, + .listxattr_fn = catia_listxattr, + .llistxattr_fn = catia_llistxattr, + .removexattr_fn = catia_removexattr, + .lremovexattr_fn = catia_lremovexattr, + .setxattr_fn = catia_setxattr, + .lsetxattr_fn = catia_lsetxattr, }; NTSTATUS vfs_catia_init(void) diff --git a/source3/modules/vfs_crossrename.c b/source3/modules/vfs_crossrename.c index 8f7c5f042b..a54125c326 100644 --- a/source3/modules/vfs_crossrename.c +++ b/source3/modules/vfs_crossrename.c @@ -191,7 +191,7 @@ static int crossrename_rename(vfs_handle_struct *handle, static struct vfs_fn_pointers vfs_crossrename_fns = { .connect_fn = crossrename_connect, - .rename = crossrename_rename + .rename_fn = crossrename_rename }; NTSTATUS vfs_crossrename_init(void); diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 4fd844a104..f556f1c496 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -2166,141 +2166,141 @@ static struct vfs_fn_pointers vfs_default_fns = { /* Disk operations */ .connect_fn = vfswrap_connect, - .disconnect = vfswrap_disconnect, - .disk_free = vfswrap_disk_free, - .get_quota = vfswrap_get_quota, - .set_quota = vfswrap_set_quota, - .get_shadow_copy_data = vfswrap_get_shadow_copy_data, - .statvfs = vfswrap_statvfs, - .fs_capabilities = vfswrap_fs_capabilities, - .get_dfs_referrals = vfswrap_get_dfs_referrals, + .disconnect_fn = vfswrap_disconnect, + .disk_free_fn = vfswrap_disk_free, + .get_quota_fn = vfswrap_get_quota, + .set_quota_fn = vfswrap_set_quota, + .get_shadow_copy_data_fn = vfswrap_get_shadow_copy_data, + .statvfs_fn = vfswrap_statvfs, + .fs_capabilities_fn = vfswrap_fs_capabilities, + .get_dfs_referrals_fn = vfswrap_get_dfs_referrals, /* Directory operations */ - .opendir = vfswrap_opendir, - .fdopendir = vfswrap_fdopendir, - .readdir = vfswrap_readdir, - .seekdir = vfswrap_seekdir, - .telldir = vfswrap_telldir, - .rewind_dir = vfswrap_rewinddir, - .mkdir = vfswrap_mkdir, - .rmdir = vfswrap_rmdir, - .closedir = vfswrap_closedir, - .init_search_op = vfswrap_init_search_op, + .opendir_fn = vfswrap_opendir, + .fdopendir_fn = vfswrap_fdopendir, + .readdir_fn = vfswrap_readdir, + .seekdir_fn = vfswrap_seekdir, + .telldir_fn = vfswrap_telldir, + .rewind_dir_fn = vfswrap_rewinddir, + .mkdir_fn = vfswrap_mkdir, + .rmdir_fn = vfswrap_rmdir, + .closedir_fn = vfswrap_closedir, + .init_search_op_fn = vfswrap_init_search_op, /* File operations */ .open_fn = vfswrap_open, - .create_file = vfswrap_create_file, + .create_file_fn = vfswrap_create_file, .close_fn = vfswrap_close, - .vfs_read = vfswrap_read, - .pread = vfswrap_pread, - .write = vfswrap_write, - .pwrite = vfswrap_pwrite, - .lseek = vfswrap_lseek, - .sendfile = vfswrap_sendfile, - .recvfile = vfswrap_recvfile, - .rename = vfswrap_rename, - .fsync = vfswrap_fsync, - .stat = vfswrap_stat, - .fstat = vfswrap_fstat, - .lstat = vfswrap_lstat, - .get_alloc_size = vfswrap_get_alloc_size, - .unlink = vfswrap_unlink, - .chmod = vfswrap_chmod, - .fchmod = vfswrap_fchmod, - .chown = vfswrap_chown, - .fchown = vfswrap_fchown, - .lchown = vfswrap_lchown, - .chdir = vfswrap_chdir, - .getwd = vfswrap_getwd, - .ntimes = vfswrap_ntimes, - .ftruncate = vfswrap_ftruncate, - .fallocate = vfswrap_fallocate, - .lock = vfswrap_lock, - .kernel_flock = vfswrap_kernel_flock, - .linux_setlease = vfswrap_linux_setlease, - .getlock = vfswrap_getlock, - .symlink = vfswrap_symlink, - .vfs_readlink = vfswrap_readlink, - .link = vfswrap_link, - .mknod = vfswrap_mknod, - .realpath = vfswrap_realpath, - .notify_watch = vfswrap_notify_watch, - .chflags = vfswrap_chflags, - .file_id_create = vfswrap_file_id_create, - .streaminfo = vfswrap_streaminfo, - .get_real_filename = vfswrap_get_real_filename, - .connectpath = vfswrap_connectpath, - .brl_lock_windows = vfswrap_brl_lock_windows, - .brl_unlock_windows = vfswrap_brl_unlock_windows, - .brl_cancel_windows = vfswrap_brl_cancel_windows, - .strict_lock = vfswrap_strict_lock, - .strict_unlock = vfswrap_strict_unlock, - .translate_name = vfswrap_translate_name, - .fsctl = vfswrap_fsctl, + .read_fn = vfswrap_read, + .pread_fn = vfswrap_pread, + .write_fn = vfswrap_write, + .pwrite_fn = vfswrap_pwrite, + .lseek_fn = vfswrap_lseek, + .sendfile_fn = vfswrap_sendfile, + .recvfile_fn = vfswrap_recvfile, + .rename_fn = vfswrap_rename, + .fsync_fn = vfswrap_fsync, + .stat_fn = vfswrap_stat, + .fstat_fn = vfswrap_fstat, + .lstat_fn = vfswrap_lstat, + .get_alloc_size_fn = vfswrap_get_alloc_size, + .unlink_fn = vfswrap_unlink, + .chmod_fn = vfswrap_chmod, + .fchmod_fn = vfswrap_fchmod, + .chown_fn = vfswrap_chown, + .fchown_fn = vfswrap_fchown, + .lchown_fn = vfswrap_lchown, + .chdir_fn = vfswrap_chdir, + .getwd_fn = vfswrap_getwd, + .ntimes_fn = vfswrap_ntimes, + .ftruncate_fn = vfswrap_ftruncate, + .fallocate_fn = vfswrap_fallocate, + .lock_fn = vfswrap_lock, + .kernel_flock_fn = vfswrap_kernel_flock, + .linux_setlease_fn = vfswrap_linux_setlease, + .getlock_fn = vfswrap_getlock, + .symlink_fn = vfswrap_symlink, + .readlink_fn = vfswrap_readlink, + .link_fn = vfswrap_link, + .mknod_fn = vfswrap_mknod, + .realpath_fn = vfswrap_realpath, + .notify_watch_fn = vfswrap_notify_watch, + .chflags_fn = vfswrap_chflags, + .file_id_create_fn = vfswrap_file_id_create, + .streaminfo_fn = vfswrap_streaminfo, + .get_real_filename_fn = vfswrap_get_real_filename, + .connectpath_fn = vfswrap_connectpath, + .brl_lock_windows_fn = vfswrap_brl_lock_windows, + .brl_unlock_windows_fn = vfswrap_brl_unlock_windows, + .brl_cancel_windows_fn = vfswrap_brl_cancel_windows, + .strict_lock_fn = vfswrap_strict_lock, + .strict_unlock_fn = vfswrap_strict_unlock, + .translate_name_fn = vfswrap_translate_name, + .fsctl_fn = vfswrap_fsctl, /* NT ACL operations. */ - .fget_nt_acl = vfswrap_fget_nt_acl, - .get_nt_acl = vfswrap_get_nt_acl, - .fset_nt_acl = vfswrap_fset_nt_acl, + .fget_nt_acl_fn = vfswrap_fget_nt_acl, + .get_nt_acl_fn = vfswrap_get_nt_acl, + .fset_nt_acl_fn = vfswrap_fset_nt_acl, /* POSIX ACL operations. */ - .chmod_acl = vfswrap_chmod_acl, - .fchmod_acl = vfswrap_fchmod_acl, - - .sys_acl_get_entry = vfswrap_sys_acl_get_entry, - .sys_acl_get_tag_type = vfswrap_sys_acl_get_tag_type, - .sys_acl_get_permset = vfswrap_sys_acl_get_permset, - .sys_acl_get_qualifier = vfswrap_sys_acl_get_qualifier, - .sys_acl_get_file = vfswrap_sys_acl_get_file, - .sys_acl_get_fd = vfswrap_sys_acl_get_fd, - .sys_acl_clear_perms = vfswrap_sys_acl_clear_perms, - .sys_acl_add_perm = vfswrap_sys_acl_add_perm, - .sys_acl_to_text = vfswrap_sys_acl_to_text, - .sys_acl_init = vfswrap_sys_acl_init, - .sys_acl_create_entry = vfswrap_sys_acl_create_entry, - .sys_acl_set_tag_type = vfswrap_sys_acl_set_tag_type, - .sys_acl_set_qualifier = vfswrap_sys_acl_set_qualifier, - .sys_acl_set_permset = vfswrap_sys_acl_set_permset, - .sys_acl_valid = vfswrap_sys_acl_valid, - .sys_acl_set_file = vfswrap_sys_acl_set_file, - .sys_acl_set_fd = vfswrap_sys_acl_set_fd, - .sys_acl_delete_def_file = vfswrap_sys_acl_delete_def_file, - .sys_acl_get_perm = vfswrap_sys_acl_get_perm, - .sys_acl_free_text = vfswrap_sys_acl_free_text, - .sys_acl_free_acl = vfswrap_sys_acl_free_acl, - .sys_acl_free_qualifier = vfswrap_sys_acl_free_qualifier, + .chmod_acl_fn = vfswrap_chmod_acl, + .fchmod_acl_fn = vfswrap_fchmod_acl, + + .sys_acl_get_entry_fn = vfswrap_sys_acl_get_entry, + .sys_acl_get_tag_type_fn = vfswrap_sys_acl_get_tag_type, + .sys_acl_get_permset_fn = vfswrap_sys_acl_get_permset, + .sys_acl_get_qualifier_fn = vfswrap_sys_acl_get_qualifier, + .sys_acl_get_file_fn = vfswrap_sys_acl_get_file, + .sys_acl_get_fd_fn = vfswrap_sys_acl_get_fd, + .sys_acl_clear_perms_fn = vfswrap_sys_acl_clear_perms, + .sys_acl_add_perm_fn = vfswrap_sys_acl_add_perm, + .sys_acl_to_text_fn = vfswrap_sys_acl_to_text, + .sys_acl_init_fn = vfswrap_sys_acl_init, + .sys_acl_create_entry_fn = vfswrap_sys_acl_create_entry, + .sys_acl_set_tag_type_fn = vfswrap_sys_acl_set_tag_type, + .sys_acl_set_qualifier_fn = vfswrap_sys_acl_set_qualifier, + .sys_acl_set_permset_fn = vfswrap_sys_acl_set_permset, + .sys_acl_valid_fn = vfswrap_sys_acl_valid, + .sys_acl_set_file_fn = vfswrap_sys_acl_set_file, + .sys_acl_set_fd_fn = vfswrap_sys_acl_set_fd, + .sys_acl_delete_def_file_fn = vfswrap_sys_acl_delete_def_file, + .sys_acl_get_perm_fn = vfswrap_sys_acl_get_perm, + .sys_acl_free_text_fn = vfswrap_sys_acl_free_text, + .sys_acl_free_acl_fn = vfswrap_sys_acl_free_acl, + .sys_acl_free_qualifier_fn = vfswrap_sys_acl_free_qualifier, /* EA operations. */ - .getxattr = vfswrap_getxattr, - .lgetxattr = vfswrap_lgetxattr, - .fgetxattr = vfswrap_fgetxattr, - .listxattr = vfswrap_listxattr, - .llistxattr = vfswrap_llistxattr, - .flistxattr = vfswrap_flistxattr, - .removexattr = vfswrap_removexattr, - .lremovexattr = vfswrap_lremovexattr, - .fremovexattr = vfswrap_fremovexattr, - .setxattr = vfswrap_setxattr, - .lsetxattr = vfswrap_lsetxattr, - .fsetxattr = vfswrap_fsetxattr, + .getxattr_fn = vfswrap_getxattr, + .lgetxattr_fn = vfswrap_lgetxattr, + .fgetxattr_fn = vfswrap_fgetxattr, + .listxattr_fn = vfswrap_listxattr, + .llistxattr_fn = vfswrap_llistxattr, + .flistxattr_fn = vfswrap_flistxattr, + .removexattr_fn = vfswrap_removexattr, + .lremovexattr_fn = vfswrap_lremovexattr, + .fremovexattr_fn = vfswrap_fremovexattr, + .setxattr_fn = vfswrap_setxattr, + .lsetxattr_fn = vfswrap_lsetxattr, + .fsetxattr_fn = vfswrap_fsetxattr, /* aio operations */ - .aio_read = vfswrap_aio_read, - .aio_write = vfswrap_aio_write, + .aio_read_fn = vfswrap_aio_read, + .aio_write_fn = vfswrap_aio_write, .aio_return_fn = vfswrap_aio_return, - .aio_cancel = vfswrap_aio_cancel, + .aio_cancel_fn = vfswrap_aio_cancel, .aio_error_fn = vfswrap_aio_error, - .aio_fsync = vfswrap_aio_fsync, - .aio_suspend = vfswrap_aio_suspend, - .aio_force = vfswrap_aio_force, + .aio_fsync_fn = vfswrap_aio_fsync, + .aio_suspend_fn = vfswrap_aio_suspend, + .aio_force_fn = vfswrap_aio_force, /* offline operations */ - .is_offline = vfswrap_is_offline, - .set_offline = vfswrap_set_offline + .is_offline_fn = vfswrap_is_offline, + .set_offline_fn = vfswrap_set_offline }; NTSTATUS vfs_default_init(void); diff --git a/source3/modules/vfs_default_quota.c b/source3/modules/vfs_default_quota.c index fc95ef2e3b..7b9b0c8470 100644 --- a/source3/modules/vfs_default_quota.c +++ b/source3/modules/vfs_default_quota.c @@ -216,8 +216,8 @@ static int default_quota_set_quota(vfs_handle_struct *handle, enum SMB_QUOTA_TYP } static struct vfs_fn_pointers vfs_default_quota_fns = { - .get_quota = default_quota_get_quota, - .set_quota = default_quota_set_quota + .get_quota_fn = default_quota_get_quota, + .set_quota_fn = default_quota_set_quota }; NTSTATUS vfs_default_quota_init(void); diff --git a/source3/modules/vfs_dfs_samba4.c b/source3/modules/vfs_dfs_samba4.c index a611de8415..ad6f0411a1 100644 --- a/source3/modules/vfs_dfs_samba4.c +++ b/source3/modules/vfs_dfs_samba4.c @@ -131,8 +131,8 @@ static NTSTATUS dfs_samba4_get_referrals(struct vfs_handle_struct *handle, static struct vfs_fn_pointers vfs_dfs_samba4_fns = { .connect_fn = dfs_samba4_connect, - .disconnect = dfs_samba4_disconnect, - .get_dfs_referrals = dfs_samba4_get_referrals, + .disconnect_fn = dfs_samba4_disconnect, + .get_dfs_referrals_fn = dfs_samba4_get_referrals, }; NTSTATUS vfs_dfs_samba4_init(void); diff --git a/source3/modules/vfs_dirsort.c b/source3/modules/vfs_dirsort.c index ba8441c2df..1c7aaba640 100644 --- a/source3/modules/vfs_dirsort.c +++ b/source3/modules/vfs_dirsort.c @@ -222,12 +222,12 @@ static void dirsort_rewinddir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp) } static struct vfs_fn_pointers vfs_dirsort_fns = { - .opendir = dirsort_opendir, - .fdopendir = dirsort_fdopendir, - .readdir = dirsort_readdir, - .seekdir = dirsort_seekdir, - .telldir = dirsort_telldir, - .rewind_dir = dirsort_rewinddir, + .opendir_fn = dirsort_opendir, + .fdopendir_fn = dirsort_fdopendir, + .readdir_fn = dirsort_readdir, + .seekdir_fn = dirsort_seekdir, + .telldir_fn = dirsort_telldir, + .rewind_dir_fn = dirsort_rewinddir, }; NTSTATUS vfs_dirsort_init(void) diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c index a0d0d3d12a..d6e25776f1 100644 --- a/source3/modules/vfs_expand_msdfs.c +++ b/source3/modules/vfs_expand_msdfs.c @@ -224,7 +224,7 @@ static int expand_msdfs_readlink(struct vfs_handle_struct *handle, } static struct vfs_fn_pointers vfs_expand_msdfs_fns = { - .vfs_readlink = expand_msdfs_readlink + .readlink_fn = expand_msdfs_readlink }; NTSTATUS vfs_expand_msdfs_init(void); diff --git a/source3/modules/vfs_extd_audit.c b/source3/modules/vfs_extd_audit.c index fa8e9b14f9..6aab9cecbe 100644 --- a/source3/modules/vfs_extd_audit.c +++ b/source3/modules/vfs_extd_audit.c @@ -346,18 +346,18 @@ static int audit_fchmod_acl(vfs_handle_struct *handle, files_struct *fsp, mode_t static struct vfs_fn_pointers vfs_extd_audit_fns = { .connect_fn = audit_connect, - .disconnect = audit_disconnect, - .opendir = audit_opendir, - .mkdir = audit_mkdir, - .rmdir = audit_rmdir, + .disconnect_fn = audit_disconnect, + .opendir_fn = audit_opendir, + .mkdir_fn = audit_mkdir, + .rmdir_fn = audit_rmdir, .open_fn = audit_open, .close_fn = audit_close, - .rename = audit_rename, - .unlink = audit_unlink, - .chmod = audit_chmod, - .fchmod = audit_fchmod, - .chmod_acl = audit_chmod_acl, - .fchmod_acl = audit_fchmod_acl, + .rename_fn = audit_rename, + .unlink_fn = audit_unlink, + .chmod_fn = audit_chmod, + .fchmod_fn = audit_fchmod, + .chmod_acl_fn = audit_chmod_acl, + .fchmod_acl_fn = audit_fchmod_acl, }; NTSTATUS vfs_extd_audit_init(void) diff --git a/source3/modules/vfs_fake_perms.c b/source3/modules/vfs_fake_perms.c index a7de8af6b1..4cda7ea160 100644 --- a/source3/modules/vfs_fake_perms.c +++ b/source3/modules/vfs_fake_perms.c @@ -66,8 +66,8 @@ static int fake_perms_fstat(vfs_handle_struct *handle, files_struct *fsp, SMB_ST } static struct vfs_fn_pointers vfs_fake_perms_fns = { - .stat = fake_perms_stat, - .fstat = fake_perms_fstat + .stat_fn = fake_perms_stat, + .fstat_fn = fake_perms_fstat }; NTSTATUS vfs_fake_perms_init(void); diff --git a/source3/modules/vfs_fileid.c b/source3/modules/vfs_fileid.c index 1168d50cb2..6237513f23 100644 --- a/source3/modules/vfs_fileid.c +++ b/source3/modules/vfs_fileid.c @@ -254,8 +254,8 @@ static struct file_id fileid_file_id_create(struct vfs_handle_struct *handle, static struct vfs_fn_pointers vfs_fileid_fns = { .connect_fn = fileid_connect, - .disconnect = fileid_disconnect, - .file_id_create = fileid_file_id_create + .disconnect_fn = fileid_disconnect, + .file_id_create_fn = fileid_file_id_create }; NTSTATUS vfs_fileid_init(void); diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index 9471e6d8c2..3efa848d22 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -2241,120 +2241,120 @@ static struct vfs_fn_pointers vfs_full_audit_fns = { /* Disk operations */ .connect_fn = smb_full_audit_connect, - .disconnect = smb_full_audit_disconnect, - .disk_free = smb_full_audit_disk_free, - .get_quota = smb_full_audit_get_quota, - .set_quota = smb_full_audit_set_quota, - .get_shadow_copy_data = smb_full_audit_get_shadow_copy_data, - .statvfs = smb_full_audit_statvfs, - .fs_capabilities = smb_full_audit_fs_capabilities, - .opendir = smb_full_audit_opendir, - .fdopendir = smb_full_audit_fdopendir, - .readdir = smb_full_audit_readdir, - .seekdir = smb_full_audit_seekdir, - .telldir = smb_full_audit_telldir, - .rewind_dir = smb_full_audit_rewinddir, - .mkdir = smb_full_audit_mkdir, - .rmdir = smb_full_audit_rmdir, - .closedir = smb_full_audit_closedir, - .init_search_op = smb_full_audit_init_search_op, + .disconnect_fn = smb_full_audit_disconnect, + .disk_free_fn = smb_full_audit_disk_free, + .get_quota_fn = smb_full_audit_get_quota, + .set_quota_fn = smb_full_audit_set_quota, + .get_shadow_copy_data_fn = smb_full_audit_get_shadow_copy_data, + .statvfs_fn = smb_full_audit_statvfs, + .fs_capabilities_fn = smb_full_audit_fs_capabilities, + .opendir_fn = smb_full_audit_opendir, + .fdopendir_fn = smb_full_audit_fdopendir, + .readdir_fn = smb_full_audit_readdir, + .seekdir_fn = smb_full_audit_seekdir, + .telldir_fn = smb_full_audit_telldir, + .rewind_dir_fn = smb_full_audit_rewinddir, + .mkdir_fn = smb_full_audit_mkdir, + .rmdir_fn = smb_full_audit_rmdir, + .closedir_fn = smb_full_audit_closedir, + .init_search_op_fn = smb_full_audit_init_search_op, .open_fn = smb_full_audit_open, - .create_file = smb_full_audit_create_file, + .create_file_fn = smb_full_audit_create_file, .close_fn = smb_full_audit_close, - .vfs_read = smb_full_audit_read, - .pread = smb_full_audit_pread, - .write = smb_full_audit_write, - .pwrite = smb_full_audit_pwrite, - .lseek = smb_full_audit_lseek, - .sendfile = smb_full_audit_sendfile, - .recvfile = smb_full_audit_recvfile, - .rename = smb_full_audit_rename, - .fsync = smb_full_audit_fsync, - .stat = smb_full_audit_stat, - .fstat = smb_full_audit_fstat, - .lstat = smb_full_audit_lstat, - .get_alloc_size = smb_full_audit_get_alloc_size, - .unlink = smb_full_audit_unlink, - .chmod = smb_full_audit_chmod, - .fchmod = smb_full_audit_fchmod, - .chown = smb_full_audit_chown, - .fchown = smb_full_audit_fchown, - .lchown = smb_full_audit_lchown, - .chdir = smb_full_audit_chdir, - .getwd = smb_full_audit_getwd, - .ntimes = smb_full_audit_ntimes, - .ftruncate = smb_full_audit_ftruncate, - .fallocate = smb_full_audit_fallocate, - .lock = smb_full_audit_lock, - .kernel_flock = smb_full_audit_kernel_flock, - .linux_setlease = smb_full_audit_linux_setlease, - .getlock = smb_full_audit_getlock, - .symlink = smb_full_audit_symlink, - .vfs_readlink = smb_full_audit_readlink, - .link = smb_full_audit_link, - .mknod = smb_full_audit_mknod, - .realpath = smb_full_audit_realpath, - .notify_watch = smb_full_audit_notify_watch, - .chflags = smb_full_audit_chflags, - .file_id_create = smb_full_audit_file_id_create, - .streaminfo = smb_full_audit_streaminfo, - .get_real_filename = smb_full_audit_get_real_filename, - .connectpath = smb_full_audit_connectpath, - .brl_lock_windows = smb_full_audit_brl_lock_windows, - .brl_unlock_windows = smb_full_audit_brl_unlock_windows, - .brl_cancel_windows = smb_full_audit_brl_cancel_windows, - .strict_lock = smb_full_audit_strict_lock, - .strict_unlock = smb_full_audit_strict_unlock, - .translate_name = smb_full_audit_translate_name, - .fget_nt_acl = smb_full_audit_fget_nt_acl, - .get_nt_acl = smb_full_audit_get_nt_acl, - .fset_nt_acl = smb_full_audit_fset_nt_acl, - .chmod_acl = smb_full_audit_chmod_acl, - .fchmod_acl = smb_full_audit_fchmod_acl, - .sys_acl_get_entry = smb_full_audit_sys_acl_get_entry, - .sys_acl_get_tag_type = smb_full_audit_sys_acl_get_tag_type, - .sys_acl_get_permset = smb_full_audit_sys_acl_get_permset, - .sys_acl_get_qualifier = smb_full_audit_sys_acl_get_qualifier, - .sys_acl_get_file = smb_full_audit_sys_acl_get_file, - .sys_acl_get_fd = smb_full_audit_sys_acl_get_fd, - .sys_acl_clear_perms = smb_full_audit_sys_acl_clear_perms, - .sys_acl_add_perm = smb_full_audit_sys_acl_add_perm, - .sys_acl_to_text = smb_full_audit_sys_acl_to_text, - .sys_acl_init = smb_full_audit_sys_acl_init, - .sys_acl_create_entry = smb_full_audit_sys_acl_create_entry, - .sys_acl_set_tag_type = smb_full_audit_sys_acl_set_tag_type, - .sys_acl_set_qualifier = smb_full_audit_sys_acl_set_qualifier, - .sys_acl_set_permset = smb_full_audit_sys_acl_set_permset, - .sys_acl_valid = smb_full_audit_sys_acl_valid, - .sys_acl_set_file = smb_full_audit_sys_acl_set_file, - .sys_acl_set_fd = smb_full_audit_sys_acl_set_fd, - .sys_acl_delete_def_file = smb_full_audit_sys_acl_delete_def_file, - .sys_acl_get_perm = smb_full_audit_sys_acl_get_perm, - .sys_acl_free_text = smb_full_audit_sys_acl_free_text, - .sys_acl_free_acl = smb_full_audit_sys_acl_free_acl, - .sys_acl_free_qualifier = smb_full_audit_sys_acl_free_qualifier, - .getxattr = smb_full_audit_getxattr, - .lgetxattr = smb_full_audit_lgetxattr, - .fgetxattr = smb_full_audit_fgetxattr, - .listxattr = smb_full_audit_listxattr, - .llistxattr = smb_full_audit_llistxattr, - .flistxattr = smb_full_audit_flistxattr, - .removexattr = smb_full_audit_removexattr, - .lremovexattr = smb_full_audit_lremovexattr, - .fremovexattr = smb_full_audit_fremovexattr, - .setxattr = smb_full_audit_setxattr, - .lsetxattr = smb_full_audit_lsetxattr, - .fsetxattr = smb_full_audit_fsetxattr, - .aio_read = smb_full_audit_aio_read, - .aio_write = smb_full_audit_aio_write, + .read_fn = smb_full_audit_read, + .pread_fn = smb_full_audit_pread, + .write_fn = smb_full_audit_write, + .pwrite_fn = smb_full_audit_pwrite, + .lseek_fn = smb_full_audit_lseek, + .sendfile_fn = smb_full_audit_sendfile, + .recvfile_fn = smb_full_audit_recvfile, + .rename_fn = smb_full_audit_rename, + .fsync_fn = smb_full_audit_fsync, + .stat_fn = smb_full_audit_stat, + .fstat_fn = smb_full_audit_fstat, + .lstat_fn = smb_full_audit_lstat, + .get_alloc_size_fn = smb_full_audit_get_alloc_size, + .unlink_fn = smb_full_audit_unlink, + .chmod_fn = smb_full_audit_chmod, + .fchmod_fn = smb_full_audit_fchmod, + .chown_fn = smb_full_audit_chown, + .fchown_fn = smb_full_audit_fchown, + .lchown_fn = smb_full_audit_lchown, + .chdir_fn = smb_full_audit_chdir, + .getwd_fn = smb_full_audit_getwd, + .ntimes_fn = smb_full_audit_ntimes, + .ftruncate_fn = smb_full_audit_ftruncate, + .fallocate_fn = smb_full_audit_fallocate, + .lock_fn = smb_full_audit_lock, + .kernel_flock_fn = smb_full_audit_kernel_flock, + .linux_setlease_fn = smb_full_audit_linux_setlease, + .getlock_fn = smb_full_audit_getlock, + .symlink_fn = smb_full_audit_symlink, + .readlink_fn = smb_full_audit_readlink, + .link_fn = smb_full_audit_link, + .mknod_fn = smb_full_audit_mknod, + .realpath_fn = smb_full_audit_realpath, + .notify_watch_fn = smb_full_audit_notify_watch, + .chflags_fn = smb_full_audit_chflags, + .file_id_create_fn = smb_full_audit_file_id_create, + .streaminfo_fn = smb_full_audit_streaminfo, + .get_real_filename_fn = smb_full_audit_get_real_filename, + .connectpath_fn = smb_full_audit_connectpath, + .brl_lock_windows_fn = smb_full_audit_brl_lock_windows, + .brl_unlock_windows_fn = smb_full_audit_brl_unlock_windows, + .brl_cancel_windows_fn = smb_full_audit_brl_cancel_windows, + .strict_lock_fn = smb_full_audit_strict_lock, + .strict_unlock_fn = smb_full_audit_strict_unlock, + .translate_name_fn = smb_full_audit_translate_name, + .fget_nt_acl_fn = smb_full_audit_fget_nt_acl, + .get_nt_acl_fn = smb_full_audit_get_nt_acl, + .fset_nt_acl_fn = smb_full_audit_fset_nt_acl, + .chmod_acl_fn = smb_full_audit_chmod_acl, + .fchmod_acl_fn = smb_full_audit_fchmod_acl, + .sys_acl_get_entry_fn = smb_full_audit_sys_acl_get_entry, + .sys_acl_get_tag_type_fn = smb_full_audit_sys_acl_get_tag_type, + .sys_acl_get_permset_fn = smb_full_audit_sys_acl_get_permset, + .sys_acl_get_qualifier_fn = smb_full_audit_sys_acl_get_qualifier, + .sys_acl_get_file_fn = smb_full_audit_sys_acl_get_file, + .sys_acl_get_fd_fn = smb_full_audit_sys_acl_get_fd, + .sys_acl_clear_perms_fn = smb_full_audit_sys_acl_clear_perms, + .sys_acl_add_perm_fn = smb_full_audit_sys_acl_add_perm, + .sys_acl_to_text_fn = smb_full_audit_sys_acl_to_text, + .sys_acl_init_fn = smb_full_audit_sys_acl_init, + .sys_acl_create_entry_fn = smb_full_audit_sys_acl_create_entry, + .sys_acl_set_tag_type_fn = smb_full_audit_sys_acl_set_tag_type, + .sys_acl_set_qualifier_fn = smb_full_audit_sys_acl_set_qualifier, + .sys_acl_set_permset_fn = smb_full_audit_sys_acl_set_permset, + .sys_acl_valid_fn = smb_full_audit_sys_acl_valid, + .sys_acl_set_file_fn = smb_full_audit_sys_acl_set_file, + .sys_acl_set_fd_fn = smb_full_audit_sys_acl_set_fd, + .sys_acl_delete_def_file_fn = smb_full_audit_sys_acl_delete_def_file, + .sys_acl_get_perm_fn = smb_full_audit_sys_acl_get_perm, + .sys_acl_free_text_fn = smb_full_audit_sys_acl_free_text, + .sys_acl_free_acl_fn = smb_full_audit_sys_acl_free_acl, + .sys_acl_free_qualifier_fn = smb_full_audit_sys_acl_free_qualifier, + .getxattr_fn = smb_full_audit_getxattr, + .lgetxattr_fn = smb_full_audit_lgetxattr, + .fgetxattr_fn = smb_full_audit_fgetxattr, + .listxattr_fn = smb_full_audit_listxattr, + .llistxattr_fn = smb_full_audit_llistxattr, + .flistxattr_fn = smb_full_audit_flistxattr, + .removexattr_fn = smb_full_audit_removexattr, + .lremovexattr_fn = smb_full_audit_lremovexattr, + .fremovexattr_fn = smb_full_audit_fremovexattr, + .setxattr_fn = smb_full_audit_setxattr, + .lsetxattr_fn = smb_full_audit_lsetxattr, + .fsetxattr_fn = smb_full_audit_fsetxattr, + .aio_read_fn = smb_full_audit_aio_read, + .aio_write_fn = smb_full_audit_aio_write, .aio_return_fn = smb_full_audit_aio_return, - .aio_cancel = smb_full_audit_aio_cancel, + .aio_cancel_fn = smb_full_audit_aio_cancel, .aio_error_fn = smb_full_audit_aio_error, - .aio_fsync = smb_full_audit_aio_fsync, - .aio_suspend = smb_full_audit_aio_suspend, - .aio_force = smb_full_audit_aio_force, - .is_offline = smb_full_audit_is_offline, - .set_offline = smb_full_audit_set_offline, + .aio_fsync_fn = smb_full_audit_aio_fsync, + .aio_suspend_fn = smb_full_audit_aio_suspend, + .aio_force_fn = smb_full_audit_aio_force, + .is_offline_fn = smb_full_audit_is_offline, + .set_offline_fn = smb_full_audit_set_offline, }; NTSTATUS vfs_full_audit_init(void) diff --git a/source3/modules/vfs_gpfs_hsm_notify.c b/source3/modules/vfs_gpfs_hsm_notify.c index fa24db9983..7ff5355c95 100644 --- a/source3/modules/vfs_gpfs_hsm_notify.c +++ b/source3/modules/vfs_gpfs_hsm_notify.c @@ -97,8 +97,8 @@ static ssize_t vfs_gpfs_hsm_notify_aio_return(struct vfs_handle_struct *handle, } static struct vfs_fn_pointers vfs_gpfs_hsm_notify_fns = { - .pread = vfs_gpfs_hsm_notify_pread, - .pwrite = vfs_gpfs_hsm_notify_pwrite, + .pread_fn = vfs_gpfs_hsm_notify_pread, + .pwrite_fn = vfs_gpfs_hsm_notify_pwrite, .aio_return_fn = vfs_gpfs_hsm_notify_aio_return }; diff --git a/source3/modules/vfs_hpuxacl.c b/source3/modules/vfs_hpuxacl.c index 0f5af9d318..5acfd1e25b 100644 --- a/source3/modules/vfs_hpuxacl.c +++ b/source3/modules/vfs_hpuxacl.c @@ -1170,11 +1170,11 @@ static bool hpux_acl_check(HPUX_ACL_T hpux_acl, int count) /* VFS operations structure */ static struct vfs_fn_pointers hpuxacl_fns = { - .sys_acl_get_file = hpuxacl_sys_acl_get_file, - .sys_acl_get_fd = hpuxacl_sys_acl_get_fd, - .sys_acl_set_file = hpuxacl_sys_acl_set_file, - .sys_acl_set_fd = hpuxacl_sys_acl_set_fd, - .sys_acl_delete_def_file = hpuxacl_sys_acl_delete_def_file, + .sys_acl_get_file_fn = hpuxacl_sys_acl_get_file, + .sys_acl_get_fd_fn = hpuxacl_sys_acl_get_fd, + .sys_acl_set_file_fn = hpuxacl_sys_acl_set_file, + .sys_acl_set_fd_fn = hpuxacl_sys_acl_set_fd, + .sys_acl_delete_def_file_fn = hpuxacl_sys_acl_delete_def_file, }; NTSTATUS vfs_hpuxacl_init(void) diff --git a/source3/modules/vfs_irixacl.c b/source3/modules/vfs_irixacl.c index b14abcca47..8a24ee7263 100644 --- a/source3/modules/vfs_irixacl.c +++ b/source3/modules/vfs_irixacl.c @@ -71,11 +71,11 @@ int irixacl_sys_acl_delete_def_file(vfs_handle_struct *handle, /* VFS operations structure */ static struct vfs_fn_pointers irixacl_fns = { - .sys_acl_get_file = irixacl_sys_acl_get_file, - .sys_acl_get_fd = irixacl_sys_acl_get_fd, - .sys_acl_set_file = irixacl_sys_acl_set_file, - .sys_acl_set_fd = irixacl_sys_acl_set_fd, - .sys_acl_delete_def_file = irixacl_sys_acl_delete_def_file, + .sys_acl_get_file_fn = irixacl_sys_acl_get_file, + .sys_acl_get_fd_fn = irixacl_sys_acl_get_fd, + .sys_acl_set_file_fn = irixacl_sys_acl_set_file, + .sys_acl_set_fd_fn = irixacl_sys_acl_set_fd, + .sys_acl_delete_def_file_fn = irixacl_sys_acl_delete_def_file, }; NTSTATUS vfs_irixacl_init(void); diff --git a/source3/modules/vfs_linux_xfs_sgid.c b/source3/modules/vfs_linux_xfs_sgid.c index fee12b0110..5a33f63d26 100644 --- a/source3/modules/vfs_linux_xfs_sgid.c +++ b/source3/modules/vfs_linux_xfs_sgid.c @@ -95,8 +95,8 @@ static int linux_xfs_sgid_chmod_acl(vfs_handle_struct *handle, } static struct vfs_fn_pointers linux_xfs_sgid_fns = { - .mkdir = linux_xfs_sgid_mkdir, - .chmod_acl = linux_xfs_sgid_chmod_acl, + .mkdir_fn = linux_xfs_sgid_mkdir, + .chmod_acl_fn = linux_xfs_sgid_chmod_acl, }; NTSTATUS vfs_linux_xfs_sgid_init(void); diff --git a/source3/modules/vfs_netatalk.c b/source3/modules/vfs_netatalk.c index 3e5606b553..95de44137b 100644 --- a/source3/modules/vfs_netatalk.c +++ b/source3/modules/vfs_netatalk.c @@ -455,14 +455,14 @@ exit_lchown: } static struct vfs_fn_pointers vfs_netatalk_fns = { - .opendir = atalk_opendir, - .fdopendir = atalk_fdopendir, - .rmdir = atalk_rmdir, - .rename = atalk_rename, - .unlink = atalk_unlink, - .chmod = atalk_chmod, - .chown = atalk_chown, - .lchown = atalk_lchown, + .opendir_fn = atalk_opendir, + .fdopendir_fn = atalk_fdopendir, + .rmdir_fn = atalk_rmdir, + .rename_fn = atalk_rename, + .unlink_fn = atalk_unlink, + .chmod_fn = atalk_chmod, + .chown_fn = atalk_chown, + .lchown_fn = atalk_lchown, }; NTSTATUS vfs_netatalk_init(void); diff --git a/source3/modules/vfs_notify_fam.c b/source3/modules/vfs_notify_fam.c index 1f76a05fc0..343149423e 100644 --- a/source3/modules/vfs_notify_fam.c +++ b/source3/modules/vfs_notify_fam.c @@ -301,7 +301,7 @@ static NTSTATUS fam_watch(vfs_handle_struct *vfs_handle, /* VFS operations structure */ static struct vfs_fn_pointers notify_fam_fns = { - .notify_watch = fam_watch, + .notify_watch_fn = fam_watch, }; diff --git a/source3/modules/vfs_onefs.c b/source3/modules/vfs_onefs.c index efc8b8aae2..5866eb49c8 100644 --- a/source3/modules/vfs_onefs.c +++ b/source3/modules/vfs_onefs.c @@ -256,40 +256,40 @@ static uint32_t onefs_fs_capabilities(struct vfs_handle_struct *handle, enum tim static struct vfs_fn_pointers onefs_fns = { .connect_fn = onefs_connect, - .fs_capabilities = onefs_fs_capabilities, - .opendir = onefs_opendir, - .readdir = onefs_readdir, - .seekdir = onefs_seekdir, - .telldir = onefs_telldir, - .rewind_dir = onefs_rewinddir, - .mkdir = onefs_mkdir, - .closedir = onefs_closedir, - .init_search_op = onefs_init_search_op, + .fs_capabilities_fn = onefs_fs_capabilities, + .opendir_fn = onefs_opendir, + .readdir_fn = onefs_readdir, + .seekdir_fn = onefs_seekdir, + .telldir_fn = onefs_telldir, + .rewind_dir_fn = onefs_rewinddir, + .mkdir_fn = onefs_mkdir, + .closedir_fn = onefs_closedir, + .init_search_op_fn = onefs_init_search_op, .open_fn = onefs_open, - .create_file = onefs_create_file, + .create_file_fn = onefs_create_file, .close_fn = onefs_close, - .sendfile = onefs_sendfile, - .recvfile = onefs_recvfile, - .rename = onefs_rename, - .stat = onefs_stat, - .fstat = onefs_fstat, - .lstat = onefs_lstat, - .get_alloc_size = onefs_get_alloc_size, - .unlink = onefs_unlink, - .ntimes = onefs_ntimes, - .file_id_create = onefs_file_id_create, - .streaminfo = onefs_streaminfo, - .brl_lock_windows = onefs_brl_lock_windows, - .brl_unlock_windows = onefs_brl_unlock_windows, - .brl_cancel_windows = onefs_brl_cancel_windows, - .strict_lock = onefs_strict_lock, - .strict_unlock = onefs_strict_unlock, - .notify_watch = onefs_notify_watch, - .fget_nt_acl = onefs_fget_nt_acl, - .get_nt_acl = onefs_get_nt_acl, - .fset_nt_acl = onefs_fset_nt_acl, - .statvfs = onefs_statvfs, - .get_real_filename = onefs_get_real_filename, + .sendfile_fn = onefs_sendfile, + .recvfile_fn = onefs_recvfile, + .rename_fn = onefs_rename, + .stat_fn = onefs_stat, + .fstat_fn = onefs_fstat, + .lstat_fn = onefs_lstat, + .get_alloc_size_fn = onefs_get_alloc_size, + .unlink_fn = onefs_unlink, + .ntimes_fn = onefs_ntimes, + .file_id_create_fn = onefs_file_id_create, + .streaminfo_fn = onefs_streaminfo, + .brl_lock_windows_fn = onefs_brl_lock_windows, + .brl_unlock_windows_fn = onefs_brl_unlock_windows, + .brl_cancel_windows_fn = onefs_brl_cancel_windows, + .strict_lock_fn = onefs_strict_lock, + .strict_unlock_fn = onefs_strict_unlock, + .notify_watch_fn = onefs_notify_watch, + .fget_nt_acl_fn = onefs_fget_nt_acl, + .get_nt_acl_fn = onefs_get_nt_acl, + .fset_nt_acl_fn = onefs_fset_nt_acl, + .statvfs_fn = onefs_statvfs, + .get_real_filename_fn = onefs_get_real_filename, }; NTSTATUS vfs_onefs_init(void) diff --git a/source3/modules/vfs_onefs_shadow_copy.c b/source3/modules/vfs_onefs_shadow_copy.c index a8a41bf8c5..3b25942e68 100644 --- a/source3/modules/vfs_onefs_shadow_copy.c +++ b/source3/modules/vfs_onefs_shadow_copy.c @@ -657,47 +657,47 @@ onefs_shadow_copy_set_offline(struct vfs_handle_struct *handle, /* VFS operations structure */ static struct vfs_fn_pointers onefs_shadow_copy_fns = { - .disk_free = onefs_shadow_copy_disk_free, - .get_shadow_copy_data = onefs_shadow_copy_get_shadow_copy_data, - .statvfs = onefs_shadow_copy_statvfs, - .opendir = onefs_shadow_copy_opendir, - .mkdir = onefs_shadow_copy_mkdir, - .rmdir = onefs_shadow_copy_rmdir, + .disk_free_fn = onefs_shadow_copy_disk_free, + .get_shadow_copy_data_fn = onefs_shadow_copy_get_shadow_copy_data, + .statvfs_fn = onefs_shadow_copy_statvfs, + .opendir_fn = onefs_shadow_copy_opendir, + .mkdir_fn = onefs_shadow_copy_mkdir, + .rmdir_fn = onefs_shadow_copy_rmdir, .open_fn = onefs_shadow_copy_open, - .create_file = onefs_shadow_copy_create_file, - .rename = onefs_shadow_copy_rename, - .stat = onefs_shadow_copy_stat, - .stat = onefs_shadow_copy_stat, - .lstat = onefs_shadow_copy_lstat, - .unlink = onefs_shadow_copy_unlink, - .chmod = onefs_shadow_copy_chmod, - .chown = onefs_shadow_copy_chown, - .lchown = onefs_shadow_copy_lchown, - .chdir = onefs_shadow_copy_chdir, - .ntimes = onefs_shadow_copy_ntimes, - .symlink = onefs_shadow_copy_symlink, - .vfs_readlink = onefs_shadow_copy_readlink, - .link = onefs_shadow_copy_link, - .mknod = onefs_shadow_copy_mknod, - .realpath = onefs_shadow_copy_realpath, - .chflags = onefs_shadow_copy_chflags, - .streaminfo = onefs_shadow_copy_streaminfo, - .get_real_filename = onefs_shadow_copy_get_real_filename, - .get_nt_acl = onefs_shadow_copy_get_nt_acl, - .chmod_acl = onefs_shadow_copy_chmod_acl, - .sys_acl_get_file = onefs_shadow_copy_sys_acl_get_file, - .sys_acl_set_file = onefs_shadow_copy_sys_acl_set_file, - .sys_acl_delete_def_file = onefs_shadow_copy_sys_acl_delete_def_file, - .getxattr = onefs_shadow_copy_getxattr, - .lgetxattr = onefs_shadow_copy_lgetxattr, - .listxattr = onefs_shadow_copy_listxattr, - .llistxattr = onefs_shadow_copy_llistxattr, - .removexattr = onefs_shadow_copy_removexattr, - .lremovexattr = onefs_shadow_copy_lremovexattr, - .setxattr = onefs_shadow_copy_setxattr, - .lsetxattr = onefs_shadow_copy_lsetxattr, - .is_offline = onefs_shadow_copy_is_offline, - .set_offline = onefs_shadow_copy_set_offline, + .create_file_fn = onefs_shadow_copy_create_file, + .rename_fn = onefs_shadow_copy_rename, + .stat_fn = onefs_shadow_copy_stat, + .stat_fn = onefs_shadow_copy_stat, + .lstat_fn = onefs_shadow_copy_lstat, + .unlink_fn = onefs_shadow_copy_unlink, + .chmod_fn = onefs_shadow_copy_chmod, + .chown_fn = onefs_shadow_copy_chown, + .lchown_fn = onefs_shadow_copy_lchown, + .chdir_fn = onefs_shadow_copy_chdir, + .ntimes_fn = onefs_shadow_copy_ntimes, + .symlink_fn = onefs_shadow_copy_symlink, + .readlink_fn = onefs_shadow_copy_readlink, + .link_fn = onefs_shadow_copy_link, + .mknod_fn = onefs_shadow_copy_mknod, + .realpath_fn = onefs_shadow_copy_realpath, + .chflags_fn = onefs_shadow_copy_chflags, + .streaminfo_fn = onefs_shadow_copy_streaminfo, + .get_real_filename_fn = onefs_shadow_copy_get_real_filename, + .get_nt_acl_fn = onefs_shadow_copy_get_nt_acl, + .chmod_acl_fn = onefs_shadow_copy_chmod_acl, + .sys_acl_get_file_fn = onefs_shadow_copy_sys_acl_get_file, + .sys_acl_set_file_fn = onefs_shadow_copy_sys_acl_set_file, + .sys_acl_delete_def_file_fn = onefs_shadow_copy_sys_acl_delete_def_file, + .getxattr_fn = onefs_shadow_copy_getxattr, + .lgetxattr_fn = onefs_shadow_copy_lgetxattr, + .listxattr_fn = onefs_shadow_copy_listxattr, + .llistxattr_fn = onefs_shadow_copy_llistxattr, + .removexattr_fn = onefs_shadow_copy_removexattr, + .lremovexattr_fn = onefs_shadow_copy_lremovexattr, + .setxattr_fn = onefs_shadow_copy_setxattr, + .lsetxattr_fn = onefs_shadow_copy_lsetxattr, + .is_offline_fn = onefs_shadow_copy_is_offline, + .set_offline_fn = onefs_shadow_copy_set_offline, }; NTSTATUS vfs_shadow_copy_init(void) diff --git a/source3/modules/vfs_posixacl.c b/source3/modules/vfs_posixacl.c index e1c5b630cd..464099176d 100644 --- a/source3/modules/vfs_posixacl.c +++ b/source3/modules/vfs_posixacl.c @@ -364,11 +364,11 @@ static acl_t smb_acl_to_posix(const struct smb_acl_t *acl) /* VFS operations structure */ static struct vfs_fn_pointers posixacl_fns = { - .sys_acl_get_file = posixacl_sys_acl_get_file, - .sys_acl_get_fd = posixacl_sys_acl_get_fd, - .sys_acl_set_file = posixacl_sys_acl_set_file, - .sys_acl_set_fd = posixacl_sys_acl_set_fd, - .sys_acl_delete_def_file = posixacl_sys_acl_delete_def_file, + .sys_acl_get_file_fn = posixacl_sys_acl_get_file, + .sys_acl_get_fd_fn = posixacl_sys_acl_get_fd, + .sys_acl_set_file_fn = posixacl_sys_acl_set_file, + .sys_acl_set_fd_fn = posixacl_sys_acl_set_fd, + .sys_acl_delete_def_file_fn = posixacl_sys_acl_delete_def_file, }; NTSTATUS vfs_posixacl_init(void); diff --git a/source3/modules/vfs_prealloc.c b/source3/modules/vfs_prealloc.c index fb2e46e227..3293b4ec8e 100644 --- a/source3/modules/vfs_prealloc.c +++ b/source3/modules/vfs_prealloc.c @@ -216,7 +216,7 @@ static int prealloc_ftruncate(vfs_handle_struct * handle, static struct vfs_fn_pointers prealloc_fns = { .open_fn = prealloc_open, - .ftruncate = prealloc_ftruncate, + .ftruncate_fn = prealloc_ftruncate, .connect_fn = prealloc_connect, }; diff --git a/source3/modules/vfs_readahead.c b/source3/modules/vfs_readahead.c index 22f7f70355..8e6fd43aae 100644 --- a/source3/modules/vfs_readahead.c +++ b/source3/modules/vfs_readahead.c @@ -169,8 +169,8 @@ static int readahead_connect(struct vfs_handle_struct *handle, } static struct vfs_fn_pointers vfs_readahead_fns = { - .sendfile = readahead_sendfile, - .pread = readahead_pread, + .sendfile_fn = readahead_sendfile, + .pread_fn = readahead_pread, .connect_fn = readahead_connect }; diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c index 03da571d1a..c735dccd31 100644 --- a/source3/modules/vfs_recycle.c +++ b/source3/modules/vfs_recycle.c @@ -639,7 +639,7 @@ done: } static struct vfs_fn_pointers vfs_recycle_fns = { - .unlink = recycle_unlink + .unlink_fn = recycle_unlink }; NTSTATUS vfs_recycle_init(void); diff --git a/source3/modules/vfs_scannedonly.c b/source3/modules/vfs_scannedonly.c index df1e140f3c..1b35388b85 100644 --- a/source3/modules/vfs_scannedonly.c +++ b/source3/modules/vfs_scannedonly.c @@ -1016,20 +1016,20 @@ static int scannedonly_connect(struct vfs_handle_struct *handle, /* VFS operations structure */ static struct vfs_fn_pointers vfs_scannedonly_fns = { - .opendir = scannedonly_opendir, - .fdopendir = scannedonly_fdopendir, - .readdir = scannedonly_readdir, - .seekdir = scannedonly_seekdir, - .telldir = scannedonly_telldir, - .rewind_dir = scannedonly_rewinddir, - .closedir = scannedonly_closedir, - .rmdir = scannedonly_rmdir, - .stat = scannedonly_stat, - .lstat = scannedonly_lstat, + .opendir_fn = scannedonly_opendir, + .fdopendir_fn = scannedonly_fdopendir, + .readdir_fn = scannedonly_readdir, + .seekdir_fn = scannedonly_seekdir, + .telldir_fn = scannedonly_telldir, + .rewind_dir_fn = scannedonly_rewinddir, + .closedir_fn = scannedonly_closedir, + .rmdir_fn = scannedonly_rmdir, + .stat_fn = scannedonly_stat, + .lstat_fn = scannedonly_lstat, .open_fn = scannedonly_open, .close_fn = scannedonly_close, - .rename = scannedonly_rename, - .unlink = scannedonly_unlink, + .rename_fn = scannedonly_rename, + .unlink_fn = scannedonly_unlink, .connect_fn = scannedonly_connect }; diff --git a/source3/modules/vfs_shadow_copy.c b/source3/modules/vfs_shadow_copy.c index 1db47d216b..f3f4292cf0 100644 --- a/source3/modules/vfs_shadow_copy.c +++ b/source3/modules/vfs_shadow_copy.c @@ -272,14 +272,14 @@ static int shadow_copy_get_shadow_copy_data(vfs_handle_struct *handle, } static struct vfs_fn_pointers vfs_shadow_copy_fns = { - .opendir = shadow_copy_opendir, - .fdopendir = shadow_copy_fdopendir, - .readdir = shadow_copy_readdir, - .seekdir = shadow_copy_seekdir, - .telldir = shadow_copy_telldir, - .rewind_dir = shadow_copy_rewinddir, - .closedir = shadow_copy_closedir, - .get_shadow_copy_data = shadow_copy_get_shadow_copy_data, + .opendir_fn = shadow_copy_opendir, + .fdopendir_fn = shadow_copy_fdopendir, + .readdir_fn = shadow_copy_readdir, + .seekdir_fn = shadow_copy_seekdir, + .telldir_fn = shadow_copy_telldir, + .rewind_dir_fn = shadow_copy_rewinddir, + .closedir_fn = shadow_copy_closedir, + .get_shadow_copy_data_fn = shadow_copy_get_shadow_copy_data, }; NTSTATUS vfs_shadow_copy_init(void); diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c index 4ac9e849c4..02c5b3d580 100644 --- a/source3/modules/vfs_shadow_copy2.c +++ b/source3/modules/vfs_shadow_copy2.c @@ -1567,37 +1567,37 @@ static int shadow_copy2_get_real_filename(struct vfs_handle_struct *handle, static struct vfs_fn_pointers vfs_shadow_copy2_fns = { - .opendir = shadow_copy2_opendir, - .rename = shadow_copy2_rename, - .link = shadow_copy2_link, - .symlink = shadow_copy2_symlink, - .stat = shadow_copy2_stat, - .lstat = shadow_copy2_lstat, - .fstat = shadow_copy2_fstat, + .opendir_fn = shadow_copy2_opendir, + .rename_fn = shadow_copy2_rename, + .link_fn = shadow_copy2_link, + .symlink_fn = shadow_copy2_symlink, + .stat_fn = shadow_copy2_stat, + .lstat_fn = shadow_copy2_lstat, + .fstat_fn = shadow_copy2_fstat, .open_fn = shadow_copy2_open, - .unlink = shadow_copy2_unlink, - .chmod = shadow_copy2_chmod, - .chown = shadow_copy2_chown, - .chdir = shadow_copy2_chdir, - .ntimes = shadow_copy2_ntimes, - .vfs_readlink = shadow_copy2_readlink, - .mknod = shadow_copy2_mknod, - .realpath = shadow_copy2_realpath, - .get_nt_acl = shadow_copy2_get_nt_acl, - .fget_nt_acl = shadow_copy2_fget_nt_acl, - .get_shadow_copy_data = shadow_copy2_get_shadow_copy_data, - .mkdir = shadow_copy2_mkdir, - .rmdir = shadow_copy2_rmdir, - .getxattr = shadow_copy2_getxattr, - .lgetxattr = shadow_copy2_lgetxattr, - .listxattr = shadow_copy2_listxattr, - .removexattr = shadow_copy2_removexattr, - .lremovexattr = shadow_copy2_lremovexattr, - .setxattr = shadow_copy2_setxattr, - .lsetxattr = shadow_copy2_lsetxattr, - .chmod_acl = shadow_copy2_chmod_acl, - .chflags = shadow_copy2_chflags, - .get_real_filename = shadow_copy2_get_real_filename, + .unlink_fn = shadow_copy2_unlink, + .chmod_fn = shadow_copy2_chmod, + .chown_fn = shadow_copy2_chown, + .chdir_fn = shadow_copy2_chdir, + .ntimes_fn = shadow_copy2_ntimes, + .readlink_fn = shadow_copy2_readlink, + .mknod_fn = shadow_copy2_mknod, + .realpath_fn = shadow_copy2_realpath, + .get_nt_acl_fn = shadow_copy2_get_nt_acl, + .fget_nt_acl_fn = shadow_copy2_fget_nt_acl, + .get_shadow_copy_data_fn = shadow_copy2_get_shadow_copy_data, + .mkdir_fn = shadow_copy2_mkdir, + .rmdir_fn = shadow_copy2_rmdir, + .getxattr_fn = shadow_copy2_getxattr, + .lgetxattr_fn = shadow_copy2_lgetxattr, + .listxattr_fn = shadow_copy2_listxattr, + .removexattr_fn = shadow_copy2_removexattr, + .lremovexattr_fn = shadow_copy2_lremovexattr, + .setxattr_fn = shadow_copy2_setxattr, + .lsetxattr_fn = shadow_copy2_lsetxattr, + .chmod_acl_fn = shadow_copy2_chmod_acl, + .chflags_fn = shadow_copy2_chflags, + .get_real_filename_fn = shadow_copy2_get_real_filename, }; NTSTATUS vfs_shadow_copy2_init(void); diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c index 5f05fa68d1..4d1ffbd06d 100644 --- a/source3/modules/vfs_smb_traffic_analyzer.c +++ b/source3/modules/vfs_smb_traffic_analyzer.c @@ -903,19 +903,19 @@ static int smb_traffic_analyzer_close(vfs_handle_struct *handle, \ static struct vfs_fn_pointers vfs_smb_traffic_analyzer_fns = { - .connect_fn = smb_traffic_analyzer_connect, - .vfs_read = smb_traffic_analyzer_read, - .pread = smb_traffic_analyzer_pread, - .write = smb_traffic_analyzer_write, - .pwrite = smb_traffic_analyzer_pwrite, - .mkdir = smb_traffic_analyzer_mkdir, - .rename = smb_traffic_analyzer_rename, - .chdir = smb_traffic_analyzer_chdir, + .connect_fn = smb_traffic_analyzer_connect, + .read_fn = smb_traffic_analyzer_read, + .pread_fn = smb_traffic_analyzer_pread, + .write_fn = smb_traffic_analyzer_write, + .pwrite_fn = smb_traffic_analyzer_pwrite, + .mkdir_fn = smb_traffic_analyzer_mkdir, + .rename_fn = smb_traffic_analyzer_rename, + .chdir_fn = smb_traffic_analyzer_chdir, .open_fn = smb_traffic_analyzer_open, - .rmdir = smb_traffic_analyzer_rmdir, + .rmdir_fn = smb_traffic_analyzer_rmdir, .close_fn = smb_traffic_analyzer_close, - .sendfile = smb_traffic_analyzer_sendfile, - .recvfile = smb_traffic_analyzer_recvfile + .sendfile_fn = smb_traffic_analyzer_sendfile, + .recvfile_fn = smb_traffic_analyzer_recvfile }; /* Module initialization */ diff --git a/source3/modules/vfs_solarisacl.c b/source3/modules/vfs_solarisacl.c index dabec5a413..598f25f7f8 100644 --- a/source3/modules/vfs_solarisacl.c +++ b/source3/modules/vfs_solarisacl.c @@ -752,11 +752,11 @@ static bool solaris_acl_check(SOLARIS_ACL_T solaris_acl, int count) #endif static struct vfs_fn_pointers solarisacl_fns = { - .sys_acl_get_file = solarisacl_sys_acl_get_file, - .sys_acl_get_fd = solarisacl_sys_acl_get_fd, - .sys_acl_set_file = solarisacl_sys_acl_set_file, - .sys_acl_set_fd = solarisacl_sys_acl_set_fd, - .sys_acl_delete_def_file = solarisacl_sys_acl_delete_def_file, + .sys_acl_get_file_fn = solarisacl_sys_acl_get_file, + .sys_acl_get_fd_fn = solarisacl_sys_acl_get_fd, + .sys_acl_set_file_fn = solarisacl_sys_acl_set_file, + .sys_acl_set_fd_fn = solarisacl_sys_acl_set_fd, + .sys_acl_delete_def_file_fn = solarisacl_sys_acl_delete_def_file, }; NTSTATUS vfs_solarisacl_init(void); diff --git a/source3/modules/vfs_streams_depot.c b/source3/modules/vfs_streams_depot.c index e1ba651005..68a14539bd 100644 --- a/source3/modules/vfs_streams_depot.c +++ b/source3/modules/vfs_streams_depot.c @@ -863,13 +863,13 @@ static uint32_t streams_depot_fs_capabilities(struct vfs_handle_struct *handle, } static struct vfs_fn_pointers vfs_streams_depot_fns = { - .fs_capabilities = streams_depot_fs_capabilities, + .fs_capabilities_fn = streams_depot_fs_capabilities, .open_fn = streams_depot_open, - .stat = streams_depot_stat, - .lstat = streams_depot_lstat, - .unlink = streams_depot_unlink, - .rename = streams_depot_rename, - .streaminfo = streams_depot_streaminfo, + .stat_fn = streams_depot_stat, + .lstat_fn = streams_depot_lstat, + .unlink_fn = streams_depot_unlink, + .rename_fn = streams_depot_rename, + .streaminfo_fn = streams_depot_streaminfo, }; NTSTATUS vfs_streams_depot_init(void); diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c index 8564760353..2ac0491f28 100644 --- a/source3/modules/vfs_streams_xattr.c +++ b/source3/modules/vfs_streams_xattr.c @@ -1042,18 +1042,18 @@ static int streams_xattr_fallocate(struct vfs_handle_struct *handle, static struct vfs_fn_pointers vfs_streams_xattr_fns = { - .fs_capabilities = streams_xattr_fs_capabilities, + .fs_capabilities_fn = streams_xattr_fs_capabilities, .open_fn = streams_xattr_open, - .stat = streams_xattr_stat, - .fstat = streams_xattr_fstat, - .lstat = streams_xattr_lstat, - .pread = streams_xattr_pread, - .pwrite = streams_xattr_pwrite, - .unlink = streams_xattr_unlink, - .rename = streams_xattr_rename, - .ftruncate = streams_xattr_ftruncate, - .fallocate = streams_xattr_fallocate, - .streaminfo = streams_xattr_streaminfo, + .stat_fn = streams_xattr_stat, + .fstat_fn = streams_xattr_fstat, + .lstat_fn = streams_xattr_lstat, + .pread_fn = streams_xattr_pread, + .pwrite_fn = streams_xattr_pwrite, + .unlink_fn = streams_xattr_unlink, + .rename_fn = streams_xattr_rename, + .ftruncate_fn = streams_xattr_ftruncate, + .fallocate_fn = streams_xattr_fallocate, + .streaminfo_fn = streams_xattr_streaminfo, }; NTSTATUS vfs_streams_xattr_init(void); diff --git a/source3/modules/vfs_syncops.c b/source3/modules/vfs_syncops.c index a792fb4b8d..8ff283d191 100644 --- a/source3/modules/vfs_syncops.c +++ b/source3/modules/vfs_syncops.c @@ -280,14 +280,14 @@ static int syncops_connect(struct vfs_handle_struct *handle, const char *service static struct vfs_fn_pointers vfs_syncops_fns = { .connect_fn = syncops_connect, - .mkdir = syncops_mkdir, - .rmdir = syncops_rmdir, - .open_fn = syncops_open, - .rename = syncops_rename, - .unlink = syncops_unlink, - .symlink = syncops_symlink, - .link = syncops_link, - .mknod = syncops_mknod, + .mkdir_fn = syncops_mkdir, + .rmdir_fn = syncops_rmdir, + .open_fn = syncops_open, + .rename_fn = syncops_rename, + .unlink_fn = syncops_unlink, + .symlink_fn = syncops_symlink, + .link_fn = syncops_link, + .mknod_fn = syncops_mknod, .close_fn = syncops_close, }; diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c index 25332e4e03..734625e4e9 100644 --- a/source3/modules/vfs_time_audit.c +++ b/source3/modules/vfs_time_audit.c @@ -2338,118 +2338,118 @@ static bool smb_time_audit_aio_force(struct vfs_handle_struct *handle, static struct vfs_fn_pointers vfs_time_audit_fns = { .connect_fn = smb_time_audit_connect, - .disconnect = smb_time_audit_disconnect, - .disk_free = smb_time_audit_disk_free, - .get_quota = smb_time_audit_get_quota, - .set_quota = smb_time_audit_set_quota, - .get_shadow_copy_data = smb_time_audit_get_shadow_copy_data, - .statvfs = smb_time_audit_statvfs, - .fs_capabilities = smb_time_audit_fs_capabilities, - .opendir = smb_time_audit_opendir, - .fdopendir = smb_time_audit_fdopendir, - .readdir = smb_time_audit_readdir, - .seekdir = smb_time_audit_seekdir, - .telldir = smb_time_audit_telldir, - .rewind_dir = smb_time_audit_rewinddir, - .mkdir = smb_time_audit_mkdir, - .rmdir = smb_time_audit_rmdir, - .closedir = smb_time_audit_closedir, - .init_search_op = smb_time_audit_init_search_op, + .disconnect_fn = smb_time_audit_disconnect, + .disk_free_fn = smb_time_audit_disk_free, + .get_quota_fn = smb_time_audit_get_quota, + .set_quota_fn = smb_time_audit_set_quota, + .get_shadow_copy_data_fn = smb_time_audit_get_shadow_copy_data, + .statvfs_fn = smb_time_audit_statvfs, + .fs_capabilities_fn = smb_time_audit_fs_capabilities, + .opendir_fn = smb_time_audit_opendir, + .fdopendir_fn = smb_time_audit_fdopendir, + .readdir_fn = smb_time_audit_readdir, + .seekdir_fn = smb_time_audit_seekdir, + .telldir_fn = smb_time_audit_telldir, + .rewind_dir_fn = smb_time_audit_rewinddir, + .mkdir_fn = smb_time_audit_mkdir, + .rmdir_fn = smb_time_audit_rmdir, + .closedir_fn = smb_time_audit_closedir, + .init_search_op_fn = smb_time_audit_init_search_op, .open_fn = smb_time_audit_open, - .create_file = smb_time_audit_create_file, + .create_file_fn = smb_time_audit_create_file, .close_fn = smb_time_audit_close, - .vfs_read = smb_time_audit_read, - .pread = smb_time_audit_pread, - .write = smb_time_audit_write, - .pwrite = smb_time_audit_pwrite, - .lseek = smb_time_audit_lseek, - .sendfile = smb_time_audit_sendfile, - .recvfile = smb_time_audit_recvfile, - .rename = smb_time_audit_rename, - .fsync = smb_time_audit_fsync, - .stat = smb_time_audit_stat, - .fstat = smb_time_audit_fstat, - .lstat = smb_time_audit_lstat, - .get_alloc_size = smb_time_audit_get_alloc_size, - .unlink = smb_time_audit_unlink, - .chmod = smb_time_audit_chmod, - .fchmod = smb_time_audit_fchmod, - .chown = smb_time_audit_chown, - .fchown = smb_time_audit_fchown, - .lchown = smb_time_audit_lchown, - .chdir = smb_time_audit_chdir, - .getwd = smb_time_audit_getwd, - .ntimes = smb_time_audit_ntimes, - .ftruncate = smb_time_audit_ftruncate, - .fallocate = smb_time_audit_fallocate, - .lock = smb_time_audit_lock, - .kernel_flock = smb_time_audit_kernel_flock, - .linux_setlease = smb_time_audit_linux_setlease, - .getlock = smb_time_audit_getlock, - .symlink = smb_time_audit_symlink, - .vfs_readlink = smb_time_audit_readlink, - .link = smb_time_audit_link, - .mknod = smb_time_audit_mknod, - .realpath = smb_time_audit_realpath, - .notify_watch = smb_time_audit_notify_watch, - .chflags = smb_time_audit_chflags, - .file_id_create = smb_time_audit_file_id_create, - .streaminfo = smb_time_audit_streaminfo, - .get_real_filename = smb_time_audit_get_real_filename, - .connectpath = smb_time_audit_connectpath, - .brl_lock_windows = smb_time_audit_brl_lock_windows, - .brl_unlock_windows = smb_time_audit_brl_unlock_windows, - .brl_cancel_windows = smb_time_audit_brl_cancel_windows, - .strict_lock = smb_time_audit_strict_lock, - .strict_unlock = smb_time_audit_strict_unlock, - .translate_name = smb_time_audit_translate_name, - .fget_nt_acl = smb_time_audit_fget_nt_acl, - .get_nt_acl = smb_time_audit_get_nt_acl, - .fset_nt_acl = smb_time_audit_fset_nt_acl, - .chmod_acl = smb_time_audit_chmod_acl, - .fchmod_acl = smb_time_audit_fchmod_acl, - .sys_acl_get_entry = smb_time_audit_sys_acl_get_entry, - .sys_acl_get_tag_type = smb_time_audit_sys_acl_get_tag_type, - .sys_acl_get_permset = smb_time_audit_sys_acl_get_permset, - .sys_acl_get_qualifier = smb_time_audit_sys_acl_get_qualifier, - .sys_acl_get_file = smb_time_audit_sys_acl_get_file, - .sys_acl_get_fd = smb_time_audit_sys_acl_get_fd, - .sys_acl_clear_perms = smb_time_audit_sys_acl_clear_perms, - .sys_acl_add_perm = smb_time_audit_sys_acl_add_perm, - .sys_acl_to_text = smb_time_audit_sys_acl_to_text, - .sys_acl_init = smb_time_audit_sys_acl_init, - .sys_acl_create_entry = smb_time_audit_sys_acl_create_entry, - .sys_acl_set_tag_type = smb_time_audit_sys_acl_set_tag_type, - .sys_acl_set_qualifier = smb_time_audit_sys_acl_set_qualifier, - .sys_acl_set_permset = smb_time_audit_sys_acl_set_permset, - .sys_acl_valid = smb_time_audit_sys_acl_valid, - .sys_acl_set_file = smb_time_audit_sys_acl_set_file, - .sys_acl_set_fd = smb_time_audit_sys_acl_set_fd, - .sys_acl_delete_def_file = smb_time_audit_sys_acl_delete_def_file, - .sys_acl_get_perm = smb_time_audit_sys_acl_get_perm, - .sys_acl_free_text = smb_time_audit_sys_acl_free_text, - .sys_acl_free_acl = smb_time_audit_sys_acl_free_acl, - .sys_acl_free_qualifier = smb_time_audit_sys_acl_free_qualifier, - .getxattr = smb_time_audit_getxattr, - .lgetxattr = smb_time_audit_lgetxattr, - .fgetxattr = smb_time_audit_fgetxattr, - .listxattr = smb_time_audit_listxattr, - .llistxattr = smb_time_audit_llistxattr, - .flistxattr = smb_time_audit_flistxattr, - .removexattr = smb_time_audit_removexattr, - .lremovexattr = smb_time_audit_lremovexattr, - .fremovexattr = smb_time_audit_fremovexattr, - .setxattr = smb_time_audit_setxattr, - .lsetxattr = smb_time_audit_lsetxattr, - .fsetxattr = smb_time_audit_fsetxattr, - .aio_read = smb_time_audit_aio_read, - .aio_write = smb_time_audit_aio_write, + .read_fn = smb_time_audit_read, + .pread_fn = smb_time_audit_pread, + .write_fn = smb_time_audit_write, + .pwrite_fn = smb_time_audit_pwrite, + .lseek_fn = smb_time_audit_lseek, + .sendfile_fn = smb_time_audit_sendfile, + .recvfile_fn = smb_time_audit_recvfile, + .rename_fn = smb_time_audit_rename, + .fsync_fn = smb_time_audit_fsync, + .stat_fn = smb_time_audit_stat, + .fstat_fn = smb_time_audit_fstat, + .lstat_fn = smb_time_audit_lstat, + .get_alloc_size_fn = smb_time_audit_get_alloc_size, + .unlink_fn = smb_time_audit_unlink, + .chmod_fn = smb_time_audit_chmod, + .fchmod_fn = smb_time_audit_fchmod, + .chown_fn = smb_time_audit_chown, + .fchown_fn = smb_time_audit_fchown, + .lchown_fn = smb_time_audit_lchown, + .chdir_fn = smb_time_audit_chdir, + .getwd_fn = smb_time_audit_getwd, + .ntimes_fn = smb_time_audit_ntimes, + .ftruncate_fn = smb_time_audit_ftruncate, + .fallocate_fn = smb_time_audit_fallocate, + .lock_fn = smb_time_audit_lock, + .kernel_flock_fn = smb_time_audit_kernel_flock, + .linux_setlease_fn = smb_time_audit_linux_setlease, + .getlock_fn = smb_time_audit_getlock, + .symlink_fn = smb_time_audit_symlink, + .readlink_fn = smb_time_audit_readlink, + .link_fn = smb_time_audit_link, + .mknod_fn = smb_time_audit_mknod, + .realpath_fn = smb_time_audit_realpath, + .notify_watch_fn = smb_time_audit_notify_watch, + .chflags_fn = smb_time_audit_chflags, + .file_id_create_fn = smb_time_audit_file_id_create, + .streaminfo_fn = smb_time_audit_streaminfo, + .get_real_filename_fn = smb_time_audit_get_real_filename, + .connectpath_fn = smb_time_audit_connectpath, + .brl_lock_windows_fn = smb_time_audit_brl_lock_windows, + .brl_unlock_windows_fn = smb_time_audit_brl_unlock_windows, + .brl_cancel_windows_fn = smb_time_audit_brl_cancel_windows, + .strict_lock_fn = smb_time_audit_strict_lock, + .strict_unlock_fn = smb_time_audit_strict_unlock, + .translate_name_fn = smb_time_audit_translate_name, + .fget_nt_acl_fn = smb_time_audit_fget_nt_acl, + .get_nt_acl_fn = smb_time_audit_get_nt_acl, + .fset_nt_acl_fn = smb_time_audit_fset_nt_acl, + .chmod_acl_fn = smb_time_audit_chmod_acl, + .fchmod_acl_fn = smb_time_audit_fchmod_acl, + .sys_acl_get_entry_fn = smb_time_audit_sys_acl_get_entry, + .sys_acl_get_tag_type_fn = smb_time_audit_sys_acl_get_tag_type, + .sys_acl_get_permset_fn = smb_time_audit_sys_acl_get_permset, + .sys_acl_get_qualifier_fn = smb_time_audit_sys_acl_get_qualifier, + .sys_acl_get_file_fn = smb_time_audit_sys_acl_get_file, + .sys_acl_get_fd_fn = smb_time_audit_sys_acl_get_fd, + .sys_acl_clear_perms_fn = smb_time_audit_sys_acl_clear_perms, + .sys_acl_add_perm_fn = smb_time_audit_sys_acl_add_perm, + .sys_acl_to_text_fn = smb_time_audit_sys_acl_to_text, + .sys_acl_init_fn = smb_time_audit_sys_acl_init, + .sys_acl_create_entry_fn = smb_time_audit_sys_acl_create_entry, + .sys_acl_set_tag_type_fn = smb_time_audit_sys_acl_set_tag_type, + .sys_acl_set_qualifier_fn = smb_time_audit_sys_acl_set_qualifier, + .sys_acl_set_permset_fn = smb_time_audit_sys_acl_set_permset, + .sys_acl_valid_fn = smb_time_audit_sys_acl_valid, + .sys_acl_set_file_fn = smb_time_audit_sys_acl_set_file, + .sys_acl_set_fd_fn = smb_time_audit_sys_acl_set_fd, + .sys_acl_delete_def_file_fn = smb_time_audit_sys_acl_delete_def_file, + .sys_acl_get_perm_fn = smb_time_audit_sys_acl_get_perm, + .sys_acl_free_text_fn = smb_time_audit_sys_acl_free_text, + .sys_acl_free_acl_fn = smb_time_audit_sys_acl_free_acl, + .sys_acl_free_qualifier_fn = smb_time_audit_sys_acl_free_qualifier, + .getxattr_fn = smb_time_audit_getxattr, + .lgetxattr_fn = smb_time_audit_lgetxattr, + .fgetxattr_fn = smb_time_audit_fgetxattr, + .listxattr_fn = smb_time_audit_listxattr, + .llistxattr_fn = smb_time_audit_llistxattr, + .flistxattr_fn = smb_time_audit_flistxattr, + .removexattr_fn = smb_time_audit_removexattr, + .lremovexattr_fn = smb_time_audit_lremovexattr, + .fremovexattr_fn = smb_time_audit_fremovexattr, + .setxattr_fn = smb_time_audit_setxattr, + .lsetxattr_fn = smb_time_audit_lsetxattr, + .fsetxattr_fn = smb_time_audit_fsetxattr, + .aio_read_fn = smb_time_audit_aio_read, + .aio_write_fn = smb_time_audit_aio_write, .aio_return_fn = smb_time_audit_aio_return, - .aio_cancel = smb_time_audit_aio_cancel, + .aio_cancel_fn = smb_time_audit_aio_cancel, .aio_error_fn = smb_time_audit_aio_error, - .aio_fsync = smb_time_audit_aio_fsync, - .aio_suspend = smb_time_audit_aio_suspend, - .aio_force = smb_time_audit_aio_force, + .aio_fsync_fn = smb_time_audit_aio_fsync, + .aio_suspend_fn = smb_time_audit_aio_suspend, + .aio_force_fn = smb_time_audit_aio_force, }; diff --git a/source3/modules/vfs_tru64acl.c b/source3/modules/vfs_tru64acl.c index 39fc6e9ac3..3f91a4753a 100644 --- a/source3/modules/vfs_tru64acl.c +++ b/source3/modules/vfs_tru64acl.c @@ -470,11 +470,11 @@ static SMB_ACL_PERM_T tru64_permset_to_smb(const acl_perm_t tru64_permset) /* VFS operations structure */ static struct vfs_fn_pointers tru64acl_fns = { - .sys_acl_get_file = tru64acl_sys_acl_get_file, - .sys_acl_get_fd = tru64acl_sys_acl_get_fd, - .sys_acl_set_file = tru64acl_sys_acl_set_file, - .sys_acl_set_fd = tru64acl_sys_acl_set_fd, - .sys_acl_delete_def_file = tru64acl_sys_acl_delete_def_file, + .sys_acl_get_file_fn = tru64acl_sys_acl_get_file, + .sys_acl_get_fd_fn = tru64acl_sys_acl_get_fd, + .sys_acl_set_file_fn = tru64acl_sys_acl_set_file, + .sys_acl_set_fd_fn = tru64acl_sys_acl_set_fd, + .sys_acl_delete_def_file_fn = tru64acl_sys_acl_delete_def_file, }; NTSTATUS vfs_tru64acl_init(void); diff --git a/source3/modules/vfs_tsmsm.c b/source3/modules/vfs_tsmsm.c index e9fd83bfea..468fe679fc 100644 --- a/source3/modules/vfs_tsmsm.c +++ b/source3/modules/vfs_tsmsm.c @@ -392,14 +392,14 @@ static uint32_t tsmsm_fs_capabilities(struct vfs_handle_struct *handle, static struct vfs_fn_pointers tsmsm_fns = { .connect_fn = tsmsm_connect, - .fs_capabilities = tsmsm_fs_capabilities, - .aio_force = tsmsm_aio_force, + .fs_capabilities_fn = tsmsm_fs_capabilities, + .aio_force_fn = tsmsm_aio_force, .aio_return_fn = tsmsm_aio_return, - .pread = tsmsm_pread, - .pwrite = tsmsm_pwrite, - .sendfile = tsmsm_sendfile, - .is_offline = tsmsm_is_offline, - .set_offline = tsmsm_set_offline, + .pread_fn = tsmsm_pread, + .pwrite_fn = tsmsm_pwrite, + .sendfile_fn = tsmsm_sendfile, + .is_offline_fn = tsmsm_is_offline, + .set_offline_fn = tsmsm_set_offline, }; NTSTATUS vfs_tsmsm_init(void); diff --git a/source3/modules/vfs_xattr_tdb.c b/source3/modules/vfs_xattr_tdb.c index 72624686f7..8f367f359a 100644 --- a/source3/modules/vfs_xattr_tdb.c +++ b/source3/modules/vfs_xattr_tdb.c @@ -767,16 +767,16 @@ static int xattr_tdb_connect(vfs_handle_struct *handle, const char *service, } static struct vfs_fn_pointers vfs_xattr_tdb_fns = { - .getxattr = xattr_tdb_getxattr, - .fgetxattr = xattr_tdb_fgetxattr, - .setxattr = xattr_tdb_setxattr, - .fsetxattr = xattr_tdb_fsetxattr, - .listxattr = xattr_tdb_listxattr, - .flistxattr = xattr_tdb_flistxattr, - .removexattr = xattr_tdb_removexattr, - .fremovexattr = xattr_tdb_fremovexattr, - .unlink = xattr_tdb_unlink, - .rmdir = xattr_tdb_rmdir, + .getxattr_fn = xattr_tdb_getxattr, + .fgetxattr_fn = xattr_tdb_fgetxattr, + .setxattr_fn = xattr_tdb_setxattr, + .fsetxattr_fn = xattr_tdb_fsetxattr, + .listxattr_fn = xattr_tdb_listxattr, + .flistxattr_fn = xattr_tdb_flistxattr, + .removexattr_fn = xattr_tdb_removexattr, + .fremovexattr_fn = xattr_tdb_fremovexattr, + .unlink_fn = xattr_tdb_unlink, + .rmdir_fn = xattr_tdb_rmdir, .connect_fn = xattr_tdb_connect, }; diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c index fbfe7794e7..7858a6a475 100644 --- a/source3/modules/vfs_zfsacl.c +++ b/source3/modules/vfs_zfsacl.c @@ -300,14 +300,14 @@ static int zfsacl_fail__sys_acl_delete_def_file(vfs_handle_struct *handle, /* VFS operations structure */ static struct vfs_fn_pointers zfsacl_fns = { - .sys_acl_get_file = zfsacl_fail__sys_acl_get_file, - .sys_acl_get_fd = zfsacl_fail__sys_acl_get_fd, - .sys_acl_set_file = zfsacl_fail__sys_acl_set_file, - .sys_acl_set_fd = zfsacl_fail__sys_acl_set_fd, - .sys_acl_delete_def_file = zfsacl_fail__sys_acl_delete_def_file, - .fget_nt_acl = zfsacl_fget_nt_acl, - .get_nt_acl = zfsacl_get_nt_acl, - .fset_nt_acl = zfsacl_fset_nt_acl, + .sys_acl_get_file_fn = zfsacl_fail__sys_acl_get_file, + .sys_acl_get_fd_fn = zfsacl_fail__sys_acl_get_fd, + .sys_acl_set_file_fn = zfsacl_fail__sys_acl_set_file, + .sys_acl_set_fd_fn = zfsacl_fail__sys_acl_set_fd, + .sys_acl_delete_def_file_fn = zfsacl_fail__sys_acl_delete_def_file, + .fget_nt_acl_fn = zfsacl_fget_nt_acl, + .get_nt_acl_fn = zfsacl_get_nt_acl, + .fset_nt_acl_fn = zfsacl_fset_nt_acl, }; NTSTATUS vfs_zfsacl_init(void); |