diff options
| author | rmh <rmh@FreeBSD.org> | 2013-06-30 23:14:55 +0000 |
|---|---|---|
| committer | rmh <rmh@FreeBSD.org> | 2013-06-30 23:14:55 +0000 |
| commit | 81396ac4d6991043acbdb2f768306335d3db31f2 (patch) | |
| tree | e0db5bcc19bd281b1c207b1e15ddd0961fcefd09 /sys/cddl | |
| parent | 1db16779a5401fa798771dadcc4e78be25374a9b (diff) | |
| download | FreeBSD-src-81396ac4d6991043acbdb2f768306335d3db31f2.zip FreeBSD-src-81396ac4d6991043acbdb2f768306335d3db31f2.tar.gz | |
Enable kernel-specific code for FreeBSD also on other systems that use
the kernel of FreeBSD.
Reviewed by: pjd
Diffstat (limited to 'sys/cddl')
4 files changed, 6 insertions, 6 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h index c813797..52b8f30 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h @@ -71,7 +71,7 @@ extern void zvol_log_write_minor(void *minor_hdl, dmu_tx_t *tx, offset_t off, 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 diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c index 3200e7e..6545dc2 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c @@ -1683,7 +1683,7 @@ zfs_acl_ids_create(znode_t *dzp, int flag, vattr_t *vap, cred_t *cr, } 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 flags, boolean_t skipaclchk, cred_t *cr) 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 diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c index ac1aa42..c076775 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c @@ -938,7 +938,7 @@ zfs_make_xattrdir(znode_t *zp, vattr_t *vap, vnode_t **xvpp, cred_t *cr) * 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 diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c index fec6be4..665627d 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c @@ -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) |
