On Thu, 21 Mar 2013, Martin Matuska wrote:
Author: mm
Date: Thu Mar 21 08:38:03 2013
New Revision: 248571
URL: http://svnweb.freebsd.org/changeset/base/248571
Log:
Merge libzfs_core branch:
includes MFV 238590, 238592, 247580
...
Added:
head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c
- copied unchanged from r248551,
projects/libzfs_core/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c
head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.h
- copied unchanged from r248551,
projects/libzfs_core/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.h
head/cddl/contrib/opensolaris/lib/libzfs_core/
- copied from r248551,
projects/libzfs_core/cddl/contrib/opensolaris/lib/libzfs_core/
head/cddl/lib/libzfs_core/
- copied from r248551, projects/libzfs_core/cddl/lib/libzfs_core/
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
- copied unchanged from r248551,
projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
- copied unchanged from r248551,
projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h
- copied unchanged from r248551,
projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_destroy.h
- copied unchanged from r248551,
projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_destroy.h
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_userhold.h
- copied unchanged from r248551,
projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_userhold.h
in the theoretical event someone would want to compile zfs into the kernel,
given r233578 added support for that, one would need this:
mm, peter?
Index: sys/conf/files
===================================================================
--- sys/conf/files (revision 248649)
+++ sys/conf/files (working copy)
@@ -197,11 +197,13 @@ cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_s
cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c optional zfs
compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c optional zfs
compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c optional zfs
compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c optional zfs
compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c optional zfs
compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c optional zfs
compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c optional zfs
compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c optional zfs
compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c optional zfs
compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c optional zfs
compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c optional zfs
compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/lz4.c optional zfs
compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c optional zfs
compile-with "${ZFS_C}"
--
Bjoern A. Zeeb Charles Haddon Spurgeon:
"Friendship is one of the sweetest joys of life. Many might have failed
beneath the bitterness of their trial had they not found a friend."
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
