Date: Wed, 2 Jul 2025 14:38:04 GMT From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 3f6ba5c1d15c - main - files: Fix builds without "options UFS_ACL" Message-ID: <202507021438.562Ec4m9021165@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=3f6ba5c1d15cf2592e12a6befa4ca77742534555 commit 3f6ba5c1d15cf2592e12a6befa4ca77742534555 Author: Rick Macklem <rmacklem@FreeBSD.org> AuthorDate: 2025-07-02 14:33:20 +0000 Commit: Rick Macklem <rmacklem@FreeBSD.org> CommitDate: 2025-07-02 14:35:34 +0000 files: Fix builds without "options UFS_ACL" Commit 50e733f19b37 broke kernel builds without "options UFS_ACL". This patch fixes it. Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D51131 Fixes: 50e733f19b37 ("nfscl: Use delegation ACE when mounted with nocto") --- sys/conf/files | 2 +- sys/fs/nfsclient/nfs_clport.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/conf/files b/sys/conf/files index 84fae3c00ea6..75ee10be5896 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3865,7 +3865,7 @@ kern/sched_ule.c optional sched_ule kern/serdev_if.m standard kern/stack_protector.c standard \ compile-with "${NORMAL_C:N-fstack-protector*}" -kern/subr_acl_nfs4.c optional ufs_acl | zfs +kern/subr_acl_nfs4.c optional ufs_acl | zfs | nfscl kern/subr_acl_posix1e.c optional ufs_acl kern/subr_asan.c optional kasan \ compile-with "${NOSAN_C:N-fstack-protector*}" diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c index ce7221c133cf..b25d967982a1 100644 --- a/sys/fs/nfsclient/nfs_clport.c +++ b/sys/fs/nfsclient/nfs_clport.c @@ -1489,3 +1489,4 @@ MODULE_DEPEND(nfscl, nfscommon, 1, 1, 1); MODULE_DEPEND(nfscl, krpc, 1, 1, 1); MODULE_DEPEND(nfscl, nfssvc, 1, 1, 1); MODULE_DEPEND(nfscl, xdr, 1, 1, 1); +MODULE_DEPEND(nfscl, acl_nfs4, 1, 1, 1);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202507021438.562Ec4m9021165>