From: Christof Schmitt <cs@samba.org>
Date: Fri, 15 Dec 2017 22:32:12 +0000 (-0700)
Subject: vfs: Use static_decl_vfs in all VFS modules
X-Git-Tag: talloc-2.1.11~142
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=4003736a3d663e39beeabe3d3d9bdffdeca2b570;p=samba.git

vfs: Use static_decl_vfs in all VFS modules

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Mon Dec 18 13:32:00 CET 2017 on sn-devel-144
---

diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c
index ce789f01375..54c9344a637 100644
--- a/source3/modules/vfs_afsacl.c
+++ b/source3/modules/vfs_afsacl.c
@@ -1111,7 +1111,7 @@ static struct vfs_fn_pointers vfs_afsacl_fns = {
 	.sys_acl_blob_get_fd_fn = afsacl_sys_acl_blob_get_fd
 };
 
-NTSTATUS vfs_afsacl_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_afsacl_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "afsacl",
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index a0b1429132a..5ad2dcee4ba 100644
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -927,7 +927,7 @@ static struct vfs_fn_pointers vfs_aio_fork_fns = {
 	.fsync_recv_fn = aio_fork_fsync_recv,
 };
 
-NTSTATUS vfs_aio_fork_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_aio_fork_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_aio_pthread.c b/source3/modules/vfs_aio_pthread.c
index 1d9346cfb65..d78dd110e3c 100644
--- a/source3/modules/vfs_aio_pthread.c
+++ b/source3/modules/vfs_aio_pthread.c
@@ -496,7 +496,7 @@ static struct vfs_fn_pointers vfs_aio_pthread_fns = {
 #endif
 };
 
-NTSTATUS vfs_aio_pthread_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_aio_pthread_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_aixacl.c b/source3/modules/vfs_aixacl.c
index f6c42cb40b5..86be759c187 100644
--- a/source3/modules/vfs_aixacl.c
+++ b/source3/modules/vfs_aixacl.c
@@ -190,7 +190,7 @@ static struct vfs_fn_pointers vfs_aixacl_fns = {
 	.sys_acl_delete_def_file_fn = aixacl_sys_acl_delete_def_file,
 };
 
-NTSTATUS vfs_aixacl_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_aixacl_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "aixacl",
diff --git a/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c
index 2e4b61e369d..d0cd2c1cbc2 100644
--- a/source3/modules/vfs_aixacl2.c
+++ b/source3/modules/vfs_aixacl2.c
@@ -566,7 +566,7 @@ static struct vfs_fn_pointers vfs_aixacl2_fns = {
 	.sys_acl_delete_def_file_fn = aixjfs2_sys_acl_delete_def_file
 };
 
-NTSTATUS vfs_aixacl2_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_aixacl2_init(TALLOC_CTX *ctx)
 {
         return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, AIXACL2_MODULE_NAME,
diff --git a/source3/modules/vfs_btrfs.c b/source3/modules/vfs_btrfs.c
index 13fd5e34c19..775e5f07611 100644
--- a/source3/modules/vfs_btrfs.c
+++ b/source3/modules/vfs_btrfs.c
@@ -837,7 +837,7 @@ static struct vfs_fn_pointers btrfs_fns = {
 	.snap_delete_fn = btrfs_snap_delete,
 };
 
-NTSTATUS vfs_btrfs_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_btrfs_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_cacheprime.c b/source3/modules/vfs_cacheprime.c
index f06ece6a190..5a8b8e0f904 100644
--- a/source3/modules/vfs_cacheprime.c
+++ b/source3/modules/vfs_cacheprime.c
@@ -189,7 +189,7 @@ static struct vfs_fn_pointers vfs_cacheprime_fns = {
  * -------------------------------------------------------------------------
  */
 
-NTSTATUS vfs_cacheprime_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_cacheprime_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, MODULE,
diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c
index e4d30cb4e5a..0684c794c76 100644
--- a/source3/modules/vfs_cap.c
+++ b/source3/modules/vfs_cap.c
@@ -1069,7 +1069,7 @@ static struct vfs_fn_pointers vfs_cap_fns = {
 	.fsetxattr_fn = cap_fsetxattr
 };
 
-NTSTATUS vfs_cap_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_cap_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "cap",
diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
index 9abd32196a8..b4a7ceef105 100644
--- a/source3/modules/vfs_ceph.c
+++ b/source3/modules/vfs_ceph.c
@@ -1474,7 +1474,7 @@ static struct vfs_fn_pointers ceph_fns = {
 	.aio_force_fn = cephwrap_aio_force,
 };
 
-NTSTATUS vfs_ceph_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_ceph_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_commit.c b/source3/modules/vfs_commit.c
index 872b40bd78c..aa9c87db74d 100644
--- a/source3/modules/vfs_commit.c
+++ b/source3/modules/vfs_commit.c
@@ -403,7 +403,7 @@ static struct vfs_fn_pointers vfs_commit_fns = {
         .ftruncate_fn = commit_ftruncate
 };
 
-NTSTATUS vfs_commit_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_commit_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, MODULE,
diff --git a/source3/modules/vfs_crossrename.c b/source3/modules/vfs_crossrename.c
index 4daa82c5e98..f1cae9aee7d 100644
--- a/source3/modules/vfs_crossrename.c
+++ b/source3/modules/vfs_crossrename.c
@@ -198,7 +198,7 @@ static struct vfs_fn_pointers vfs_crossrename_fns = {
 	.rename_fn = crossrename_rename
 };
 
-NTSTATUS vfs_crossrename_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_crossrename_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, MODULE,
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 3379493accb..073c79004b5 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -3152,7 +3152,7 @@ static struct vfs_fn_pointers vfs_default_fns = {
 	.durable_reconnect_fn = vfswrap_durable_reconnect,
 };
 
-NTSTATUS vfs_default_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_default_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_default_quota.c b/source3/modules/vfs_default_quota.c
index c27681af00f..326eb8c8f0a 100644
--- a/source3/modules/vfs_default_quota.c
+++ b/source3/modules/vfs_default_quota.c
@@ -228,7 +228,7 @@ static struct vfs_fn_pointers vfs_default_quota_fns = {
 	.set_quota_fn = default_quota_set_quota
 };
 
-NTSTATUS vfs_default_quota_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_default_quota_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, DEFAULT_QUOTA_NAME,
diff --git a/source3/modules/vfs_dfs_samba4.c b/source3/modules/vfs_dfs_samba4.c
index 0bf1a29c8c6..d7f4edf2dea 100644
--- a/source3/modules/vfs_dfs_samba4.c
+++ b/source3/modules/vfs_dfs_samba4.c
@@ -135,7 +135,7 @@ static struct vfs_fn_pointers vfs_dfs_samba4_fns = {
 	.get_dfs_referrals_fn = dfs_samba4_get_referrals,
 };
 
-NTSTATUS vfs_dfs_samba4_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_dfs_samba4_init(TALLOC_CTX *ctx)
 {
 	NTSTATUS ret;
diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c
index 4cabc8f5508..598da08c0c8 100644
--- a/source3/modules/vfs_expand_msdfs.c
+++ b/source3/modules/vfs_expand_msdfs.c
@@ -228,7 +228,7 @@ static struct vfs_fn_pointers vfs_expand_msdfs_fns = {
 	.readlink_fn = expand_msdfs_readlink
 };
 
-NTSTATUS vfs_expand_msdfs_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_expand_msdfs_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "expand_msdfs",
diff --git a/source3/modules/vfs_fake_acls.c b/source3/modules/vfs_fake_acls.c
index 0f539d1f29c..e6983d49c58 100644
--- a/source3/modules/vfs_fake_acls.c
+++ b/source3/modules/vfs_fake_acls.c
@@ -538,7 +538,7 @@ static struct vfs_fn_pointers vfs_fake_acls_fns = {
 	
 };
 
-NTSTATUS vfs_fake_acls_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_fake_acls_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "fake_acls",
diff --git a/source3/modules/vfs_fake_perms.c b/source3/modules/vfs_fake_perms.c
index 299bb48ae13..0089186be1a 100644
--- a/source3/modules/vfs_fake_perms.c
+++ b/source3/modules/vfs_fake_perms.c
@@ -100,7 +100,7 @@ static struct vfs_fn_pointers vfs_fake_perms_fns = {
 	.fstat_fn = fake_perms_fstat
 };
 
-NTSTATUS vfs_fake_perms_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_fake_perms_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "fake_perms",
diff --git a/source3/modules/vfs_fileid.c b/source3/modules/vfs_fileid.c
index bb0a79c0d65..a7c4a49d553 100644
--- a/source3/modules/vfs_fileid.c
+++ b/source3/modules/vfs_fileid.c
@@ -258,7 +258,7 @@ static struct vfs_fn_pointers vfs_fileid_fns = {
 	.file_id_create_fn = fileid_file_id_create
 };
 
-NTSTATUS vfs_fileid_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_fileid_init(TALLOC_CTX *ctx)
 {
 	NTSTATUS ret;
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 6a478574c99..67dd571c627 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -6038,7 +6038,7 @@ static struct vfs_fn_pointers vfs_fruit_fns = {
 	.fset_nt_acl_fn = fruit_fset_nt_acl,
 };
 
-NTSTATUS vfs_fruit_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_fruit_init(TALLOC_CTX *ctx)
 {
 	NTSTATUS ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "fruit",
diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index cffab7b986e..953c46af4cd 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -1523,7 +1523,7 @@ static struct vfs_fn_pointers glusterfs_fns = {
 	.durable_reconnect_fn = NULL,
 };
 
-NTSTATUS vfs_glusterfs_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_glusterfs_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index e94c9cc4f1d..a0fd48fab7c 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -2598,7 +2598,7 @@ static struct vfs_fn_pointers vfs_gpfs_fns = {
 	.ftruncate_fn = vfs_gpfs_ftruncate
 };
 
-NTSTATUS vfs_gpfs_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_gpfs_init(TALLOC_CTX *ctx)
 {
 	int ret;
diff --git a/source3/modules/vfs_hpuxacl.c b/source3/modules/vfs_hpuxacl.c
index 53e0ad6fe80..42a2ab09194 100644
--- a/source3/modules/vfs_hpuxacl.c
+++ b/source3/modules/vfs_hpuxacl.c
@@ -1167,6 +1167,7 @@ static struct vfs_fn_pointers hpuxacl_fns = {
 	.sys_acl_delete_def_file_fn = hpuxacl_sys_acl_delete_def_file,
 };
 
+static_decl_vfs;
 NTSTATUS vfs_hpuxacl_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "hpuxacl",
diff --git a/source3/modules/vfs_hpuxacl.h b/source3/modules/vfs_hpuxacl.h
index b1b9ec3eccb..087dc6c3015 100644
--- a/source3/modules/vfs_hpuxacl.h
+++ b/source3/modules/vfs_hpuxacl.h
@@ -52,7 +52,5 @@ int hpuxacl_sys_acl_set_fd(vfs_handle_struct *handle,
 int hpuxacl_sys_acl_delete_def_file(vfs_handle_struct *handle,
 			const struct smb_filename *smb_fname);
 
-NTSTATUS vfs_hpuxacl_init(void);
-
 #endif
 
diff --git a/source3/modules/vfs_linux_xfs_sgid.c b/source3/modules/vfs_linux_xfs_sgid.c
index 841d7c3c4b1..ab41031d17f 100644
--- a/source3/modules/vfs_linux_xfs_sgid.c
+++ b/source3/modules/vfs_linux_xfs_sgid.c
@@ -108,7 +108,7 @@ static struct vfs_fn_pointers linux_xfs_sgid_fns = {
 	.chmod_acl_fn = linux_xfs_sgid_chmod_acl,
 };
 
-NTSTATUS vfs_linux_xfs_sgid_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_linux_xfs_sgid_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_media_harmony.c b/source3/modules/vfs_media_harmony.c
index 43e69086945..f0815d79f95 100644
--- a/source3/modules/vfs_media_harmony.c
+++ b/source3/modules/vfs_media_harmony.c
@@ -2353,7 +2353,7 @@ static struct vfs_fn_pointers vfs_mh_fns = {
 	/* aio operations */
 };
 
-NTSTATUS vfs_media_harmony_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_media_harmony_init(TALLOC_CTX *ctx)
 {
 	NTSTATUS ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_netatalk.c b/source3/modules/vfs_netatalk.c
index 16c129de995..206c3b69060 100644
--- a/source3/modules/vfs_netatalk.c
+++ b/source3/modules/vfs_netatalk.c
@@ -483,7 +483,7 @@ static struct vfs_fn_pointers vfs_netatalk_fns = {
 	.lchown_fn = atalk_lchown,
 };
 
-NTSTATUS vfs_netatalk_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_netatalk_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "netatalk",
diff --git a/source3/modules/vfs_nfs4acl_xattr.c b/source3/modules/vfs_nfs4acl_xattr.c
index d301f25ed31..0e52782075b 100644
--- a/source3/modules/vfs_nfs4acl_xattr.c
+++ b/source3/modules/vfs_nfs4acl_xattr.c
@@ -659,7 +659,7 @@ static struct vfs_fn_pointers nfs4acl_xattr_fns = {
 	.sys_acl_delete_def_file_fn = nfs4acl_xattr_fail__sys_acl_delete_def_file,
 };
 
-NTSTATUS vfs_nfs4acl_xattr_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_nfs4acl_xattr_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "nfs4acl_xattr",
diff --git a/source3/modules/vfs_offline.c b/source3/modules/vfs_offline.c
index e8cb4394b3c..d70fad4c042 100644
--- a/source3/modules/vfs_offline.c
+++ b/source3/modules/vfs_offline.c
@@ -49,7 +49,7 @@ static struct vfs_fn_pointers offline_fns = {
 	.fget_dos_attributes_fn = offline_fget_dos_attributes,
 };
 
-NTSTATUS vfs_offline_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_offline_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "offline",
diff --git a/source3/modules/vfs_posixacl.c b/source3/modules/vfs_posixacl.c
index 0cad9b6ec68..83fb0455b3a 100644
--- a/source3/modules/vfs_posixacl.c
+++ b/source3/modules/vfs_posixacl.c
@@ -382,7 +382,7 @@ static struct vfs_fn_pointers posixacl_fns = {
 	.sys_acl_delete_def_file_fn = posixacl_sys_acl_delete_def_file,
 };
 
-NTSTATUS vfs_posixacl_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_posixacl_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "posixacl",
diff --git a/source3/modules/vfs_prealloc.c b/source3/modules/vfs_prealloc.c
index cec537c88ef..04e77a3412b 100644
--- a/source3/modules/vfs_prealloc.c
+++ b/source3/modules/vfs_prealloc.c
@@ -213,7 +213,7 @@ static struct vfs_fn_pointers prealloc_fns = {
 	.connect_fn = prealloc_connect,
 };
 
-NTSTATUS vfs_prealloc_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_prealloc_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_preopen.c b/source3/modules/vfs_preopen.c
index 18b01e6c05e..aac00c7be95 100644
--- a/source3/modules/vfs_preopen.c
+++ b/source3/modules/vfs_preopen.c
@@ -450,7 +450,7 @@ static struct vfs_fn_pointers vfs_preopen_fns = {
 	.open_fn = preopen_open
 };
 
-NTSTATUS vfs_preopen_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_preopen_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_readahead.c b/source3/modules/vfs_readahead.c
index 129ac1b3340..90a255d60b0 100644
--- a/source3/modules/vfs_readahead.c
+++ b/source3/modules/vfs_readahead.c
@@ -178,7 +178,7 @@ static struct vfs_fn_pointers vfs_readahead_fns = {
  Module initialization boilerplate.
 *******************************************************************/
 
-NTSTATUS vfs_readahead_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_readahead_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "readahead",
diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c
index 5032f269cc0..e84f0351c87 100644
--- a/source3/modules/vfs_recycle.c
+++ b/source3/modules/vfs_recycle.c
@@ -662,7 +662,7 @@ static struct vfs_fn_pointers vfs_recycle_fns = {
 	.unlink_fn = recycle_unlink
 };
 
-NTSTATUS vfs_recycle_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_recycle_init(TALLOC_CTX *ctx)
 {
 	NTSTATUS ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "recycle",
diff --git a/source3/modules/vfs_shadow_copy.c b/source3/modules/vfs_shadow_copy.c
index 59f9e528f51..2aa95124a17 100644
--- a/source3/modules/vfs_shadow_copy.c
+++ b/source3/modules/vfs_shadow_copy.c
@@ -309,7 +309,7 @@ static struct vfs_fn_pointers vfs_shadow_copy_fns = {
 	.get_shadow_copy_data_fn = shadow_copy_get_shadow_copy_data,
 };
 
-NTSTATUS vfs_shadow_copy_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_shadow_copy_init(TALLOC_CTX *ctx)
 {
 	NTSTATUS ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
index 6a123092a5e..b6745cf169b 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -3269,7 +3269,7 @@ static struct vfs_fn_pointers vfs_shadow_copy2_fns = {
 	.connectpath_fn = shadow_copy2_connectpath,
 };
 
-NTSTATUS vfs_shadow_copy2_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_shadow_copy2_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_shell_snap.c b/source3/modules/vfs_shell_snap.c
index 97bcf643113..d1b7b8c1fd1 100644
--- a/source3/modules/vfs_shell_snap.c
+++ b/source3/modules/vfs_shell_snap.c
@@ -193,7 +193,7 @@ static struct vfs_fn_pointers shell_snap_fns = {
 	.snap_delete_fn = shell_snap_delete,
 };
 
-NTSTATUS vfs_shell_snap_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_shell_snap_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_snapper.c b/source3/modules/vfs_snapper.c
index 9dbb74f8fe9..60851501a51 100644
--- a/source3/modules/vfs_snapper.c
+++ b/source3/modules/vfs_snapper.c
@@ -3177,7 +3177,7 @@ static struct vfs_fn_pointers snapper_fns = {
 	.get_real_filename_fn = snapper_gmt_get_real_filename,
 };
 
-NTSTATUS vfs_snapper_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_snapper_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_solarisacl.c b/source3/modules/vfs_solarisacl.c
index 5c011396ed4..54296fc5957 100644
--- a/source3/modules/vfs_solarisacl.c
+++ b/source3/modules/vfs_solarisacl.c
@@ -774,7 +774,7 @@ static struct vfs_fn_pointers solarisacl_fns = {
 	.sys_acl_delete_def_file_fn = solarisacl_sys_acl_delete_def_file,
 };
 
-NTSTATUS vfs_solarisacl_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_solarisacl_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "solarisacl",
diff --git a/source3/modules/vfs_streams_depot.c b/source3/modules/vfs_streams_depot.c
index 04c1cdb7d48..31625b34711 100644
--- a/source3/modules/vfs_streams_depot.c
+++ b/source3/modules/vfs_streams_depot.c
@@ -1061,7 +1061,7 @@ static struct vfs_fn_pointers vfs_streams_depot_fns = {
 	.streaminfo_fn = streams_depot_streaminfo,
 };
 
-NTSTATUS vfs_streams_depot_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_streams_depot_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "streams_depot",
diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c
index c126a483f70..580ecd0e5ff 100644
--- a/source3/modules/vfs_streams_xattr.c
+++ b/source3/modules/vfs_streams_xattr.c
@@ -1698,7 +1698,7 @@ static struct vfs_fn_pointers vfs_streams_xattr_fns = {
 	.fset_nt_acl_fn = streams_xattr_fset_nt_acl,
 };
 
-NTSTATUS vfs_streams_xattr_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_streams_xattr_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "streams_xattr",
diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c
index 8e08a7be095..4a0ec89f044 100644
--- a/source3/modules/vfs_time_audit.c
+++ b/source3/modules/vfs_time_audit.c
@@ -2787,7 +2787,7 @@ static struct vfs_fn_pointers vfs_time_audit_fns = {
 };
 
 
-NTSTATUS vfs_time_audit_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_time_audit_init(TALLOC_CTX *ctx)
 {
 	smb_vfs_assert_all_fns(&vfs_time_audit_fns, "time_audit");
diff --git a/source3/modules/vfs_tru64acl.c b/source3/modules/vfs_tru64acl.c
index d44e56a0df9..087f452f9db 100644
--- a/source3/modules/vfs_tru64acl.c
+++ b/source3/modules/vfs_tru64acl.c
@@ -481,7 +481,7 @@ static struct vfs_fn_pointers tru64acl_fns = {
 	.sys_acl_delete_def_file_fn = tru64acl_sys_acl_delete_def_file,
 };
 
-NTSTATUS vfs_tru64acl_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_tru64acl_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "tru64acl",
diff --git a/source3/modules/vfs_tsmsm.c b/source3/modules/vfs_tsmsm.c
index b3493e7512d..99d11a53f9d 100644
--- a/source3/modules/vfs_tsmsm.c
+++ b/source3/modules/vfs_tsmsm.c
@@ -608,7 +608,7 @@ static struct vfs_fn_pointers tsmsm_fns = {
 	.fget_dos_attributes_fn = tsmsm_fget_dos_attributes,
 };
 
-NTSTATUS vfs_tsmsm_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_tsmsm_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_unityed_media.c b/source3/modules/vfs_unityed_media.c
index f55061afaec..9859037722e 100644
--- a/source3/modules/vfs_unityed_media.c
+++ b/source3/modules/vfs_unityed_media.c
@@ -1941,7 +1941,7 @@ static struct vfs_fn_pointers vfs_um_fns = {
 	.setxattr_fn = um_setxattr,
 };
 
-NTSTATUS vfs_unityed_media_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_unityed_media_init(TALLOC_CTX *ctx)
 {
 	NTSTATUS ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
diff --git a/source3/modules/vfs_vxfs.c b/source3/modules/vfs_vxfs.c
index 335fd18d9b9..3bf3adc6209 100644
--- a/source3/modules/vfs_vxfs.c
+++ b/source3/modules/vfs_vxfs.c
@@ -951,7 +951,7 @@ static struct vfs_fn_pointers vfs_vxfs_fns = {
 	.fsetxattr_fn = vxfs_fset_xattr,
 };
 
-NTSTATUS vfs_vxfs_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_vxfs_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "vxfs",
diff --git a/source3/modules/vfs_worm.c b/source3/modules/vfs_worm.c
index f7dfe734b86..a956911591c 100644
--- a/source3/modules/vfs_worm.c
+++ b/source3/modules/vfs_worm.c
@@ -86,7 +86,7 @@ static struct vfs_fn_pointers vfs_worm_fns = {
 	.create_file_fn = vfs_worm_create_file,
 };
 
-NTSTATUS vfs_worm_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_worm_init(TALLOC_CTX *ctx)
 {
 	NTSTATUS ret;
diff --git a/source3/modules/vfs_xattr_tdb.c b/source3/modules/vfs_xattr_tdb.c
index c9bb4728e34..a8b3ee2174a 100644
--- a/source3/modules/vfs_xattr_tdb.c
+++ b/source3/modules/vfs_xattr_tdb.c
@@ -616,7 +616,7 @@ static struct vfs_fn_pointers vfs_xattr_tdb_fns = {
 	.connect_fn = xattr_tdb_connect,
 };
 
-NTSTATUS vfs_xattr_tdb_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_xattr_tdb_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "xattr_tdb",
diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c
index 2e277c67a24..0bc4ba6604f 100644
--- a/source3/modules/vfs_zfsacl.c
+++ b/source3/modules/vfs_zfsacl.c
@@ -378,7 +378,7 @@ static struct vfs_fn_pointers zfsacl_fns = {
 	.fset_nt_acl_fn = zfsacl_fset_nt_acl,
 };
 
-NTSTATUS vfs_zfsacl_init(TALLOC_CTX *);
+static_decl_vfs;
 NTSTATUS vfs_zfsacl_init(TALLOC_CTX *ctx)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "zfsacl",