From nobody Wed Jul 2 14:38:04 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bXMvK10wmz60VXr; Wed, 02 Jul 2025 14:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bXMvJ6nCwz3rL7; Wed, 02 Jul 2025 14:38:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751467085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/E1V7t50etchXa5B46Vj9ENNbe3qXRZx3uVL1jWJHGg=; b=e6jx2KgMR5Gcs5JJpQtgtOP3vmKy/DMcKf8tShyYcNvjDcllnuuFSITXod6zEescbg1e5k 1P3aIF4ILBJ8NGcqAa9XRspYrrJL4BYL2SNTLCqqItSTNLk3yjbY/194kf6dHNPAOy7XcD XTMGOyjH9nFvm0Qkwnr0nPZMcv2KELVlqrqBXztHLMWbBuyydI1mgOx0y3PwLmgVCQA7xW HfboqS3T40Gdb2qE8xHaYUlJxO5yiQJoGOjzMYesMtdXp0ZHghpf6YQwQXgynBqGNlDJTN QzlhJvtIxAdjVWQvl01uzO8A6FlB49JubQSe36tJYlQknDMbQm+IQX6oZlBu0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751467085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/E1V7t50etchXa5B46Vj9ENNbe3qXRZx3uVL1jWJHGg=; b=rKTiL0WL3CtgutJ4aTojXPhIkYJ8XDfH+XeUAbuTjT5xOrPOrU/nkmn/cgfF/IeNngXUIa u1YayqqfZLsBVd3zysMTkAScxb5GB9612ScY5lMuWS5a6MQEOF0wi5yTOkdcnAV8+99M52 Kl8gn5p0s3sOrvX2RoJGjm7238aOxybubfFqVXWyznR0V+NPtuDXEYBl2FwNgONVABzl4Q YNj/Z475tc3AsiHqyscBXGv03yQByAXCYYibCkWDRmtNEZ0rTrNnwlnmx51+tOCBDQzCOc PBPqttZrlKmVrigbUHmXDN+rDqDsX4TDnqhHxBIJBWIWBalKTU7HL1AMvtSEVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751467085; a=rsa-sha256; cv=none; b=Ksp61Ec/5hu9wagBK5VEbibIPsfvurjjcBqqgVxHjO/IcoZpzIP+uOvg2EfHkRazr5KjB2 Uf/uinkyXOMCxHRacFOjWWBCITs8R2UhK2Hll6Ug7rGqQo+nHeckajhqEcilbAx353T4Xx kLsOne9cz6ku6y8A/gduDzDbHUvt0QEDC05oLt3QJxCv/OuZo4q2mMZAmrWDGXkMVghKep RhQWwNqojvQjnmIO9V5KrMLUPNfUdZGUad8ygy48eB7/R7c0krMD6adyTB2uCVlAA3wLlt z1jyjb9rFJVLb01xv1hE/DxHchQ2CkUqhIGUVOpsyl8lsdQXqMJgIBX6LgD6Iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bXMvJ64KTz7bn; Wed, 02 Jul 2025 14:38:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 562Ec4Wl021168; Wed, 2 Jul 2025 14:38:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 562Ec4m9021165; Wed, 2 Jul 2025 14:38:04 GMT (envelope-from git) Date: Wed, 2 Jul 2025 14:38:04 GMT Message-Id: <202507021438.562Ec4m9021165@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 3f6ba5c1d15c - main - files: Fix builds without "options UFS_ACL" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f6ba5c1d15cf2592e12a6befa4ca77742534555 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=3f6ba5c1d15cf2592e12a6befa4ca77742534555 commit 3f6ba5c1d15cf2592e12a6befa4ca77742534555 Author: Rick Macklem AuthorDate: 2025-07-02 14:33:20 +0000 Commit: Rick Macklem 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);