[Midnightbsd-cvs] src [10398] trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: fix ifdefs

[laffer1 at midnightbsd.org]

Revision: 10398
          http://svnweb.midnightbsd.org/src/?rev=10398
Author:   laffer1
Date:     2018-06-03 22:42:20 -0400 (Sun, 03 Jun 2018)
Log Message:
-----------
fix ifdefs

Modified Paths:
--------------
    trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h
    trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
    trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
    trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c

Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h	2018-06-04 02:11:38 UTC (rev 10397)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h	2018-06-04 02:42:20 UTC (rev 10398)
@@ -72,7 +72,7 @@
     ssize_t resid, boolean_t sync);
 #endif	/* illumos */
 
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__MidnightBSD__) || defined(__MidnightBSD_kernel__)
 extern int zvol_create_minors(const char *name);
 extern void zvol_rename_minors(const char *oldname, const char *newname);
 #endif

Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c	2018-06-04 02:11:38 UTC (rev 10397)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c	2018-06-04 02:42:20 UTC (rev 10398)
@@ -1673,7 +1673,7 @@
 			} else {
 				acl_ids->z_fgid = zfs_fuid_create_cred(zfsvfs,
 				    ZFS_GROUP, cr, &acl_ids->z_fuidp);
-#ifdef __FreeBSD_kernel__
+#ifdef __MidnightBSD_kernel__
 				gid = acl_ids->z_fgid = dzp->z_gid;
 #else
 				gid = crgetgid(cr);
@@ -2045,7 +2045,7 @@
 	}
 #else
 	/*
-	 * In FreeBSD we allow to modify directory's content is ZFS_NOUNLINK
+	 * In MidnightBSD we allow to modify directory's content is ZFS_NOUNLINK
 	 * (sunlnk) is set. We just don't allow directory removal, which is
 	 * handled in zfs_zaccess_delete().
 	 */
@@ -2360,9 +2360,9 @@
 
 	is_attr = ((zp->z_pflags & ZFS_XATTR) && (ZTOV(zp)->v_type == VDIR));
 
-#ifdef __FreeBSD_kernel__
+#ifdef __MidnightBSD_kernel__
 	/*
-	 * In FreeBSD, we don't care about permissions of individual ADS.
+	 * In MidnightBSD, we don't care about permissions of individual ADS.
 	 * Note that not checking them is not just an optimization - without
 	 * this shortcut, EA operations may bogusly fail with EACCES.
 	 */

Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c	2018-06-04 02:11:38 UTC (rev 10397)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c	2018-06-04 02:42:20 UTC (rev 10398)
@@ -703,10 +703,10 @@
 	*xvpp = NULL;
 
 	/*
-	 * In FreeBSD, access checking for creating an EA is being done
+	 * In MidnightBSD, access checking for creating an EA is being done
 	 * in zfs_setextattr(),
 	 */
-#ifndef __FreeBSD_kernel__
+#ifndef __MidnightBSD_kernel__
 	if (error = zfs_zaccess(zp, ACE_WRITE_NAMED_ATTRS, 0, B_FALSE, cr))
 		return (error);
 #endif

Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	2018-06-04 02:11:38 UTC (rev 10397)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	2018-06-04 02:42:20 UTC (rev 10398)
@@ -182,7 +182,7 @@
 	return (0);
 }
 
-#ifndef __FreeBSD_kernel__
+#ifndef __MidnightBSD_kernel__
 static int
 zfs_create_unique_device(dev_t *dev)
 {
@@ -234,7 +234,7 @@
 
 	return (0);
 }
-#endif	/* !__FreeBSD_kernel__ */
+#endif	/* !__MidnightBSD_kernel__ */
 
 static void
 atime_changed_cb(void *arg, uint64_t newval)