From owner-svn-src-all@FreeBSD.ORG Sun Jun 30 23:14:57 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0ECF9E7; Sun, 30 Jun 2013 23:14:57 +0000 (UTC) (envelope-from rmh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 00A041F40; Sun, 30 Jun 2013 23:14:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5UNEuVr070810; Sun, 30 Jun 2013 23:14:56 GMT (envelope-from rmh@svn.freebsd.org) Received: (from rmh@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5UNEuwv070805; Sun, 30 Jun 2013 23:14:56 GMT (envelope-from rmh@svn.freebsd.org) Message-Id: <201306302314.r5UNEuwv070805@svn.freebsd.org> From: Robert Millan Date: Sun, 30 Jun 2013 23:14:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r252431 - in head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jun 2013 23:14:57 -0000 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)