[src/netbsd-9]: src/external/cddl/osnet/dist/uts/common/fs/zfs Pull up follow...

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

details:   https://anonhg.NetBSD.org/src/rev/f49076976729
branches:  netbsd-9
changeset: 359443:f49076976729
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Jan 06 16:11:07 2022 +0000

description:
Pull up following revision(s) (requested by hauke in ticket #1400):

        external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c: revision 1.7

Default files to BSD group ownership in line with ffs, after the lead
of FreeBSD <https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D139076>
(patch by hannken@)

diffstat:

 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 202831998876 -r f49076976729 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c      Thu Dec 30 12:40:08 2021 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c      Thu Jan 06 16:11:07 2022 +0000
@@ -1661,7 +1661,7 @@
                        } else {
                                acl_ids->z_fgid = zfs_fuid_create_cred(zfsvfs,
                                    ZFS_GROUP, cr, &acl_ids->z_fuidp);
-#ifdef __FreeBSD_kernel__
+#if defined(__FreeBSD_kernel__) || defined(__NetBSD__)
                                gid = acl_ids->z_fgid = dzp->z_gid;
 #else
                                gid = crgetgid(cr);