Date: Wed, 16 Aug 2017 22:46:59 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r322598 - projects/pnfs-planb-server-stable11/sys/fs/nfs Message-ID: <201708162246.v7GMkxxo077053@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmacklem Date: Wed Aug 16 22:46:59 2017 New Revision: 322598 URL: https://svnweb.freebsd.org/changeset/base/322598 Log: Add the hook for setting ACLs on the DS data files, which was missed during the code merge. Without this patch, a pNFS service with ACLs enabled would not have enforced the ACL for data access. Modified: projects/pnfs-planb-server-stable11/sys/fs/nfs/nfs_commonacl.c Modified: projects/pnfs-planb-server-stable11/sys/fs/nfs/nfs_commonacl.c ============================================================================== --- projects/pnfs-planb-server-stable11/sys/fs/nfs/nfs_commonacl.c Wed Aug 16 22:00:56 2017 (r322597) +++ projects/pnfs-planb-server-stable11/sys/fs/nfs/nfs_commonacl.c Wed Aug 16 22:46:59 2017 (r322598) @@ -471,6 +471,11 @@ nfsrv_setacl(vnode_t vp, NFSACL_T *aclp, struct ucred goto out; } error = VOP_SETACL(vp, ACL_TYPE_NFS4, aclp, cred, p); + if (error == 0) { + error = nfsrv_dssetacl(vp, aclp, cred, p); + if (error == ENOENT) + error = 0; + } out: NFSEXITCODE(error);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708162246.v7GMkxxo077053>