vfs: Make function pointer names consistent. They all end in _fn

Autobuild-User: Richard Sharpe <sharpe@samba.org>
Autobuild-Date: Mon Dec 12 04:58:40 CET 2011 on sn-devel-104

3 files changed, 229 insertions, 229 deletions

diff --git a/examples/VFS/shadow_copy_test.c b/examples/VFS/shadow_copy_test.c
index a47d2ee19b..0efceb4234 100644
--- a/examples/VFS/shadow_copy_test.c
+++ b/examples/VFS/shadow_copy_test.c
@@ -81,7 +81,7 @@ static int test_get_shadow_copy_data(vfs_handle_struct *handle,
 /* VFS operations structure */
 
 static struct vfs_fn_pointers vfs_test_shadow_copy_fns = {
-	.get_shadow_copy_data = test_get_shadow_copy_data
+	.get_shadow_copy_data_fn = test_get_shadow_copy_data
 };
 
 NTSTATUS vfs_shadow_copy_test_init(void)
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 7c63dd2eb5..ae42d1c208 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -799,142 +799,142 @@ struct vfs_fn_pointers skel_opaque_fns = {
 	/* Disk operations */
 
 	.connect_fn = skel_connect,
-	.disconnect = skel_disconnect,
-	.disk_free = skel_disk_free,
-	.get_quota = skel_get_quota,
-	.set_quota = skel_set_quota,
-	.get_shadow_copy_data = skel_get_shadow_copy_data,
-	.statvfs = skel_statvfs,
-	.fs_capabilities = skel_fs_capabilities,
-	.get_dfs_referrals = skel_get_dfs_referrals,
+	.disconnect_fn = skel_disconnect,
+	.disk_free_fn = skel_disk_free,
+	.get_quota_fn = skel_get_quota,
+	.set_quota_fn = skel_set_quota,
+	.get_shadow_copy_data_fn = skel_get_shadow_copy_data,
+	.statvfs_fn = skel_statvfs,
+	.fs_capabilities_fn = skel_fs_capabilities,
+	.get_dfs_referrals_fn = skel_get_dfs_referrals,
 
 	/* Directory operations */
 
-	.opendir = skel_opendir,
-	.fdopendir = skel_fdopendir,
-	.readdir = skel_readdir,
-	.seekdir = skel_seekdir,
-	.telldir = skel_telldir,
-	.rewind_dir = skel_rewind_dir,
-	.mkdir = skel_mkdir,
-	.rmdir = skel_rmdir,
-	.closedir = skel_closedir,
-	.init_search_op = skel_init_search_op,
+	.opendir_fn = skel_opendir,
+	.fdopendir_fn = skel_fdopendir,
+	.readdir_fn = skel_readdir,
+	.seekdir_fn = skel_seekdir,
+	.telldir_fn = skel_telldir,
+	.rewind_dir_fn = skel_rewind_dir,
+	.mkdir_fn = skel_mkdir,
+	.rmdir_fn = skel_rmdir,
+	.closedir_fn = skel_closedir,
+	.init_search_op_fn = skel_init_search_op,
 
 	/* File operations */
 
 	.open_fn = skel_open,
-	.create_file = skel_create_file,
+	.create_file_fn = skel_create_file,
 	.close_fn = skel_close_fn,
-	.vfs_read = skel_vfs_read,
-	.pread = skel_pread,
-	.write = skel_write,
-	.pwrite = skel_pwrite,
-	.lseek = skel_lseek,
-	.sendfile = skel_sendfile,
-	.recvfile = skel_recvfile,
-	.rename = skel_rename,
-	.fsync = skel_fsync,
-	.stat = skel_stat,
-	.fstat = skel_fstat,
-	.lstat = skel_lstat,
-	.get_alloc_size = skel_get_alloc_size,
-	.unlink = skel_unlink,
-	.chmod = skel_chmod,
-	.fchmod = skel_fchmod,
-	.chown = skel_chown,
-	.fchown = skel_fchown,
-	.lchown = skel_lchown,
-	.chdir = skel_chdir,
-	.getwd = skel_getwd,
-	.ntimes = skel_ntimes,
-	.ftruncate = skel_ftruncate,
-	.fallocate = skel_fallocate,
-	.lock = skel_lock,
-	.kernel_flock = skel_kernel_flock,
-	.linux_setlease = skel_linux_setlease,
-	.getlock = skel_getlock,
-	.symlink = skel_symlink,
-	.vfs_readlink = skel_vfs_readlink,
-	.link = skel_link,
-	.mknod = skel_mknod,
-	.realpath = skel_realpath,
-	.notify_watch = skel_notify_watch,
-	.chflags = skel_chflags,
-	.file_id_create = skel_file_id_create,
-
-	.streaminfo = skel_streaminfo,
-	.get_real_filename = skel_get_real_filename,
-	.connectpath = skel_connectpath,
-	.brl_lock_windows = skel_brl_lock_windows,
-	.brl_unlock_windows = skel_brl_unlock_windows,
-	.brl_cancel_windows = skel_brl_cancel_windows,
-	.strict_lock = skel_strict_lock,
-	.strict_unlock = skel_strict_unlock,
-	.translate_name = skel_translate_name,
-	.fsctl = skel_fsctl,
+	.read_fn = skel_vfs_read,
+	.pread_fn = skel_pread,
+	.write_fn = skel_write,
+	.pwrite_fn = skel_pwrite,
+	.lseek_fn = skel_lseek,
+	.sendfile_fn = skel_sendfile,
+	.recvfile_fn = skel_recvfile,
+	.rename_fn = skel_rename,
+	.fsync_fn = skel_fsync,
+	.stat_fn = skel_stat,
+	.fstat_fn = skel_fstat,
+	.lstat_fn = skel_lstat,
+	.get_alloc_size_fn = skel_get_alloc_size,
+	.unlink_fn = skel_unlink,
+	.chmod_fn = skel_chmod,
+	.fchmod_fn = skel_fchmod,
+	.chown_fn = skel_chown,
+	.fchown_fn = skel_fchown,
+	.lchown_fn = skel_lchown,
+	.chdir_fn = skel_chdir,
+	.getwd_fn = skel_getwd,
+	.ntimes_fn = skel_ntimes,
+	.ftruncate_fn = skel_ftruncate,
+	.fallocate_fn = skel_fallocate,
+	.lock_fn = skel_lock,
+	.kernel_flock_fn = skel_kernel_flock,
+	.linux_setlease_fn = skel_linux_setlease,
+	.getlock_fn = skel_getlock,
+	.symlink_fn = skel_symlink,
+	.readlink_fn = skel_vfs_readlink,
+	.link_fn = skel_link,
+	.mknod_fn = skel_mknod,
+	.realpath_fn = skel_realpath,
+	.notify_watch_fn = skel_notify_watch,
+	.chflags_fn = skel_chflags,
+	.file_id_create_fn = skel_file_id_create,
+
+	.streaminfo_fn = skel_streaminfo,
+	.get_real_filename_fn = skel_get_real_filename,
+	.connectpath_fn = skel_connectpath,
+	.brl_lock_windows_fn = skel_brl_lock_windows,
+	.brl_unlock_windows_fn = skel_brl_unlock_windows,
+	.brl_cancel_windows_fn = skel_brl_cancel_windows,
+	.strict_lock_fn = skel_strict_lock,
+	.strict_unlock_fn = skel_strict_unlock,
+	.translate_name_fn = skel_translate_name,
+	.fsctl_fn = skel_fsctl,
 
 	/* NT ACL operations. */
 
-	.fget_nt_acl = skel_fget_nt_acl,
-	.get_nt_acl = skel_get_nt_acl,
-	.fset_nt_acl = skel_fset_nt_acl,
+	.fget_nt_acl_fn = skel_fget_nt_acl,
+	.get_nt_acl_fn = skel_get_nt_acl,
+	.fset_nt_acl_fn = skel_fset_nt_acl,
 
 	/* POSIX ACL operations. */
 
-	.chmod_acl = skel_chmod_acl,
-	.fchmod_acl = skel_fchmod_acl,
-
-	.sys_acl_get_entry = skel_sys_acl_get_entry,
-	.sys_acl_get_tag_type = skel_sys_acl_get_tag_type,
-	.sys_acl_get_permset = skel_sys_acl_get_permset,
-	.sys_acl_get_qualifier = skel_sys_acl_get_qualifier,
-	.sys_acl_get_file = skel_sys_acl_get_file,
-	.sys_acl_get_fd = skel_sys_acl_get_fd,
-	.sys_acl_clear_perms = skel_sys_acl_clear_perms,
-	.sys_acl_add_perm = skel_sys_acl_add_perm,
-	.sys_acl_to_text = skel_sys_acl_to_text,
-	.sys_acl_init = skel_sys_acl_init,
-	.sys_acl_create_entry = skel_sys_acl_create_entry,
-	.sys_acl_set_tag_type = skel_sys_acl_set_tag_type,
-	.sys_acl_set_qualifier = skel_sys_acl_set_qualifier,
-	.sys_acl_set_permset = skel_sys_acl_set_permset,
-	.sys_acl_valid = skel_sys_acl_valid,
-	.sys_acl_set_file = skel_sys_acl_set_file,
-	.sys_acl_set_fd = skel_sys_acl_set_fd,
-	.sys_acl_delete_def_file = skel_sys_acl_delete_def_file,
-	.sys_acl_get_perm = skel_sys_acl_get_perm,
-	.sys_acl_free_text = skel_sys_acl_free_text,
-	.sys_acl_free_acl = skel_sys_acl_free_acl,
-	.sys_acl_free_qualifier = skel_sys_acl_free_qualifier,
+	.chmod_acl_fn = skel_chmod_acl,
+	.fchmod_acl_fn = skel_fchmod_acl,
+
+	.sys_acl_get_entry_fn = skel_sys_acl_get_entry,
+	.sys_acl_get_tag_type_fn = skel_sys_acl_get_tag_type,
+	.sys_acl_get_permset_fn = skel_sys_acl_get_permset,
+	.sys_acl_get_qualifier_fn = skel_sys_acl_get_qualifier,
+	.sys_acl_get_file_fn = skel_sys_acl_get_file,
+	.sys_acl_get_fd_fn = skel_sys_acl_get_fd,
+	.sys_acl_clear_perms_fn = skel_sys_acl_clear_perms,
+	.sys_acl_add_perm_fn = skel_sys_acl_add_perm,
+	.sys_acl_to_text_fn = skel_sys_acl_to_text,
+	.sys_acl_init_fn = skel_sys_acl_init,
+	.sys_acl_create_entry_fn = skel_sys_acl_create_entry,
+	.sys_acl_set_tag_type_fn = skel_sys_acl_set_tag_type,
+	.sys_acl_set_qualifier_fn = skel_sys_acl_set_qualifier,
+	.sys_acl_set_permset_fn = skel_sys_acl_set_permset,
+	.sys_acl_valid_fn = skel_sys_acl_valid,
+	.sys_acl_set_file_fn = skel_sys_acl_set_file,
+	.sys_acl_set_fd_fn = skel_sys_acl_set_fd,
+	.sys_acl_delete_def_file_fn = skel_sys_acl_delete_def_file,
+	.sys_acl_get_perm_fn = skel_sys_acl_get_perm,
+	.sys_acl_free_text_fn = skel_sys_acl_free_text,
+	.sys_acl_free_acl_fn = skel_sys_acl_free_acl,
+	.sys_acl_free_qualifier_fn = skel_sys_acl_free_qualifier,
 
 	/* EA operations. */
-	.getxattr = skel_getxattr,
-	.lgetxattr = skel_lgetxattr,
-	.fgetxattr = skel_fgetxattr,
-	.listxattr = skel_listxattr,
-	.llistxattr = skel_llistxattr,
-	.flistxattr = skel_flistxattr,
-	.removexattr = skel_removexattr,
-	.lremovexattr = skel_lremovexattr,
-	.fremovexattr = skel_fremovexattr,
-	.setxattr = skel_setxattr,
-	.lsetxattr = skel_lsetxattr,
-	.fsetxattr = skel_fsetxattr,
+	.getxattr_fn = skel_getxattr,
+	.lgetxattr_fn = skel_lgetxattr,
+	.fgetxattr_fn = skel_fgetxattr,
+	.listxattr_fn = skel_listxattr,
+	.llistxattr_fn = skel_llistxattr,
+	.flistxattr_fn = skel_flistxattr,
+	.removexattr_fn = skel_removexattr,
+	.lremovexattr_fn = skel_lremovexattr,
+	.fremovexattr_fn = skel_fremovexattr,
+	.setxattr_fn = skel_setxattr,
+	.lsetxattr_fn = skel_lsetxattr,
+	.fsetxattr_fn = skel_fsetxattr,
 
 	/* aio operations */
-	.aio_read = skel_aio_read,
-	.aio_write = skel_aio_write,
+	.aio_read_fn = skel_aio_read,
+	.aio_write_fn = skel_aio_write,
 	.aio_return_fn = skel_aio_return_fn,
-	.aio_cancel = skel_aio_cancel,
+	.aio_cancel_fn = skel_aio_cancel,
 	.aio_error_fn = skel_aio_error_fn,
-	.aio_fsync = skel_aio_fsync,
-	.aio_suspend = skel_aio_suspend,
-	.aio_force = skel_aio_force,
+	.aio_fsync_fn = skel_aio_fsync,
+	.aio_suspend_fn = skel_aio_suspend,
+	.aio_force_fn = skel_aio_force,
 
 	/* offline operations */
-	.is_offline = skel_is_offline,
-	.set_offline = skel_set_offline
+	.is_offline_fn = skel_is_offline,
+	.set_offline_fn = skel_set_offline
 };
 
 NTSTATUS vfs_skel_opaque_init(void)
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 4804d93322..85079b40c9 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -752,142 +752,142 @@ struct vfs_fn_pointers skel_transparent_fns = {
 	/* Disk operations */
 
 	.connect_fn = skel_connect,
-	.disconnect = skel_disconnect,
-	.disk_free = skel_disk_free,
-	.get_quota = skel_get_quota,
-	.set_quota = skel_set_quota,
-	.get_shadow_copy_data = skel_get_shadow_copy_data,
-	.statvfs = skel_statvfs,
-	.fs_capabilities = skel_fs_capabilities,
-	.get_dfs_referrals = skel_get_dfs_referrals,
+	.disconnect_fn = skel_disconnect,
+	.disk_free_fn = skel_disk_free,
+	.get_quota_fn = skel_get_quota,
+	.set_quota_fn = skel_set_quota,
+	.get_shadow_copy_data_fn = skel_get_shadow_copy_data,
+	.statvfs_fn = skel_statvfs,
+	.fs_capabilities_fn = skel_fs_capabilities,
+	.get_dfs_referrals_fn = skel_get_dfs_referrals,
 
 	/* Directory operations */
 
-	.opendir = skel_opendir,
-	.fdopendir = skel_fdopendir,
-	.readdir = skel_readdir,
-	.seekdir = skel_seekdir,
-	.telldir = skel_telldir,
-	.rewind_dir = skel_rewind_dir,
-	.mkdir = skel_mkdir,
-	.rmdir = skel_rmdir,
-	.closedir = skel_closedir,
-	.init_search_op = skel_init_search_op,
+	.opendir_fn = skel_opendir,
+	.fdopendir_fn = skel_fdopendir,
+	.readdir_fn = skel_readdir,
+	.seekdir_fn = skel_seekdir,
+	.telldir_fn = skel_telldir,
+	.rewind_dir_fn = skel_rewind_dir,
+	.mkdir_fn = skel_mkdir,
+	.rmdir_fn = skel_rmdir,
+	.closedir_fn = skel_closedir,
+	.init_search_op_fn = skel_init_search_op,
 
 	/* File operations */
 
 	.open_fn = skel_open,
-	.create_file = skel_create_file,
+	.create_file_fn = skel_create_file,
 	.close_fn = skel_close_fn,
-	.vfs_read = skel_vfs_read,
-	.pread = skel_pread,
-	.write = skel_write,
-	.pwrite = skel_pwrite,
-	.lseek = skel_lseek,
-	.sendfile = skel_sendfile,
-	.recvfile = skel_recvfile,
-	.rename = skel_rename,
-	.fsync = skel_fsync,
-	.stat = skel_stat,
-	.fstat = skel_fstat,
-	.lstat = skel_lstat,
-	.get_alloc_size = skel_get_alloc_size,
-	.unlink = skel_unlink,
-	.chmod = skel_chmod,
-	.fchmod = skel_fchmod,
-	.chown = skel_chown,
-	.fchown = skel_fchown,
-	.lchown = skel_lchown,
-	.chdir = skel_chdir,
-	.getwd = skel_getwd,
-	.ntimes = skel_ntimes,
-	.ftruncate = skel_ftruncate,
-	.fallocate = skel_fallocate,
-	.lock = skel_lock,
-	.kernel_flock = skel_kernel_flock,
-	.linux_setlease = skel_linux_setlease,
-	.getlock = skel_getlock,
-	.symlink = skel_symlink,
-	.vfs_readlink = skel_vfs_readlink,
-	.link = skel_link,
-	.mknod = skel_mknod,
-	.realpath = skel_realpath,
-	.notify_watch = skel_notify_watch,
-	.chflags = skel_chflags,
-	.file_id_create = skel_file_id_create,
-
-	.streaminfo = skel_streaminfo,
-	.get_real_filename = skel_get_real_filename,
-	.connectpath = skel_connectpath,
-	.brl_lock_windows = skel_brl_lock_windows,
-	.brl_unlock_windows = skel_brl_unlock_windows,
-	.brl_cancel_windows = skel_brl_cancel_windows,
-	.strict_lock = skel_strict_lock,
-	.strict_unlock = skel_strict_unlock,
-	.translate_name = skel_translate_name,
-	.fsctl = skel_fsctl,
+	.read_fn = skel_vfs_read,
+	.pread_fn = skel_pread,
+	.write_fn = skel_write,
+	.pwrite_fn = skel_pwrite,
+	.lseek_fn = skel_lseek,
+	.sendfile_fn = skel_sendfile,
+	.recvfile_fn = skel_recvfile,
+	.rename_fn = skel_rename,
+	.fsync_fn = skel_fsync,
+	.stat_fn = skel_stat,
+	.fstat_fn = skel_fstat,
+	.lstat_fn = skel_lstat,
+	.get_alloc_size_fn = skel_get_alloc_size,
+	.unlink_fn = skel_unlink,
+	.chmod_fn = skel_chmod,
+	.fchmod_fn = skel_fchmod,
+	.chown_fn = skel_chown,
+	.fchown_fn = skel_fchown,
+	.lchown_fn = skel_lchown,
+	.chdir_fn = skel_chdir,
+	.getwd_fn = skel_getwd,
+	.ntimes_fn = skel_ntimes,
+	.ftruncate_fn = skel_ftruncate,
+	.fallocate_fn = skel_fallocate,
+	.lock_fn = skel_lock,
+	.kernel_flock_fn = skel_kernel_flock,
+	.linux_setlease_fn = skel_linux_setlease,
+	.getlock_fn = skel_getlock,
+	.symlink_fn = skel_symlink,
+	.readlink_fn = skel_vfs_readlink,
+	.link_fn = skel_link,
+	.mknod_fn = skel_mknod,
+	.realpath_fn = skel_realpath,
+	.notify_watch_fn = skel_notify_watch,
+	.chflags_fn = skel_chflags,
+	.file_id_create_fn = skel_file_id_create,
+
+	.streaminfo_fn = skel_streaminfo,
+	.get_real_filename_fn = skel_get_real_filename,
+	.connectpath_fn = skel_connectpath,
+	.brl_lock_windows_fn = skel_brl_lock_windows,
+	.brl_unlock_windows_fn = skel_brl_unlock_windows,
+	.brl_cancel_windows_fn = skel_brl_cancel_windows,
+	.strict_lock_fn = skel_strict_lock,
+	.strict_unlock_fn = skel_strict_unlock,
+	.translate_name_fn = skel_translate_name,
+	.fsctl_fn = skel_fsctl,
 
 	/* NT ACL operations. */
 
-	.fget_nt_acl = skel_fget_nt_acl,
-	.get_nt_acl = skel_get_nt_acl,
-	.fset_nt_acl = skel_fset_nt_acl,
+	.fget_nt_acl_fn = skel_fget_nt_acl,
+	.get_nt_acl_fn = skel_get_nt_acl,
+	.fset_nt_acl_fn = skel_fset_nt_acl,
 
 	/* POSIX ACL operations. */
 
-	.chmod_acl = skel_chmod_acl,
-	.fchmod_acl = skel_fchmod_acl,
-
-	.sys_acl_get_entry = skel_sys_acl_get_entry,
-	.sys_acl_get_tag_type = skel_sys_acl_get_tag_type,
-	.sys_acl_get_permset = skel_sys_acl_get_permset,
-	.sys_acl_get_qualifier = skel_sys_acl_get_qualifier,
-	.sys_acl_get_file = skel_sys_acl_get_file,
-	.sys_acl_get_fd = skel_sys_acl_get_fd,
-	.sys_acl_clear_perms = skel_sys_acl_clear_perms,
-	.sys_acl_add_perm = skel_sys_acl_add_perm,
-	.sys_acl_to_text = skel_sys_acl_to_text,
-	.sys_acl_init = skel_sys_acl_init,
-	.sys_acl_create_entry = skel_sys_acl_create_entry,
-	.sys_acl_set_tag_type = skel_sys_acl_set_tag_type,
-	.sys_acl_set_qualifier = skel_sys_acl_set_qualifier,
-	.sys_acl_set_permset = skel_sys_acl_set_permset,
-	.sys_acl_valid = skel_sys_acl_valid,
-	.sys_acl_set_file = skel_sys_acl_set_file,
-	.sys_acl_set_fd = skel_sys_acl_set_fd,
-	.sys_acl_delete_def_file = skel_sys_acl_delete_def_file,
-	.sys_acl_get_perm = skel_sys_acl_get_perm,
-	.sys_acl_free_text = skel_sys_acl_free_text,
-	.sys_acl_free_acl = skel_sys_acl_free_acl,
-	.sys_acl_free_qualifier = skel_sys_acl_free_qualifier,
+	.chmod_acl_fn = skel_chmod_acl,
+	.fchmod_acl_fn = skel_fchmod_acl,
+
+	.sys_acl_get_entry_fn = skel_sys_acl_get_entry,
+	.sys_acl_get_tag_type_fn = skel_sys_acl_get_tag_type,
+	.sys_acl_get_permset_fn = skel_sys_acl_get_permset,
+	.sys_acl_get_qualifier_fn = skel_sys_acl_get_qualifier,
+	.sys_acl_get_file_fn = skel_sys_acl_get_file,
+	.sys_acl_get_fd_fn = skel_sys_acl_get_fd,
+	.sys_acl_clear_perms_fn = skel_sys_acl_clear_perms,
+	.sys_acl_add_perm_fn = skel_sys_acl_add_perm,
+	.sys_acl_to_text_fn = skel_sys_acl_to_text,
+	.sys_acl_init_fn = skel_sys_acl_init,
+	.sys_acl_create_entry_fn = skel_sys_acl_create_entry,
+	.sys_acl_set_tag_type_fn = skel_sys_acl_set_tag_type,
+	.sys_acl_set_qualifier_fn = skel_sys_acl_set_qualifier,
+	.sys_acl_set_permset_fn = skel_sys_acl_set_permset,
+	.sys_acl_valid_fn = skel_sys_acl_valid,
+	.sys_acl_set_file_fn = skel_sys_acl_set_file,
+	.sys_acl_set_fd_fn = skel_sys_acl_set_fd,
+	.sys_acl_delete_def_file_fn = skel_sys_acl_delete_def_file,
+	.sys_acl_get_perm_fn = skel_sys_acl_get_perm,
+	.sys_acl_free_text_fn = skel_sys_acl_free_text,
+	.sys_acl_free_acl_fn = skel_sys_acl_free_acl,
+	.sys_acl_free_qualifier_fn = skel_sys_acl_free_qualifier,
 
 	/* EA operations. */
-	.getxattr = skel_getxattr,
-	.lgetxattr = skel_lgetxattr,
-	.fgetxattr = skel_fgetxattr,
-	.listxattr = skel_listxattr,
-	.llistxattr = skel_llistxattr,
-	.flistxattr = skel_flistxattr,
-	.removexattr = skel_removexattr,
-	.lremovexattr = skel_lremovexattr,
-	.fremovexattr = skel_fremovexattr,
-	.setxattr = skel_setxattr,
-	.lsetxattr = skel_lsetxattr,
-	.fsetxattr = skel_fsetxattr,
+	.getxattr_fn = skel_getxattr,
+	.lgetxattr_fn = skel_lgetxattr,
+	.fgetxattr_fn = skel_fgetxattr,
+	.listxattr_fn = skel_listxattr,
+	.llistxattr_fn = skel_llistxattr,
+	.flistxattr_fn = skel_flistxattr,
+	.removexattr_fn = skel_removexattr,
+	.lremovexattr_fn = skel_lremovexattr,
+	.fremovexattr_fn = skel_fremovexattr,
+	.setxattr_fn = skel_setxattr,
+	.lsetxattr_fn = skel_lsetxattr,
+	.fsetxattr_fn = skel_fsetxattr,
 
 	/* aio operations */
-	.aio_read = skel_aio_read,
-	.aio_write = skel_aio_write,
+	.aio_read_fn = skel_aio_read,
+	.aio_write_fn = skel_aio_write,
 	.aio_return_fn = skel_aio_return_fn,
-	.aio_cancel = skel_aio_cancel,
+	.aio_cancel_fn = skel_aio_cancel,
 	.aio_error_fn = skel_aio_error_fn,
-	.aio_fsync = skel_aio_fsync,
-	.aio_suspend = skel_aio_suspend,
-	.aio_force = skel_aio_force,
+	.aio_fsync_fn = skel_aio_fsync,
+	.aio_suspend_fn = skel_aio_suspend,
+	.aio_force_fn = skel_aio_force,
 
 	/* offline operations */
-	.is_offline = skel_is_offline,
-	.set_offline = skel_set_offline
+	.is_offline_fn = skel_is_offline,
+	.set_offline_fn = skel_set_offline
 };
 
 NTSTATUS vfs_skel_transparent_init(void)