Author: rmh
Date: Sun Jun 30 23:14:55 2013
New Revision: 252431
URL: http://svnweb.freebsd.org/changeset/base/252431
Log:
Enable kernel-specific code for FreeBSD also on other systems that use
the kernel of FreeBSD.
Reviewed by: pjd
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h Sun Jun
30 21:06:47 2013 (r252430)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h Sun Jun
30 23:14:55 2013 (r252431)
@@ -71,7 +71,7 @@ extern void zvol_log_write_minor(void *m
ssize_t resid, boolean_t sync);
#endif /* sun */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
extern int zvol_create_minors(const char *name);
extern void zvol_rename_minors(const char *oldname, const char *newname);
#endif
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c Sun Jun
30 21:06:47 2013 (r252430)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c Sun Jun
30 23:14:55 2013 (r252431)
@@ -1683,7 +1683,7 @@ zfs_acl_ids_create(znode_t *dzp, int fla
} else {
acl_ids->z_fgid = zfs_fuid_create_cred(zfsvfs,
ZFS_GROUP, cr, &acl_ids->z_fuidp);
-#ifdef __FreeBSD__
+#ifdef __FreeBSD_kernel__
gid = acl_ids->z_fgid = dzp->z_gid;
#else
gid = crgetgid(cr);
@@ -2374,7 +2374,7 @@ zfs_zaccess(znode_t *zp, int mode, int f
is_attr = ((zp->z_pflags & ZFS_XATTR) && (ZTOV(zp)->v_type == VDIR));
-#ifdef __FreeBSD__
+#ifdef __FreeBSD_kernel__
/*
* In FreeBSD, we don't care about permissions of individual ADS.
* Note that not checking them is not just an optimization - without
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c Sun Jun
30 21:06:47 2013 (r252430)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c Sun Jun
30 23:14:55 2013 (r252431)
@@ -938,7 +938,7 @@ zfs_make_xattrdir(znode_t *zp, vattr_t *
* In FreeBSD, access checking for creating an EA is being done
* in zfs_setextattr(),
*/
-#ifndef __FreeBSD__
+#ifndef __FreeBSD_kernel__
if (error = zfs_zaccess(zp, ACE_WRITE_NAMED_ATTRS, 0, B_FALSE, cr))
return (error);
#endif
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Sun Jun
30 21:06:47 2013 (r252430)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Sun Jun
30 23:14:55 2013 (r252431)
@@ -173,7 +173,7 @@ zfs_sync(vfs_t *vfsp, int waitfor)
return (0);
}
-#ifndef __FreeBSD__
+#ifndef __FreeBSD_kernel__
static int
zfs_create_unique_device(dev_t *dev)
{
@@ -225,7 +225,7 @@ zfs_create_unique_device(dev_t *dev)
return (0);
}
-#endif /* !__FreeBSD__ */
+#endif /* !__FreeBSD_kernel__ */
static void
atime_changed_cb(void *arg, uint64_t newval)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
