[src/trunk]: src/sys/ufs/ufs use MNT_NFS4ACLS instead of MNT_ACLS (which was ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/21d465dbb2a8
branches:  trunk
changeset: 1026493:21d465dbb2a8
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Nov 26 17:35:12 2021 +0000

description:
use MNT_NFS4ACLS instead of MNT_ACLS (which was changed before to mean
MNT_POSIX1EACLS)

diffstat:

 sys/ufs/ufs/ufs_acl.c   |  14 +++++++-------
 sys/ufs/ufs/ufs_vnops.c |  18 +++++++++---------
 2 files changed, 16 insertions(+), 16 deletions(-)

diffs (140 lines):

diff -r f90fede4e05f -r 21d465dbb2a8 sys/ufs/ufs/ufs_acl.c
--- a/sys/ufs/ufs/ufs_acl.c     Fri Nov 26 15:45:52 2021 +0000
+++ b/sys/ufs/ufs/ufs_acl.c     Fri Nov 26 17:35:12 2021 +0000
@@ -36,7 +36,7 @@
 #if 0
 __FBSDID("$FreeBSD: head/sys/ufs/ufs/ufs_acl.c 356669 2020-01-13 02:31:51Z mjg $");
 #endif
-__KERNEL_RCSID(0, "$NetBSD: ufs_acl.c,v 1.3 2021/10/20 03:08:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_acl.c,v 1.4 2021/11/26 17:35:12 christos Exp $");
 
 #if defined(_KERNEL_OPT) 
 #include "opt_ffs.h"
@@ -215,7 +215,7 @@
 {
        int error;
 
-       if ((ap->a_vp->v_mount->mnt_flag & MNT_ACLS) == 0)
+       if ((ap->a_vp->v_mount->mnt_flag & MNT_NFS4ACLS) == 0)
                return (EINVAL);
 
        error = VOP_ACCESSX(ap->a_vp, VREAD_ACL, ap->a_cred);
@@ -362,7 +362,7 @@
 {
        struct vop_getacl_args *ap = v;
 
-       if ((ap->a_vp->v_mount->mnt_flag & (MNT_POSIX1EACLS | MNT_ACLS)) == 0)
+       if ((ap->a_vp->v_mount->mnt_flag & (MNT_POSIX1EACLS | MNT_NFS4ACLS)) == 0)
                return (EOPNOTSUPP);
 
        if (ap->a_type == ACL_TYPE_NFS4)
@@ -438,7 +438,7 @@
        int error;
        struct inode *ip = VTOI(ap->a_vp);
 
-       if ((ap->a_vp->v_mount->mnt_flag & MNT_ACLS) == 0)
+       if ((ap->a_vp->v_mount->mnt_flag & MNT_NFS4ACLS) == 0)
                return (EINVAL);
 
        if (ap->a_vp->v_mount->mnt_flag & MNT_RDONLY)
@@ -612,7 +612,7 @@
 ufs_setacl(void *v)
 {
        struct vop_setacl_args *ap = v;
-       if ((ap->a_vp->v_mount->mnt_flag & (MNT_POSIX1EACLS | MNT_ACLS)) == 0)
+       if ((ap->a_vp->v_mount->mnt_flag & (MNT_POSIX1EACLS | MNT_NFS4ACLS)) == 0)
                return (EOPNOTSUPP);
 
        if (ap->a_type == ACL_TYPE_NFS4)
@@ -627,7 +627,7 @@
 {
        int is_directory = 0;
 
-       if ((ap->a_vp->v_mount->mnt_flag & MNT_ACLS) == 0)
+       if ((ap->a_vp->v_mount->mnt_flag & MNT_NFS4ACLS) == 0)
                return (EINVAL);
 
        /*
@@ -683,7 +683,7 @@
 {
        struct vop_aclcheck_args *ap = v;
 
-       if ((ap->a_vp->v_mount->mnt_flag & (MNT_POSIX1EACLS | MNT_ACLS)) == 0)
+       if ((ap->a_vp->v_mount->mnt_flag & (MNT_POSIX1EACLS | MNT_NFS4ACLS)) == 0)
                return (EOPNOTSUPP);
 
        if (ap->a_type == ACL_TYPE_NFS4)
diff -r f90fede4e05f -r 21d465dbb2a8 sys/ufs/ufs/ufs_vnops.c
--- a/sys/ufs/ufs/ufs_vnops.c   Fri Nov 26 15:45:52 2021 +0000
+++ b/sys/ufs/ufs/ufs_vnops.c   Fri Nov 26 17:35:12 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_vnops.c,v 1.260 2021/10/20 03:08:19 thorpej Exp $  */
+/*     $NetBSD: ufs_vnops.c,v 1.261 2021/11/26 17:35:12 christos Exp $ */
 
 /*-
  * Copyright (c) 2008, 2020 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.260 2021/10/20 03:08:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.261 2021/11/26 17:35:12 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -345,8 +345,8 @@
                return error;
 
 #ifdef UFS_ACL
-       if ((vp->v_mount->mnt_flag & (MNT_POSIX1EACLS | MNT_ACLS)) != 0) {
-               if (vp->v_mount->mnt_flag & MNT_ACLS)
+       if ((vp->v_mount->mnt_flag & (MNT_POSIX1EACLS | MNT_NFS4ACLS)) != 0) {
+               if (vp->v_mount->mnt_flag & MNT_NFS4ACLS)
                        type = ACL_TYPE_NFS4;
                else
                        type = ACL_TYPE_ACCESS;
@@ -730,7 +730,7 @@
                return (error);
 
 #ifdef UFS_ACL
-       if ((vp->v_mount->mnt_flag & MNT_ACLS) != 0) {
+       if ((vp->v_mount->mnt_flag & MNT_NFS4ACLS) != 0) {
                error = ufs_update_nfs4_acl_after_mode_change(vp, mode,
                    ip->i_uid, cred, l);
                if (error)
@@ -1291,7 +1291,7 @@
                    cnp->cn_cred, l);
                if (error)
                        goto bad;
-       } else if (dvp->v_mount->mnt_flag & MNT_ACLS) {
+       } else if (dvp->v_mount->mnt_flag & MNT_NFS4ACLS) {
                error = ufs_do_nfs4_acl_inheritance(dvp, tvp, dmode,
                    cnp->cn_cred, l);
                if (error)
@@ -2105,7 +2105,7 @@
                        *ap->a_retval = 0;
                return 0;
        case _PC_ACL_NFS4:
-               if (ap->a_vp->v_mount->mnt_flag & MNT_ACLS)
+               if (ap->a_vp->v_mount->mnt_flag & MNT_NFS4ACLS)
                        *ap->a_retval = 1;
                else
                        *ap->a_retval = 0;
@@ -2113,7 +2113,7 @@
 #endif
        case _PC_ACL_PATH_MAX:
 #ifdef UFS_ACL
-               if (ap->a_vp->v_mount->mnt_flag & (MNT_POSIX1EACLS | MNT_ACLS))
+               if (ap->a_vp->v_mount->mnt_flag & (MNT_POSIX1EACLS | MNT_NFS4ACLS))
                        *ap->a_retval = ACL_MAX_ENTRIES;
                else
                        *ap->a_retval = 3;
@@ -2272,7 +2272,7 @@
                    ip->i_mode, cnp->cn_cred, l);
                if (error)
                        goto bad;
-       } else if (dvp->v_mount->mnt_flag & MNT_ACLS) {
+       } else if (dvp->v_mount->mnt_flag & MNT_NFS4ACLS) {
                error = ufs_do_nfs4_acl_inheritance(dvp, tvp, ip->i_mode,
                    cnp->cn_cred, l);
                if (error)