The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=6f84579ae4d107635e32fc3fcfc34669adc7b3f5
commit 6f84579ae4d107635e32fc3fcfc34669adc7b3f5 Author: Ryan Libby <[email protected]> AuthorDate: 2026-05-05 05:55:11 +0000 Commit: Ryan Libby <[email protected]> CommitDate: 2026-05-05 05:55:11 +0000 nfs_pub: move from vfs_subr.c to vfs_export.c nfs_pub is used only in vfs_export.c. Reviewed by: kib, rmacklem Differential Revision: https://reviews.freebsd.org/D56777 --- sys/kern/vfs_export.c | 3 +++ sys/kern/vfs_subr.c | 3 --- sys/sys/mount.h | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index bd7caa01e153..566dd3d8770d 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -62,6 +62,9 @@ #include <rpc/types.h> #include <rpc/auth.h> +/* Publicly exported FS */ +static struct nfs_public nfs_pub; + static MALLOC_DEFINE(M_NETADDR, "export_host", "Export host address structure"); #if defined(INET) || defined(INET6) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 58975f7ac932..823ccc6cab71 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -237,9 +237,6 @@ static struct mtx mntid_mtx; */ static struct mtx __exclusive_cache_line vnode_list_mtx; -/* Publicly exported FS */ -struct nfs_public nfs_pub; - static uma_zone_t buf_trie_zone; static smr_t buf_trie_smr; diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 18f85192f6c3..1ca492929813 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -1071,7 +1071,6 @@ int vfs_report_lockf(struct mount *mp, struct sbuf *sb); extern TAILQ_HEAD(mntlist, mount) mountlist; /* mounted filesystem list */ extern struct mtx_padalign mountlist_mtx; -extern struct nfs_public nfs_pub; extern struct sx vfsconf_sx; #define vfsconf_lock() sx_xlock(&vfsconf_sx) #define vfsconf_unlock() sx_xunlock(&vfsconf_sx)
