PERFORCE change 189289 for review
Matt Jacob
mjacob at FreeBSD.org
Mon Feb 28 18:06:38 UTC 2011
http://p4web.freebsd.org/@@189289?ac=10
Change 189289 by mjacob at mjacob-sandbox on 2011/02/28 18:05:53
Integrate from head.
Affected files ...
.. //depot/projects/mjacob-dev/MAINTAINERS#2 integrate
.. //depot/projects/mjacob-dev/Makefile.inc1#4 integrate
.. //depot/projects/mjacob-dev/cddl/compat/opensolaris/include/fcntl.h#2 integrate
.. //depot/projects/mjacob-dev/cddl/compat/opensolaris/include/mnttab.h#2 integrate
.. //depot/projects/mjacob-dev/cddl/compat/opensolaris/include/priv.h#2 integrate
.. //depot/projects/mjacob-dev/cddl/compat/opensolaris/include/sha2.h#1 branch
.. //depot/projects/mjacob-dev/cddl/compat/opensolaris/include/solaris.h#2 integrate
.. //depot/projects/mjacob-dev/cddl/compat/opensolaris/include/thread_pool.h#1 branch
.. //depot/projects/mjacob-dev/cddl/compat/opensolaris/misc/fsshare.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/compat/opensolaris/misc/zmount.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/stat/common/statcommon.h#1 branch
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/stat/common/timestamp.c#1 branch
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zinject/translate.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zinject/zinject.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zinject/zinject.h#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zlook/zlook.c#1 branch
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1#1 branch
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c#1 branch
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/head/synch.h#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libuutil/common/uu_string.c#1 branch
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c#1 branch
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_fru.c#1 branch
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#3 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzpool/common/util.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/pyzfs/common/__init__.py#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/pyzfs/common/allow.py#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/pyzfs/common/dataset.py#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/pyzfs/common/groupspace.py#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/pyzfs/common/holds.py#1 branch
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/pyzfs/common/ioctl.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/pyzfs/common/table.py#1 branch
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/pyzfs/common/unallow.py#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/pyzfs/common/userspace.py#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/pyzfs/common/util.py#2 integrate
.. //depot/projects/mjacob-dev/cddl/lib/libzfs/Makefile#2 integrate
.. //depot/projects/mjacob-dev/cddl/lib/libzpool/Makefile#3 integrate
.. //depot/projects/mjacob-dev/cddl/sbin/zfs/Makefile#2 integrate
.. //depot/projects/mjacob-dev/cddl/sbin/zpool/Makefile#2 integrate
.. //depot/projects/mjacob-dev/cddl/usr.bin/Makefile#2 integrate
.. //depot/projects/mjacob-dev/cddl/usr.bin/zlook/Makefile#1 branch
.. //depot/projects/mjacob-dev/cddl/usr.bin/zstreamdump/Makefile#1 branch
.. //depot/projects/mjacob-dev/cddl/usr.bin/ztest/Makefile#2 integrate
.. //depot/projects/mjacob-dev/cddl/usr.sbin/zdb/Makefile#2 integrate
.. //depot/projects/mjacob-dev/etc/rc.d/zvol#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/yp/xdryp.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libelf/libelf_convert.m4#2 integrate
.. //depot/projects/mjacob-dev/lib/libusb/libusb10.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libusb/libusb20.3#2 integrate
.. //depot/projects/mjacob-dev/lib/libusb/libusb20.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libusb/libusb20.h#2 integrate
.. //depot/projects/mjacob-dev/lib/libusb/libusb20_int.h#2 integrate
.. //depot/projects/mjacob-dev/lib/libusb/libusb20_ugen20.c#2 integrate
.. //depot/projects/mjacob-dev/rescue/rescue/Makefile#2 integrate
.. //depot/projects/mjacob-dev/share/man/man4/usb_quirk.4#3 integrate
.. //depot/projects/mjacob-dev/share/man/man7/security.7#2 integrate
.. //depot/projects/mjacob-dev/share/man/man9/usbdi.9#2 integrate
.. //depot/projects/mjacob-dev/share/timedef/pl_PL.ISO8859-2.src#2 integrate
.. //depot/projects/mjacob-dev/share/timedef/pl_PL.UTF-8.src#2 integrate
.. //depot/projects/mjacob-dev/sys/boot/i386/cdboot/cdboot.s#2 integrate
.. //depot/projects/mjacob-dev/sys/boot/i386/gptzfsboot/Makefile#4 integrate
.. //depot/projects/mjacob-dev/sys/boot/i386/zfsboot/Makefile#4 integrate
.. //depot/projects/mjacob-dev/sys/boot/pc98/cdboot/cdboot.s#2 integrate
.. //depot/projects/mjacob-dev/sys/boot/zfs/zfs.c#2 integrate
.. //depot/projects/mjacob-dev/sys/boot/zfs/zfsimpl.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/boot/zfs/fletcher.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/boot/zfs/zfsimpl.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/boot/zfs/zfssubr.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/boot/zfs/zle.c#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#3 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/kern/opensolaris_sunddi.c#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/kern/opensolaris_sysevent.c#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/atomic.h#3 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/byteorder.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/dirent.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/file.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/kmem.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/misc.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/mount.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/mutex.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/rwlock.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/sid.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/stat.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/string.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/sunddi.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/sysmacros.h#2 delete
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/systeminfo.h#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/systm.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/taskq.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/time.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/types.h#3 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/uio.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/zone.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/atomic/powerpc64/opensolaris_atomic.S#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/avl/avl.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/zfs/zfs_fletcher.c#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/zfs/zfs_fletcher.h#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.h#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt_zap.c#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#3 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#2 delete
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 delete
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bpobj.h#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deadlist.h#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa.h#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa_impl.h#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_onexit.h#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_sa.h#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_stat.h#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zrlock.h#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#3 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_debug.c#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zle.c#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zrlock.c#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/os/fm.c#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#2 delete
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/cpupart.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zut.h#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/idmap.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/dev.h#1 branch
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h#2 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#2 integrate
.. //depot/projects/mjacob-dev/sys/dev/isp/isp.c#4 integrate
.. //depot/projects/mjacob-dev/sys/dev/isp/isp_freebsd.c#5 integrate
.. //depot/projects/mjacob-dev/sys/dev/isp/isp_freebsd.h#4 integrate
.. //depot/projects/mjacob-dev/sys/dev/isp/ispvar.h#4 integrate
.. //depot/projects/mjacob-dev/sys/dev/usb/usb_generic.c#3 integrate
.. //depot/projects/mjacob-dev/sys/dev/usb/usb_ioctl.h#2 integrate
.. //depot/projects/mjacob-dev/sys/dev/usb/usb_transfer.c#4 integrate
.. //depot/projects/mjacob-dev/sys/dev/usb/usbdi.h#2 integrate
.. //depot/projects/mjacob-dev/sys/modules/opensolaris/Makefile#2 integrate
.. //depot/projects/mjacob-dev/sys/modules/zfs/Makefile#2 integrate
.. //depot/projects/mjacob-dev/usr.bin/checknr/checknr.c#3 integrate
.. //depot/projects/mjacob-dev/usr.bin/fstat/zfs.c#2 integrate
.. //depot/projects/mjacob-dev/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#3 integrate
.. //depot/projects/mjacob-dev/usr.sbin/fifolog/flint.lnt#2 integrate
.. //depot/projects/mjacob-dev/usr.sbin/fifolog/lib/fifolog_create.c#3 integrate
.. //depot/projects/mjacob-dev/usr.sbin/fifolog/lib/fifolog_int.c#3 integrate
.. //depot/projects/mjacob-dev/usr.sbin/fifolog/lib/fifolog_write.h#3 integrate
.. //depot/projects/mjacob-dev/usr.sbin/fifolog/lib/fifolog_write_poll.c#4 integrate
.. //depot/projects/mjacob-dev/usr.sbin/fifolog/lib/libfifolog.h#2 integrate
.. //depot/projects/mjacob-dev/usr.sbin/fifolog/lib/libfifolog_int.h#2 integrate
Differences ...
==== //depot/projects/mjacob-dev/MAINTAINERS#2 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.162 2010/04/10 12:29:09 bms Exp $
+$FreeBSD: src/MAINTAINERS,v 1.163 2011/02/28 06:54:14 simon Exp $
Please note that the content of this file is strictly advisory.
No locks listed here are valid. The only strict review requirements
@@ -107,7 +107,7 @@
bs{diff,patch} cperciva Pre-commit review requested.
portsnap cperciva Pre-commit review requested.
freebsd-update cperciva Pre-commit review requested.
-openssl simon Pre-commit review requested.
+openssl - No non-upstream commits should be done.
sys/netgraph/bluetooth emax Pre-commit review preferred.
lib/libbluetooth emax Pre-commit review preferred.
lib/libsdp emax Pre-commit review preferred.
==== //depot/projects/mjacob-dev/Makefile.inc1#4 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.685 2011/02/25 00:04:39 gabor Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.686 2011/02/27 19:44:10 pjd Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -1153,6 +1153,7 @@
lib/ncurses/ncurses lib/ncurses/ncursesw \
lib/libopie lib/libpam ${_lib_libthr} \
lib/libradius lib/libsbuf lib/libtacplus \
+ ${_cddl_lib_libumem} \
lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_secure_lib_libssh} \
${_secure_lib_libssl}
@@ -1166,6 +1167,7 @@
lib/libopie__L lib/libtacplus__L: lib/libmd__L
.if ${MK_CDDL} != "no"
+_cddl_lib_libumem= cddl/lib/libumem
_cddl_lib= cddl/lib
.endif
==== //depot/projects/mjacob-dev/cddl/compat/opensolaris/include/fcntl.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/cddl/compat/opensolaris/include/fcntl.h,v 1.2 2008/03/28 22:16:04 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/fcntl.h,v 1.3 2011/02/27 19:41:40 pjd Exp $
*
*/
@@ -32,6 +32,7 @@
#include_next <fcntl.h>
-#define open64 open
+#define open64(...) open(__VA_ARGS__)
+#define openat64(...) openat(__VA_ARGS__)
#endif
==== //depot/projects/mjacob-dev/cddl/compat/opensolaris/include/mnttab.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/cddl/compat/opensolaris/include/mnttab.h,v 1.5 2010/07/12 23:49:04 mm Exp $ */
+/* $FreeBSD: src/cddl/compat/opensolaris/include/mnttab.h,v 1.6 2011/02/27 19:41:40 pjd Exp $ */
#ifndef _OPENSOLARIS_MNTTAB_H_
#define _OPENSOLARIS_MNTTAB_H_
@@ -12,6 +12,10 @@
#define MNTTAB _PATH_DEVZERO
#define MNT_LINE_MAX 1024
+#define MS_OVERLAY 0x0
+#define MS_NOMNTTAB 0x0
+#define MS_RDONLY 0x1
+
#define umount2(p, f) unmount(p, f)
struct mnttab {
==== //depot/projects/mjacob-dev/cddl/compat/opensolaris/include/priv.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/cddl/compat/opensolaris/include/priv.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+/* $FreeBSD: src/cddl/compat/opensolaris/include/priv.h,v 1.4 2011/02/27 19:41:40 pjd Exp $ */
#ifndef _OPENSOLARIS_PRIV_H_
#define _OPENSOLARIS_PRIV_H_
@@ -10,7 +10,7 @@
#define PRIV_SYS_CONFIG 0
static __inline int
-priv_ineffect(priv)
+priv_ineffect(int priv)
{
assert(priv == PRIV_SYS_CONFIG);
==== //depot/projects/mjacob-dev/cddl/compat/opensolaris/include/solaris.h#2 (text+ko) ====
@@ -1,10 +1,14 @@
-/* $FreeBSD: src/cddl/compat/opensolaris/include/solaris.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+/* $FreeBSD: src/cddl/compat/opensolaris/include/solaris.h,v 1.4 2011/02/27 19:41:40 pjd Exp $ */
#ifndef _SOLARIS_H_
#define _SOLARIS_H_
#include <sys/ccompile.h>
-#define dirent64 dirent
+#include <fcntl.h>
+
+#define NOTE(s)
+
+int mkdirp(const char *, mode_t);
#endif /* !_SOLARIS_H_ */
==== //depot/projects/mjacob-dev/cddl/compat/opensolaris/misc/fsshare.c#2 (text+ko) ====
@@ -25,18 +25,20 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/fsshare.c,v 1.4 2010/07/07 07:09:33 mm Exp $");
+__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/fsshare.c,v 1.5 2011/02/27 19:41:40 pjd Exp $");
#include <sys/param.h>
-#include <stdio.h>
-#include <unistd.h>
+
+#include <assert.h>
+#include <errno.h>
#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
+#include <fsshare.h>
#include <libutil.h>
-#include <assert.h>
#include <pathnames.h> /* _PATH_MOUNTDPID */
-#include <fsshare.h>
+#include <signal.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
#define FILE_HEADER "# !!! DO NOT EDIT THIS FILE MANUALLY !!!\n\n"
#define OPTSSIZE 1024
==== //depot/projects/mjacob-dev/cddl/compat/opensolaris/misc/zmount.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/zmount.c,v 1.3 2008/11/17 20:49:29 pjd Exp $");
+__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/zmount.c,v 1.4 2011/02/27 19:41:40 pjd Exp $");
#include <sys/param.h>
#include <sys/mount.h>
@@ -39,6 +39,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <mnttab.h>
static void
build_iovec(struct iovec **iov, int *iovlen, const char *name, void *val,
@@ -78,7 +79,7 @@
assert(spec != NULL);
assert(dir != NULL);
- assert(mflag == 0);
+ assert(mflag == 0 || mflag == MS_RDONLY);
assert(fstype != NULL);
assert(strcmp(fstype, MNTTYPE_ZFS) == 0);
assert(dataptr == NULL);
@@ -91,6 +92,8 @@
iov = NULL;
iovlen = 0;
+ if (mflag & MS_RDONLY)
+ build_iovec(&iov, &iovlen, "ro", NULL, 0);
build_iovec(&iov, &iovlen, "fstype", fstype, (size_t)-1);
build_iovec(&iov, &iovlen, "fspath", __DECONST(char *, dir),
(size_t)-1);
==== //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 (text+ko) ====
@@ -19,8 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
*/
#include <stdio.h>
@@ -34,6 +33,9 @@
#include <sys/zap.h>
#include <sys/fs/zfs.h>
#include <sys/zfs_znode.h>
+#include <sys/zfs_sa.h>
+#include <sys/sa.h>
+#include <sys/sa_impl.h>
#include <sys/vdev.h>
#include <sys/vdev_impl.h>
#include <sys/metaslab_impl.h>
@@ -51,10 +53,25 @@
#include <sys/zio_compress.h>
#include <sys/zfs_fuid.h>
#include <sys/arc.h>
+#include <sys/ddt.h>
#undef ZFS_MAXNAMELEN
#undef verify
#include <libzfs.h>
+#define ZDB_COMPRESS_NAME(idx) ((idx) < ZIO_COMPRESS_FUNCTIONS ? \
+ zio_compress_table[(idx)].ci_name : "UNKNOWN")
+#define ZDB_CHECKSUM_NAME(idx) ((idx) < ZIO_CHECKSUM_FUNCTIONS ? \
+ zio_checksum_table[(idx)].ci_name : "UNKNOWN")
+#define ZDB_OT_NAME(idx) ((idx) < DMU_OT_NUMTYPES ? \
+ dmu_ot[(idx)].ot_name : "UNKNOWN")
+#define ZDB_OT_TYPE(idx) ((idx) < DMU_OT_NUMTYPES ? (idx) : DMU_OT_NUMTYPES)
+
+#ifndef lint
+extern int zfs_recover;
+#else
+int zfs_recover;
+#endif
+
const char cmdname[] = "zdb";
uint8_t dump_opt[256];
@@ -64,8 +81,6 @@
uint64_t *zopt_object = NULL;
int zopt_objects = 0;
libzfs_handle_t *g_zfs;
-boolean_t zdb_sig_user_data = B_TRUE;
-int zdb_sig_cksumalg = ZIO_CHECKSUM_SHA256;
/*
* These libumem hooks provide a reasonable set of defaults for the allocator's
@@ -87,39 +102,56 @@
usage(void)
{
(void) fprintf(stderr,
- "Usage: %s [-udibcsvL] [-U cachefile_path] [-t txg]\n"
- "\t [-S user:cksumalg] "
- "dataset [object...]\n"
- " %s -C [pool]\n"
- " %s -l dev\n"
- " %s -R pool:vdev:offset:size:flags\n"
- " %s [-p path_to_vdev_dir]\n"
- " %s -e pool | GUID | devid ...\n",
- cmdname, cmdname, cmdname, cmdname, cmdname, cmdname);
+ "Usage: %s [-CumdibcsDvhL] poolname [object...]\n"
+ " %s [-div] dataset [object...]\n"
+ " %s -m [-L] poolname [vdev [metaslab...]]\n"
+ " %s -R poolname vdev:offset:size[:flags]\n"
+ " %s -S poolname\n"
+ " %s -l [-u] device\n"
+ " %s -C\n\n",
+ cmdname, cmdname, cmdname, cmdname, cmdname, cmdname, cmdname);
- (void) fprintf(stderr, " -u uberblock\n");
- (void) fprintf(stderr, " -d datasets\n");
- (void) fprintf(stderr, " -C cached pool configuration\n");
- (void) fprintf(stderr, " -i intent logs\n");
- (void) fprintf(stderr, " -b block statistics\n");
- (void) fprintf(stderr, " -m metaslabs\n");
- (void) fprintf(stderr, " -c checksum all metadata (twice for "
+ (void) fprintf(stderr, " Dataset name must include at least one "
+ "separator character '/' or '@'\n");
+ (void) fprintf(stderr, " If dataset name is specified, only that "
+ "dataset is dumped\n");
+ (void) fprintf(stderr, " If object numbers are specified, only "
+ "those objects are dumped\n\n");
+ (void) fprintf(stderr, " Options to control amount of output:\n");
+ (void) fprintf(stderr, " -u uberblock\n");
+ (void) fprintf(stderr, " -d dataset(s)\n");
+ (void) fprintf(stderr, " -i intent logs\n");
+ (void) fprintf(stderr, " -C config (or cachefile if alone)\n");
+ (void) fprintf(stderr, " -h pool history\n");
+ (void) fprintf(stderr, " -b block statistics\n");
+ (void) fprintf(stderr, " -m metaslabs\n");
+ (void) fprintf(stderr, " -c checksum all metadata (twice for "
"all data) blocks\n");
- (void) fprintf(stderr, " -s report stats on zdb's I/O\n");
- (void) fprintf(stderr, " -S <user|all>:<cksum_alg|all> -- "
- "dump blkptr signatures\n");
- (void) fprintf(stderr, " -v verbose (applies to all others)\n");
+ (void) fprintf(stderr, " -s report stats on zdb's I/O\n");
+ (void) fprintf(stderr, " -D dedup statistics\n");
+ (void) fprintf(stderr, " -S simulate dedup to measure effect\n");
+ (void) fprintf(stderr, " -v verbose (applies to all others)\n");
(void) fprintf(stderr, " -l dump label contents\n");
(void) fprintf(stderr, " -L disable leak tracking (do not "
"load spacemaps)\n");
- (void) fprintf(stderr, " -U cachefile_path -- use alternate "
+ (void) fprintf(stderr, " -R read and display block from a "
+ "device\n\n");
+ (void) fprintf(stderr, " Below options are intended for use "
+ "with other options (except -l):\n");
+ (void) fprintf(stderr, " -A ignore assertions (-A), enable "
+ "panic recovery (-AA) or both (-AAA)\n");
+ (void) fprintf(stderr, " -F attempt automatic rewind within "
+ "safe range of transaction groups\n");
+ (void) fprintf(stderr, " -U <cachefile_path> -- use alternate "
"cachefile\n");
- (void) fprintf(stderr, " -R read and display block from a "
- "device\n");
- (void) fprintf(stderr, " -e Pool is exported/destroyed/"
- "has altroot\n");
- (void) fprintf(stderr, " -p <Path to vdev dir> (use with -e)\n");
- (void) fprintf(stderr, " -t <txg> highest txg to use when "
+ (void) fprintf(stderr, " -X attempt extreme rewind (does not "
+ "work with dataset)\n");
+ (void) fprintf(stderr, " -e pool is exported/destroyed/"
+ "has altroot/not in a cachefile\n");
+ (void) fprintf(stderr, " -p <path> -- use one or more with "
+ "-e to specify path to vdev dir\n");
+ (void) fprintf(stderr, " -P print numbers parsable\n");
+ (void) fprintf(stderr, " -t <txg> -- highest txg to use when "
"searching for uberblocks\n");
(void) fprintf(stderr, "Specify an option more than once (e.g. -bb) "
"to make only that option verbose\n");
@@ -146,68 +178,6 @@
exit(1);
}
-static void
-dump_nvlist(nvlist_t *list, int indent)
-{
- nvpair_t *elem = NULL;
-
- while ((elem = nvlist_next_nvpair(list, elem)) != NULL) {
- switch (nvpair_type(elem)) {
- case DATA_TYPE_STRING:
- {
- char *value;
-
- VERIFY(nvpair_value_string(elem, &value) == 0);
- (void) printf("%*s%s='%s'\n", indent, "",
- nvpair_name(elem), value);
- }
- break;
-
- case DATA_TYPE_UINT64:
- {
- uint64_t value;
-
- VERIFY(nvpair_value_uint64(elem, &value) == 0);
- (void) printf("%*s%s=%llu\n", indent, "",
- nvpair_name(elem), (u_longlong_t)value);
- }
- break;
-
- case DATA_TYPE_NVLIST:
- {
- nvlist_t *value;
-
- VERIFY(nvpair_value_nvlist(elem, &value) == 0);
- (void) printf("%*s%s\n", indent, "",
- nvpair_name(elem));
- dump_nvlist(value, indent + 4);
- }
- break;
-
- case DATA_TYPE_NVLIST_ARRAY:
- {
- nvlist_t **value;
- uint_t c, count;
-
- VERIFY(nvpair_value_nvlist_array(elem, &value,
- &count) == 0);
-
- for (c = 0; c < count; c++) {
- (void) printf("%*s%s[%u]\n", indent, "",
- nvpair_name(elem), c);
- dump_nvlist(value[c], indent + 8);
- }
- }
- break;
-
- default:
-
- (void) printf("bad config type %d for %s\n",
- nvpair_type(elem), nvpair_name(elem));
- }
- }
-}
-
/* ARGSUSED */
static void
dump_packed_nvlist(objset_t *os, uint64_t object, void *data, size_t size)
@@ -227,6 +197,15 @@
nvlist_free(nv);
}
+static void
+zdb_nicenum(uint64_t num, char *buf)
+{
+ if (dump_opt['P'])
+ (void) sprintf(buf, "%llu", (longlong_t)num);
+ else
+ nicenum(num, buf);
+}
+
const char dump_zap_stars[] = "****************************************";
const int dump_zap_width = sizeof (dump_zap_stars) - 1;
@@ -325,6 +304,13 @@
}
/*ARGSUSED*/
+static void
+dump_unknown(objset_t *os, uint64_t object, void *data, size_t size)
+{
+ (void) printf("\tUNKNOWN OBJECT TYPE\n");
+}
+
+/*ARGSUSED*/
void
dump_uint8(objset_t *os, uint64_t object, void *data, size_t size)
{
@@ -388,6 +374,79 @@
/*ARGSUSED*/
static void
+dump_ddt_zap(objset_t *os, uint64_t object, void *data, size_t size)
+{
+ dump_zap_stats(os, object);
+ /* contents are printed elsewhere, properly decoded */
+}
+
+/*ARGSUSED*/
+static void
+dump_sa_attrs(objset_t *os, uint64_t object, void *data, size_t size)
+{
+ zap_cursor_t zc;
+ zap_attribute_t attr;
+
+ dump_zap_stats(os, object);
+ (void) printf("\n");
+
+ for (zap_cursor_init(&zc, os, object);
+ zap_cursor_retrieve(&zc, &attr) == 0;
+ zap_cursor_advance(&zc)) {
+ (void) printf("\t\t%s = ", attr.za_name);
+ if (attr.za_num_integers == 0) {
+ (void) printf("\n");
+ continue;
+ }
+ (void) printf(" %llx : [%d:%d:%d]\n",
+ (u_longlong_t)attr.za_first_integer,
+ (int)ATTR_LENGTH(attr.za_first_integer),
+ (int)ATTR_BSWAP(attr.za_first_integer),
+ (int)ATTR_NUM(attr.za_first_integer));
+ }
+ zap_cursor_fini(&zc);
+}
+
+/*ARGSUSED*/
+static void
+dump_sa_layouts(objset_t *os, uint64_t object, void *data, size_t size)
+{
+ zap_cursor_t zc;
+ zap_attribute_t attr;
+ uint16_t *layout_attrs;
+ int i;
+
+ dump_zap_stats(os, object);
+ (void) printf("\n");
+
+ for (zap_cursor_init(&zc, os, object);
+ zap_cursor_retrieve(&zc, &attr) == 0;
+ zap_cursor_advance(&zc)) {
+ (void) printf("\t\t%s = [", attr.za_name);
+ if (attr.za_num_integers == 0) {
+ (void) printf("\n");
+ continue;
+ }
+
+ VERIFY(attr.za_integer_length == 2);
+ layout_attrs = umem_zalloc(attr.za_num_integers *
+ attr.za_integer_length, UMEM_NOFAIL);
+
+ VERIFY(zap_lookup(os, object, attr.za_name,
+ attr.za_integer_length,
+ attr.za_num_integers, layout_attrs) == 0);
+
+ for (i = 0; i != attr.za_num_integers; i++)
+ (void) printf(" %d ", (int)layout_attrs[i]);
+ (void) printf("]\n");
+ umem_free(layout_attrs,
+ attr.za_num_integers * attr.za_integer_length);
+ }
+ zap_cursor_fini(&zc);
+}
+
+/*ARGSUSED*/
+static void
dump_zpldir(objset_t *os, uint64_t object, void *data, size_t size)
{
zap_cursor_t zc;
@@ -441,17 +500,17 @@
*/
alloc = 0;
for (offset = 0; offset < smo->smo_objsize; offset += sizeof (entry)) {
- VERIFY(0 == dmu_read(os, smo->smo_object, offset,
+ VERIFY3U(0, ==, dmu_read(os, smo->smo_object, offset,
sizeof (entry), &entry, DMU_READ_PREFETCH));
if (SM_DEBUG_DECODE(entry)) {
- (void) printf("\t\t[%4llu] %s: txg %llu, pass %llu\n",
+ (void) printf("\t [%6llu] %s: txg %llu, pass %llu\n",
(u_longlong_t)(offset / sizeof (entry)),
ddata[SM_DEBUG_ACTION_DECODE(entry)],
(u_longlong_t)SM_DEBUG_TXG_DECODE(entry),
(u_longlong_t)SM_DEBUG_SYNCPASS_DECODE(entry));
} else {
- (void) printf("\t\t[%4llu] %c range:"
- " %08llx-%08llx size: %06llx\n",
+ (void) printf("\t [%6llu] %c range:"
+ " %010llx-%010llx size: %06llx\n",
(u_longlong_t)(offset / sizeof (entry)),
SM_TYPE_DECODE(entry) == SM_ALLOC ? 'A' : 'F',
(u_longlong_t)((SM_OFFSET_DECODE(entry) <<
@@ -476,14 +535,14 @@
static void
dump_metaslab_stats(metaslab_t *msp)
{
- char maxbuf[5];
+ char maxbuf[32];
space_map_t *sm = &msp->ms_map;
avl_tree_t *t = sm->sm_pp_root;
int free_pct = sm->sm_space * 100 / sm->sm_size;
- nicenum(space_map_maxsize(sm), maxbuf);
+ zdb_nicenum(space_map_maxsize(sm), maxbuf);
- (void) printf("\t %20s %10lu %7s %6s %4s %4d%%\n",
+ (void) printf("\t %25s %10lu %7s %6s %4s %4d%%\n",
"segments", avl_numnodes(t), "maxsize", maxbuf,
"freepct", free_pct);
}
@@ -495,16 +554,16 @@
spa_t *spa = vd->vdev_spa;
space_map_t *sm = &msp->ms_map;
space_map_obj_t *smo = &msp->ms_smo;
- char freebuf[5];
+ char freebuf[32];
- nicenum(sm->sm_size - smo->smo_alloc, freebuf);
+ zdb_nicenum(sm->sm_size - smo->smo_alloc, freebuf);
(void) printf(
- "\tvdev %5llu offset %12llx spacemap %6llu free %5s\n",
+ "\tmetaslab %6llu offset %12llx spacemap %6llu free %5s\n",
(u_longlong_t)(sm->sm_start / sm->sm_size),
(u_longlong_t)sm->sm_start, (u_longlong_t)smo->smo_object, freebuf);
- if (dump_opt['m'] > 1) {
+ if (dump_opt['m'] > 1 && !dump_opt['L']) {
mutex_enter(&msp->ms_lock);
space_map_load_wait(sm);
if (!sm->sm_loaded)
@@ -525,22 +584,52 @@
}
static void
+print_vdev_metaslab_header(vdev_t *vd)
+{
+ (void) printf("\tvdev %10llu\n\t%-10s%5llu %-19s %-15s %-10s\n",
+ (u_longlong_t)vd->vdev_id,
+ "metaslabs", (u_longlong_t)vd->vdev_ms_count,
+ "offset", "spacemap", "free");
+ (void) printf("\t%15s %19s %15s %10s\n",
+ "---------------", "-------------------",
+ "---------------", "-------------");
+}
+
+static void
dump_metaslabs(spa_t *spa)
{
- vdev_t *rvd = spa->spa_root_vdev;
- vdev_t *vd;
- int c, m;
+ vdev_t *vd, *rvd = spa->spa_root_vdev;
+ uint64_t m, c = 0, children = rvd->vdev_children;
(void) printf("\nMetaslabs:\n");
- for (c = 0; c < rvd->vdev_children; c++) {
+ if (!dump_opt['d'] && zopt_objects > 0) {
+ c = zopt_object[0];
+
+ if (c >= children)
+ (void) fatal("bad vdev id: %llu", (u_longlong_t)c);
+
+ if (zopt_objects > 1) {
+ vd = rvd->vdev_child[c];
+ print_vdev_metaslab_header(vd);
+
+ for (m = 1; m < zopt_objects; m++) {
+ if (zopt_object[m] < vd->vdev_ms_count)
+ dump_metaslab(
+ vd->vdev_ms[zopt_object[m]]);
+ else
+ (void) fprintf(stderr, "bad metaslab "
+ "number %llu\n",
+ (u_longlong_t)zopt_object[m]);
+ }
+ (void) printf("\n");
+ return;
+ }
+ children = c + 1;
+ }
+ for (; c < children; c++) {
vd = rvd->vdev_child[c];
-
- (void) printf("\t%-10s %-19s %-15s %-10s\n",
- "vdev", "offset", "spacemap", "free");
- (void) printf("\t%10s %19s %15s %10s\n",
- "----------", "-------------------",
- "---------------", "-------------");
+ print_vdev_metaslab_header(vd);
for (m = 0; m < vd->vdev_ms_count; m++)
dump_metaslab(vd->vdev_ms[m]);
@@ -549,6 +638,133 @@
}
static void
+dump_dde(const ddt_t *ddt, const ddt_entry_t *dde, uint64_t index)
+{
+ const ddt_phys_t *ddp = dde->dde_phys;
+ const ddt_key_t *ddk = &dde->dde_key;
+ char *types[4] = { "ditto", "single", "double", "triple" };
+ char blkbuf[BP_SPRINTF_LEN];
+ blkptr_t blk;
+
+ for (int p = 0; p < DDT_PHYS_TYPES; p++, ddp++) {
+ if (ddp->ddp_phys_birth == 0)
+ continue;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list