svn commit: r192877 - in user/kmacy/releng_7_2_fcs/sys: cddl/contrib/opensolaris/uts/common/fs conf kern

Kip Macy kmacy at FreeBSD.org
Wed May 27 06:05:27 UTC 2009 

Author: kmacy
Date: Wed May 27 06:05:20 2009
New Revision: 192877
URL: http://svn.freebsd.org/changeset/base/192877

Log:
  - add option to link ZFS support in to the kernel for cases where having a single
    binary is simpler (profiling etc.)
  - this is still handicapped by an incompatibility between opensolaris' xdr and freebsd's xdr

Modified:
  user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c
  user/kmacy/releng_7_2_fcs/sys/conf/files
  user/kmacy/releng_7_2_fcs/sys/conf/files.amd64
  user/kmacy/releng_7_2_fcs/sys/conf/kern.pre.mk
  user/kmacy/releng_7_2_fcs/sys/conf/options
  user/kmacy/releng_7_2_fcs/sys/kern/vfs_syscalls.c

Modified: user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c	Wed May 27 06:04:38 2009	(r192876)
+++ user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c	Wed May 27 06:05:20 2009	(r192877)
@@ -209,5 +209,5 @@ static struct kproc_desc up_kp = {
 	vn_rele_async_cleaner,
 	&vn_rele_async_proc
 };
-SYSINIT(vaclean, SI_SUB_KTHREAD_UPDATE, SI_ORDER_FIRST, kproc_start, &up_kp);
-SYSINIT(vn_rele_async_setup, SI_SUB_VFS, SI_ORDER_FIRST, vn_rele_async_init, NULL);
+SYSINIT(vaclean, SI_SUB_KTHREAD_UPDATE, SI_ORDER_ANY, kproc_start, &up_kp);
+SYSINIT(vn_rele_async_setup, SI_SUB_DRIVERS, SI_ORDER_ANY, vn_rele_async_init, NULL);

Modified: user/kmacy/releng_7_2_fcs/sys/conf/files
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/conf/files	Wed May 27 06:04:38 2009	(r192876)
+++ user/kmacy/releng_7_2_fcs/sys/conf/files	Wed May 27 06:05:20 2009	(r192877)
@@ -2395,3 +2395,235 @@ gnu/fs/xfs/xfs_iomap.c		optional xfs \
 	compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
 gnu/fs/xfs/xfs_behavior.c	optional xfs \
 	compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+
+
+cddl/compat/opensolaris/kern/opensolaris.c		optional opensolaris \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_CFLAGS}"
+cddl/compat/opensolaris/kern/opensolaris_cmn_err.c	optional opensolaris \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_CFLAGS}"
+cddl/compat/opensolaris/kern/opensolaris_kmem.c		optional opensolaris \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_CFLAGS}"
+cddl/compat/opensolaris/kern/opensolaris_misc.c		optional opensolaris \
+	compile-with "${ZFS_C} ${ZFS_CFLAGS} ${OPENSOLARIS_INC}" 
+
+
+cddl/contrib/opensolaris/common/acl/acl_common.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/common/avl/avl.c		optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/common/nvpair/nvpair.c		optional zfs \
+	compile-with "${ZFS_C} ${ZFS_CFLAGS} ${OPENSOLARIS_INC}" 
+
+cddl/contrib/opensolaris/common/unicode/u8_textprep.c	optional zfs \
+	compile-with "${ZFS_C} ${ZFS_CFLAGS} ${OPENSOLARIS_INC}" 
+
+cddl/compat/opensolaris/kern/opensolaris_kmem.c		optional zfs \
+	compile-with "${ZFS_C} ${ZFS_CFLAGS} ${OPENSOLARIS_INC}" 
+cddl/compat/opensolaris/kern/opensolaris_kobj.c		optional zfs \
+	compile-with "${ZFS_C} ${ZFS_CFLAGS} ${OPENSOLARIS_INC}" 
+cddl/compat/opensolaris/kern/opensolaris_kstat.c	optional zfs \
+	compile-with "${ZFS_C} ${ZFS_CFLAGS} ${OPENSOLARIS_INC}" 
+cddl/compat/opensolaris/kern/opensolaris_lookup.c	optional zfs \
+	compile-with "${ZFS_C} ${ZFS_CFLAGS} ${OPENSOLARIS_INC}" 
+cddl/compat/opensolaris/kern/opensolaris_policy.c	optional zfs \
+	compile-with "${ZFS_C} ${ZFS_CFLAGS} ${OPENSOLARIS_INC}" 
+cddl/compat/opensolaris/kern/opensolaris_string.c	optional zfs \
+	compile-with "${ZFS_C} ${ZFS_CFLAGS} ${OPENSOLARIS_INC}" 
+cddl/compat/opensolaris/kern/opensolaris_vfs.c		optional zfs \
+	compile-with "${ZFS_C} ${ZFS_CFLAGS} ${OPENSOLARIS_INC}" 
+cddl/compat/opensolaris/kern/opensolaris_zone.c		optional zfs \
+	compile-with "${ZFS_C} ${ZFS_CFLAGS} ${OPENSOLARIS_INC}" 
+
+
+cddl/contrib/opensolaris/uts/common/fs/gfs.c		optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/vnode.c		optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+
+
+cddl/contrib/opensolaris/uts/common/os/callb.c		optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/os/list.c		optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/os/taskq.c		optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+
+
+cddl/contrib/opensolaris/uts/common/zmod/adler32.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/zmod/deflate.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/zmod/inffast.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/zmod/inflate.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/zmod/inftrees.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/zmod/trees.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/zmod/zmod.c		optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/zmod/zutil.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+
+
+
+
+
+cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+
+cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/common/zfs/zfs_deleg.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/common/zfs/zfs_prop.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/common/zfs/zfs_comutil.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/common/zfs/zpool_prop.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/common/zfs/zprop_common.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+
+
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+
+
+cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c	optional zfs \
+	compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"

Modified: user/kmacy/releng_7_2_fcs/sys/conf/files.amd64
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/conf/files.amd64	Wed May 27 06:04:38 2009	(r192876)
+++ user/kmacy/releng_7_2_fcs/sys/conf/files.amd64	Wed May 27 06:05:20 2009	(r192877)
@@ -268,3 +268,7 @@ i386/cpufreq/est.c		optional	cpufreq
 i386/cpufreq/p4tcc.c		optional	cpufreq
 #
 libkern/memset.c		standard
+
+cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S	optional	zfs \
+	compile-with "${ZFS_C} ${ZFS_CFLAGS} ${OPENSOLARIS_INC}"
+

Modified: user/kmacy/releng_7_2_fcs/sys/conf/kern.pre.mk
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/conf/kern.pre.mk	Wed May 27 06:04:38 2009	(r192876)
+++ user/kmacy/releng_7_2_fcs/sys/conf/kern.pre.mk	Wed May 27 06:05:20 2009	(r192877)
@@ -51,7 +51,44 @@ C_DIALECT= -std=c99
 NOSTDINC= -nostdinc
 .endif
 
+.if defined(OPENSOLARIS)
+SUNW=$S/cddl/contrib/opensolaris
+OPENSOLARIS_INC=
+OPENSOLARIS_INC+=-I$S/cddl/compat/opensolaris
+OPENSOLARIS_INC+=-I${SUNW}/uts/common 
+OPENSOLARIS_INC+=-I${SUNW}/uts/common/fs/zfs
+OPENSOLARIS_INC+=-I${SUNW}/uts/common/zmod
+OPENSOLARIS_INC+=-I$S
+OPENSOLARIS_INC+=-I${SUNW}/common/zfs
+OPENSOLARIS_INC+=-I${SUNW}/common 
+OPENSOLARIS_INC+=-I$S/../include
+OPENSOLARIS_INC+=-I.
+OPENSOLARIS_INC+=-I@
+CWARNFLAGS+=-Wno-unknown-pragmas
+.endif
+
+
+ZFS_C_DIALECT=-std=iso9899:1999
+ZFS_CWARNFLAGS=-Wno-missing-prototypes
+ZFS_CWARNFLAGS+=-Wno-pointer-sign
+ZFS_CWARNFLAGS+=-Wno-undef
+ZFS_CWARNFLAGS+=-Wno-strict-prototypes
+ZFS_CWARNFLAGS+=-Wno-cast-qual
+ZFS_CWARNFLAGS+=-Wno-parentheses
+ZFS_CWARNFLAGS+=-Wno-redundant-decls
+ZFS_CWARNFLAGS+=-Wno-missing-braces
+ZFS_CWARNFLAGS+=-Wno-uninitialized
+ZFS_CWARNFLAGS+=-Wno-unused
+ZFS_CWARNFLAGS+=-Wno-inline
+ZFS_CWARNFLAGS+=-Wno-switch
+
+ZFS_INC=
+
+.if make(depend) || make(kernel-depend)
+INCLUDES= ${OPENSOLARIS_INC} ${ZFS_INC} ${NOSTDINC} ${INCLMAGIC} -I. -I$S
+.else
 INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S
+.endif
 
 # This hack lets us use the OpenBSD altq code without spamming a new
 # include path into contrib'ed source files.
@@ -80,17 +117,26 @@ INCLUDES+= -I$S/dev/cxgb
 # ...  and XFS
 INCLUDES+= -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs
 
-# ...  and OpenSolaris
-INCLUDES+= -I$S/contrib/opensolaris/compat
 
 .endif
 
 CFLAGS=	${COPTFLAGS} ${C_DIALECT} ${DEBUG} ${CWARNFLAGS}
 CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h
+
+ZFS_CFLAGS= -DFREEBSD_NAMECACHE -DBUILDING_ZFS -D_KERNEL
+ZFS_CFLAGS+=-DHAVE_KERNEL_OPTION_HEADERS -nostdinc 	
+ZFS_CFLAGS+=-mcmodel=kernel -mno-red-zone  -mfpmath=387 -mno-sse -mno-sse2 -mno-sse3 -mno-mmx -mno-3dnow  -msoft-float -fno-asynchronous-unwind-tables -ffreestanding
+ZFS_CFLAGS+=${COPTFLAGS} ${ZFS_C_DIALECT} ${DEBUG} ${CWARNFLAGS} 
+ZFS_CFLAGS+=${ZFS_CWARNFLAGS}  -include opt_global.h -I${.CURDIR}
+
 .if ${CC} != "icc"
 CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
 CFLAGS+= --param inline-unit-growth=100
 CFLAGS+= --param large-function-growth=1000
+ZFS_CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
+ZFS_CFLAGS+= --param inline-unit-growth=100
+ZFS_CFLAGS+= --param large-function-growth=1000
+
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || \
     ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "powerpc" || \
     ${MACHINE_ARCH} == "sparc64"
@@ -123,6 +169,7 @@ CFLAGS+=	${CONF_CFLAGS}
 LINTFLAGS=	${LINTOBJKERNFLAGS}
 
 NORMAL_C= ${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.IMPSRC}
+ZFS_C= ${CC} -c -DBUILDING_ZFS -D_KERNEL ${WERROR} ${PROF} ${.IMPSRC}
 NORMAL_S= ${CC} -c ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}
 PROFILE_C= ${CC} -c ${CFLAGS} ${WERROR} ${.IMPSRC}
 NORMAL_C_NOWERROR= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC}

Modified: user/kmacy/releng_7_2_fcs/sys/conf/options
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/conf/options	Wed May 27 06:04:38 2009	(r192876)
+++ user/kmacy/releng_7_2_fcs/sys/conf/options	Wed May 27 06:05:20 2009	(r192877)
@@ -771,6 +771,10 @@ XBOX			opt_xbox.h
 # XFS
 XFS
 
+# ZFS
+OPENSOLARIS
+ZFS
+
 # Interrupt filtering
 INTR_FILTER             opt_global.h
 

Modified: user/kmacy/releng_7_2_fcs/sys/kern/vfs_syscalls.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/kern/vfs_syscalls.c	Wed May 27 06:04:38 2009	(r192876)
+++ user/kmacy/releng_7_2_fcs/sys/kern/vfs_syscalls.c	Wed May 27 06:05:20 2009	(r192877)
@@ -1399,7 +1399,7 @@ link(td, uap)
 	return (error);
 }
 
-static int hardlink_check_uid = 0;
+int hardlink_check_uid = 0;
 SYSCTL_INT(_security_bsd, OID_AUTO, hardlink_check_uid, CTLFLAG_RW,
     &hardlink_check_uid, 0,
     "Unprivileged processes cannot create hard links to files owned by other "

More information about the svn-src-user mailing list