PERFORCE change 180869 for review

Edward Tomasz Napierala trasz at FreeBSD.org
Tue Jul 13 06:32:54 UTC 2010


http://p4web.freebsd.org/@@180869?ac=10

Change 180869 by trasz at trasz_victim on 2010/07/13 06:32:36

	IFC.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#21 integrate
.. //depot/projects/soc2009/trasz_limits/UPDATING#24 integrate
.. //depot/projects/soc2009/trasz_limits/bin/pkill/pkill.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/compat/opensolaris/include/mnttab.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/compat/opensolaris/misc/mnttab.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/pyzfs/pyzfs.py#1 branch
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zdb/zdb.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zfs/zfs.8#4 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/ztest/ztest.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/pyzfs/common/__init__.py#1 branch
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/pyzfs/common/allow.py#1 branch
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/pyzfs/common/dataset.py#1 branch
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/pyzfs/common/groupspace.py#1 branch
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/pyzfs/common/ioctl.c#1 branch
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/pyzfs/common/unallow.py#1 branch
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/pyzfs/common/userspace.py#1 branch
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/pyzfs/common/util.py#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/binutils/bfd/elf64-ppc.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/binutils/ld/lexsup.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/rs6000/freebsd.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/gdb/gdb/ppcfbsd-tdep.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/gdb/gdb/solib-svr4.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/gettytab#3 integrate
.. //depot/projects/soc2009/trasz_limits/gnu/lib/csu/Makefile#3 integrate
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libgcc/Makefile#7 integrate
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/binutils/as/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/binutils/as/powerpc64-freebsd/itbl-cpu.h#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/binutils/as/powerpc64-freebsd/targ-cpu.h#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/binutils/gdb/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/binutils/gdb/Makefile.powerpc64#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/binutils/ld/Makefile.powerpc64#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/binutils/libbfd/Makefile#3 integrate
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/binutils/libbfd/Makefile.powerpc64#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc64#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/cc/Makefile.tgt#3 integrate
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/cc/cc_tools/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/cc/include/Makefile#3 integrate
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/gdb/arch/powerpc64/Makefile#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/gdb/arch/powerpc64/config.h#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/gdb/arch/powerpc64/init.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/gdb/kgdb/trgt_powerpc64.c#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/Makefile#10 integrate
.. //depot/projects/soc2009/trasz_limits/lib/bind/config.mk#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/csu/powerpc64/Makefile#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/csu/powerpc64/crt1.c#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/csu/powerpc64/crti.S#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/csu/powerpc64/crtn.S#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/Makefile#6 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/compat-43/sigcompat.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/_thread_init.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gmon/gmon.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/Makefile.inc#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/SYS.h#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/Symbol.map#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/_fpmath.h#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/arith.h#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gd_qnan.h#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/Makefile.inc#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/_ctx_start.S#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/_set_tp.c#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/_setjmp.S#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/fabs.S#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/flt_rounds.c#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/fpgetmask.c#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/fpgetround.c#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/fpgetsticky.c#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/fpsetmask.c#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/fpsetround.c#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/infinity.c#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/makecontext.c#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/modf.c#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/setjmp.S#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/signalcontext.c#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/sigsetjmp.S#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/syncicache.c#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/softfloat/milieu.h#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/softfloat/powerpc-gcc.h#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/softfloat/softfloat.h#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/sys/Makefile.inc#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/sys/brk.S#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/sys/cerror.S#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/sys/exect.S#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/sys/pipe.S#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/sys/ptrace.S#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/sys/sbrk.S#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/sys/setlogin.S#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/stdlib/malloc.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/sys/ptrace.2#4 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libkvm/kvm_powerpc64.c#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libstand/Makefile#4 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libstand/printf.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libthr/arch/powerpc64/Makefile.inc#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libthr/arch/powerpc64/include/pthread_md.h#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libthr/arch/powerpc64/powerpc64/pthread_md.c#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_sig.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libthread_db/arch/powerpc64/libpthread_md.c#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/msun/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/Makefile#5 integrate
.. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/Symbol.map#2 integrate
.. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/powerpc64/Makefile.inc#1 branch
.. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/powerpc64/reloc.c#1 branch
.. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/powerpc64/rtld_machdep.h#1 branch
.. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/powerpc64/rtld_start.S#1 branch
.. //depot/projects/soc2009/trasz_limits/sbin/iscontrol/iscontrol.8#2 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/kldload/kldload.8#4 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/kldload/kldload.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/opensslconf-powerpc64.h#1 branch
.. //depot/projects/soc2009/trasz_limits/share/mk/bsd.cpu.mk#4 integrate
.. //depot/projects/soc2009/trasz_limits/share/mk/bsd.endian.mk#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/mk/sys.mk#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/acpica/Makefile#2 delete
.. //depot/projects/soc2009/trasz_limits/sys/amd64/acpica/acpi_wakecode.S#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/acpica/genwakecode.sh#2 delete
.. //depot/projects/soc2009/trasz_limits/sys/amd64/acpica/genwakedata.sh#2 delete
.. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/cpu_switch.S#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/pmap.c#17 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/trap.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/include/pmap.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/include/bootinfo.h#3 delete
.. //depot/projects/soc2009/trasz_limits/sys/arm/include/metadata.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/Makefile#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/common/Makefile.inc#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/fdt/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/fdt/dts/mpc8555cds.dts#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/ficl/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/ofw/Makefile.inc#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/ofw/libofw/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/ofw/libofw/libofw.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/ofw/libofw/ppc64_elf_freebsd.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/Makefile.inc#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/boot1.chrp/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/ofw/Makefile#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/ofw/conf.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/ofw/ldscript.powerpc#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/ofw/metadata.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/uboot/Makefile#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/uboot/ldscript.powerpc#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/uboot/Makefile.inc#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/uboot/common/metadata.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/boot/zfs/zfsimpl.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris_uio.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/misc.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/policy.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/sid.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/uio.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/vnode.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/Makefile.powerpc#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/files.amd64#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/files.powerpc#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/ldscript.powerpc64#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/conf/options.powerpc#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ddb/db_command.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/Osd/OsdHardware.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ata/ata-all.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-acerlabs.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-amd.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-highpoint.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-intel.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-ite.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-jmicron.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-marvell.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-nvidia.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-promise.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-siliconimage.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-sis.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-via.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/bwi/if_bwi_pci.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/bwn/if_bwn.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cfi/cfi_bus_fdt.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/dev/cfi/cfi_bus_lbc.c#2 delete
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_ael1002.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_common.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_t3_hw.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/cxgb_adapter.h#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/cxgb_main.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/cxgb_sge.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_em.c#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_igb.c#18 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_lem.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/fdt/fdt_common.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/fdt/fdt_pci.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/fdt/fdt_powerpc.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/dev/fdt/simplebus.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mpt/mpt.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mpt/mpt.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mpt/mpt_pci.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/pci/pcireg.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/quicc/quicc_bfe_fdt.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/dev/quicc/quicc_bfe_ocp.c#2 delete
.. //depot/projects/soc2009/trasz_limits/sys/dev/sec/sec.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/sk/if_sk.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/tsec/if_tsec.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/tsec/if_tsec.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/tsec/if_tsec_fdt.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/dev/tsec/if_tsec_ocp.c#2 delete
.. //depot/projects/soc2009/trasz_limits/sys/dev/twa/tw_cl.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/twa/tw_cl_share.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/uart/uart_bus_ocp.c#2 delete
.. //depot/projects/soc2009/trasz_limits/sys/dev/uart/uart_cpu_powerpc.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uplcom.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usbdevs#23 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_run.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/i386/pmap.c#18 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/include/pmap.h#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exec.c#16 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_tc.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/subr_prf.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/subr_unit.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_mbuf.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_bio.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/cpu.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/cpuregs.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/pte.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/mips/db_interface.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/mips/db_trace.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/mips/pmap.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/modules/acpi/acpi/Makefile#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/modules/zfs/Makefile#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_fw_log.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfs_vnops.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/copyinout.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/locore.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/locore32.S#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/locore64.S#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/machdep.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/mmu_oea.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/mmu_oea64.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/mp_cpudep.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/nexus.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/ofw_machdep.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/platform_chrp.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/slb.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/swtch.S#3 delete
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/swtch32.S#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/swtch64.S#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/trap.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/trap_subr32.S#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/trap_subr64.S#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/vm_machdep.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/booke/locore.S#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/booke/machdep.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/booke/platform_bare.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/booke/pmap.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/booke/swtch.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/booke/vm_machdep.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/conf/DEFAULTS#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/conf/GENERIC#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/conf/MPC85XX#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/conf/NOTES#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/cpufreq/pcr.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/_align.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/_bus.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/_inttypes.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/_limits.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/_stdint.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/_types.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/asm.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/atomic.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/bootinfo.h#2 delete
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/bus.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/cpufunc.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/db_machdep.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/elf.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/fdt.h#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/frame.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/hid.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/md_var.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/metadata.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/ocpbus.h#4 delete
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/param.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/pcb.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/pcpu.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/pmap.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/proc.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/profile.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/psl.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/pte.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/reg.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/runq.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/slb.h#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/smp.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/spr.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/sr.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/trap_aim.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/ucontext.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/vmparam.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/atpic.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/ds1553_bus_fdt.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/ds1553_bus_lbc.c#2 delete
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/i2c.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/lbc.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/lbc.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/mpc85xx.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/mpc85xx.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/nexus.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/ocpbus.c#7 delete
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/ocpbus.h#6 delete
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/openpic_fdt.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/opic.c#5 delete
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/pci_fdt.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/pci_ocp.c#8 delete
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powermac/grackle.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/bcopy.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/bus_machdep.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/cpu.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/db_interface.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/db_trace.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/elf32_machdep.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/elf64_machdep.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/elf_machdep.c#5 delete
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/exec_machdep.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/genassym.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/in_cksum.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/intr_machdep.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/mp_machdep.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/setjmp.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/sigcode.S#2 delete
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/sigcode32.S#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/sigcode64.S#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/stack_machdep.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/syncicache.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/sys_machdep.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sun4v/conf/DEFAULTS#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/cdefs.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/elf_common.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/sysctl.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_page.c#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_page.h#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/x86/isa/atrtc.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/x86/isa/clock.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/x86/x86/timeevents.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/make/str.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/truss/powerpc64-fbsd.c#1 branch
.. //depot/projects/soc2009/trasz_limits/usr.bin/xlint/arch/powerpc64/targparam.h#1 branch
.. //depot/projects/soc2009/trasz_limits/usr.sbin/config/config.8#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/config/configvers.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/config/main.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/config/mkoptions.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/crunch/crunchide/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/crunch/crunchide/exec_elf32.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/fifolog/lib/fifolog_reader.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/mountd/exports.5#4 integrate

Differences ...

==== //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#21 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.237 2010/07/02 02:20:25 marcel Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.238 2010/07/13 04:31:19 imp Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,8 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20100706: removed pc-sysinstall's detect-vmware.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-vmware.sh
 # 20100701: [powerpc] removed <machine/intr.h>
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/machine/intr.h

==== //depot/projects/soc2009/trasz_limits/UPDATING#24 (text+ko) ====

@@ -23,6 +23,13 @@
 	ln -s aj /etc/malloc.conf.)
 
 
+20100713:
+	A new version of ZFS (version 15) has been merged to -HEAD.
+	This version uses a python library for the following subcommands:
+	zfs allow, zfs unallow, zfs groupspace, zfs userspace.
+	For full functionality of these commands the following port must
+	be installed: sysutils/py-zfs
+
 20100429:
 	'vm_page's are now hashed by physical address to an array of mutexes.
 	Currently this is only used to serialize access to hold_count. Over 
@@ -964,6 +971,22 @@
 	path, and has the highest probability of being successful.  Please try
 	this approach before reporting problems with a major version upgrade.
 
+	ZFS notes
+	---------
+	When upgrading the boot ZFS pool to a new version, always follow
+	these two steps:
+
+	1.) recompile and reinstall the ZFS boot loader and boot block
+	(this is part of "make buildworld" and "make installworld")
+
+	2.) update the ZFS boot block on your boot drive
+
+	The following example updates the ZFS boot block on the first
+	partition (freebsd-boot) of a GPT partitioned drive ad0:
+	"gpart bootcode -p /boot/gptzfsboot -i 1 ad0"
+
+	Non-boot pools do not need these updates.
+
 	To build a kernel
 	-----------------
 	If you are updating from a prior version of FreeBSD (even one just
@@ -1141,4 +1164,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.659 2010/05/12 21:20:04 brueffer Exp $
+$FreeBSD: src/UPDATING,v 1.660 2010/07/12 23:49:04 mm Exp $

==== //depot/projects/soc2009/trasz_limits/bin/pkill/pkill.1#6 (text+ko) ====

@@ -1,6 +1,6 @@
 .\"	$NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $
 .\"
-.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.7 2010/06/20 08:48:30 brian Exp $
+.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.8 2010/07/12 01:58:46 brian Exp $
 .\"
 .\" Copyright (c) 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -53,7 +53,7 @@
 .Ar pattern ...
 .Nm pkill
 .Op Fl Ar signal
-.Op Fl ILafinovx
+.Op Fl ILafilnovx
 .Op Fl F Ar pidfile
 .Op Fl G Ar gid
 .Op Fl M Ar core

==== //depot/projects/soc2009/trasz_limits/cddl/compat/opensolaris/include/mnttab.h#2 (text+ko) ====

@@ -1,12 +1,15 @@
-/* $FreeBSD: src/cddl/compat/opensolaris/include/mnttab.h,v 1.4 2008/11/17 20:49:29 pjd Exp $ */
+/* $FreeBSD: src/cddl/compat/opensolaris/include/mnttab.h,v 1.5 2010/07/12 23:49:04 mm Exp $ */
 
 #ifndef	_OPENSOLARIS_MNTTAB_H_
 #define	_OPENSOLARIS_MNTTAB_H_
 
+#include <sys/param.h>
+#include <sys/mount.h>
+
 #include <stdio.h>
 #include <paths.h>
 
-#define	MNTTAB		_PATH_DEVNULL
+#define	MNTTAB		_PATH_DEVZERO
 #define	MNT_LINE_MAX	1024
 
 #define	umount2(p, f)	unmount(p, f)
@@ -17,7 +20,12 @@
 	char	*mnt_fstype;
 	char	*mnt_mntopts;
 };
+#define	extmnttab	mnttab
 
 int getmntany(FILE *fd, struct mnttab *mgetp, struct mnttab *mrefp);
+int getmntent(FILE *fp, struct mnttab *mp);
+char *hasmntopt(struct mnttab *mnt, char *opt);
+
+void statfs2mnttab(struct statfs *sfs, struct mnttab *mp);
 
 #endif	/* !_OPENSOLARIS_MNTTAB_H_ */

==== //depot/projects/soc2009/trasz_limits/cddl/compat/opensolaris/misc/mnttab.c#2 (text+ko) ====

@@ -30,12 +30,15 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/mnttab.c,v 1.3 2008/11/17 20:49:29 pjd Exp $");
+__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/mnttab.c,v 1.4 2010/07/12 23:49:04 mm Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/mntent.h>
 #include <sys/mnttab.h>
+
+#include <ctype.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -88,75 +91,126 @@
 	strlcat(mntopts, opt, size);
 }
 
-int
-getmntany(FILE *fd __unused, struct mnttab *mgetp, struct mnttab *mrefp)
+void
+statfs2mnttab(struct statfs *sfs, struct mnttab *mp)
 {
-	static struct statfs *sfs = NULL;
 	static char mntopts[MNTMAXSTR];
-	struct opt *o;
-	long i, n, flags;
+	long flags;
 
-	if (sfs != NULL) {
-		free(sfs);
-		sfs = NULL;
-	}
 	mntopts[0] = '\0';
 
-	n = getfsstat(NULL, 0, MNT_NOWAIT);
-	if (n == -1)
-		return (-1);
-	n = sizeof(*sfs) * (n + 8);
-	sfs = malloc(n);
-	if (sfs == NULL)
-		return (-1);
-	n = getfsstat(sfs, n, MNT_WAIT);
-	if (n == -1) {
-		free(sfs);
-		sfs = NULL;
-		return (-1);
+	flags = sfs->f_flags;
+#define	OPTADD(opt)	optadd(mntopts, sizeof(mntopts), (opt))
+	if (flags & MNT_RDONLY)
+		OPTADD(MNTOPT_RO);
+	else
+		OPTADD(MNTOPT_RW);
+	if (flags & MNT_NOSUID)
+		OPTADD(MNTOPT_NOSUID);
+	else
+		OPTADD(MNTOPT_SETUID);
+	if (flags & MNT_UPDATE)
+		OPTADD(MNTOPT_REMOUNT);
+	if (flags & MNT_NOATIME)
+		OPTADD(MNTOPT_NOATIME);
+	else
+		OPTADD(MNTOPT_ATIME);
+	OPTADD(MNTOPT_NOXATTR);
+	if (flags & MNT_NOEXEC)
+		OPTADD(MNTOPT_NOEXEC);
+	else
+		OPTADD(MNTOPT_EXEC);
+#undef	OPTADD
+	mp->mnt_special = sfs->f_mntfromname;
+	mp->mnt_mountp = sfs->f_mntonname;
+	mp->mnt_fstype = sfs->f_fstypename;
+	mp->mnt_mntopts = mntopts;
+}
+
+static struct statfs *gsfs = NULL;
+static int allfs = 0;
+
+static int
+statfs_init(void)
+{
+	struct statfs *sfs;
+	int error;
+
+	if (gsfs != NULL) {
+		free(gsfs);
+		gsfs = NULL;
 	}
-	for (i = 0; i < n; i++) {
+	allfs = getfsstat(NULL, 0, MNT_WAIT);
+	if (allfs == -1)
+		goto fail;
+	gsfs = malloc(sizeof(gsfs[0]) * allfs * 2);
+	if (gsfs == NULL)
+		goto fail;
+	allfs = getfsstat(gsfs, (long)(sizeof(gsfs[0]) * allfs * 2),
+	    MNT_WAIT);
+	if (allfs == -1)
+		goto fail;
+	sfs = realloc(gsfs, allfs * sizeof(gsfs[0]));
+	if (sfs != NULL)
+		gsfs = sfs;
+	return (0);
+fail:
+	error = errno;
+	if (gsfs != NULL)
+		free(gsfs);
+	gsfs = NULL;
+	allfs = 0;
+	return (error);
+}
+
+int
+getmntany(FILE *fd __unused, struct mnttab *mgetp, struct mnttab *mrefp)
+{
+	struct statfs *sfs;
+	int i, error;
+
+	error = statfs_init();
+	if (error != 0)
+		return (error);
+
+	for (i = 0; i < allfs; i++) {
 		if (mrefp->mnt_special != NULL &&
-		    strcmp(mrefp->mnt_special, sfs[i].f_mntfromname) != 0) {
+		    strcmp(mrefp->mnt_special, gsfs[i].f_mntfromname) != 0) {
 			continue;
 		}
 		if (mrefp->mnt_mountp != NULL &&
-		    strcmp(mrefp->mnt_mountp, sfs[i].f_mntonname) != 0) {
+		    strcmp(mrefp->mnt_mountp, gsfs[i].f_mntonname) != 0) {
 			continue;
 		}
 		if (mrefp->mnt_fstype != NULL &&
-		    strcmp(mrefp->mnt_fstype, sfs[i].f_fstypename) != 0) {
+		    strcmp(mrefp->mnt_fstype, gsfs[i].f_fstypename) != 0) {
 			continue;
 		}
-		flags = sfs[i].f_flags;
-#define	OPTADD(opt)	optadd(mntopts, sizeof(mntopts), (opt))
-		if (flags & MNT_RDONLY)
-			OPTADD(MNTOPT_RO);
-		else
-			OPTADD(MNTOPT_RW);
-		if (flags & MNT_NOSUID)
-			OPTADD(MNTOPT_NOSUID);
-		else
-			OPTADD(MNTOPT_SETUID);
-		if (flags & MNT_UPDATE)
-			OPTADD(MNTOPT_REMOUNT);
-		if (flags & MNT_NOATIME)
-			OPTADD(MNTOPT_NOATIME);
-		else
-			OPTADD(MNTOPT_ATIME);
-		OPTADD(MNTOPT_NOXATTR);
-		if (flags & MNT_NOEXEC)
-			OPTADD(MNTOPT_NOEXEC);
-		else
-			OPTADD(MNTOPT_EXEC);
-#undef	OPTADD
-		mgetp->mnt_special = sfs[i].f_mntfromname;
-		mgetp->mnt_mountp = sfs[i].f_mntonname;
-		mgetp->mnt_fstype = sfs[i].f_fstypename;
-		mgetp->mnt_mntopts = mntopts;
+		statfs2mnttab(&gsfs[i], mgetp);
 		return (0);
 	}
-	free(sfs);
-	sfs = NULL;
 	return (-1);
 }
+
+int
+getmntent(FILE *fp, struct mnttab *mp)
+{
+	struct statfs *sfs;
+	int error, nfs;
+
+	nfs = (int)lseek(fileno(fp), 0, SEEK_CUR);
+	if (nfs == -1)
+		return (errno);
+	/* If nfs is 0, we want to refresh out cache. */
+	if (nfs == 0 || gsfs == NULL) {
+		error = statfs_init();
+		if (error != 0)
+			return (error);
+	}
+	if (nfs >= allfs)
+		return (-1);
+	statfs2mnttab(&gsfs[nfs], mp);
+	if (lseek(fileno(fp), 1, SEEK_CUR) == -1)
+		return (errno);
+	return (0);
+}

==== //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zdb/zdb.8#2 (text+ko) ====

@@ -1,23 +1,8 @@
 '\" te
-.\" CDDL HEADER START
-.\"
-.\" The contents of this file are subject to the terms of the
-.\" Common Development and Distribution License (the "License").  
-.\" You may not use this file except in compliance with the License.
-.\"
-.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-.\" or http://www.opensolaris.org/os/licensing.
-.\" See the License for the specific language governing permissions
-.\" and limitations under the License.
-.\"
-.\" When distributing Covered Code, include this CDDL HEADER in each
-.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-.\" If applicable, add the following below this CDDL HEADER, with the
-.\" fields enclosed by brackets "[]" replaced with your own identifying
-.\" information: Portions Copyright [yyyy] [name of copyright owner]
-.\"
-.\" CDDL HEADER END
 .\" Copyright (c) 2004, Sun Microsystems, Inc. All Rights Reserved.
+.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
+.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
+.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
 .TH zdb 1M "31 Oct 2005" "SunOS 5.11" "System Administration Commands"
 .SH NAME
 zdb \- ZFS debugger

==== //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zdb/zdb.c#4 (text+ko) ====

@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -87,8 +87,8 @@
 usage(void)
 {
 	(void) fprintf(stderr,
-	    "Usage: %s [-udibcsv] [-U cachefile_path] "
-	    "[-S user:cksumalg] "
+	    "Usage: %s [-udibcsvL] [-U cachefile_path] [-t txg]\n"
+	    "\t   [-S user:cksumalg] "
 	    "dataset [object...]\n"
 	    "       %s -C [pool]\n"
 	    "       %s -l dev\n"
@@ -102,12 +102,16 @@
 	(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, "	-c checksum all data blocks\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, "        -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 "
 	    "cachefile\n");
 	(void) fprintf(stderr, "        -R read and display block from a "
@@ -115,12 +119,19 @@
 	(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 "
+	    "searching for uberblocks\n");
 	(void) fprintf(stderr, "Specify an option more than once (e.g. -bb) "
 	    "to make only that option verbose\n");
 	(void) fprintf(stderr, "Default is to dump everything non-verbosely\n");
 	exit(1);
 }
 
+/*
+ * Called for usage errors that are discovered after a call to spa_open(),
+ * dmu_bonus_hold(), or pool_match().  abort() is called for other errors.
+ */
+
 static void
 fatal(const char *fmt, ...)
 {
@@ -132,7 +143,7 @@
 	va_end(ap);
 	(void) fprintf(stderr, "\n");
 
-	abort();
+	exit(1);
 }
 
 static void
@@ -205,7 +216,7 @@
 	size_t nvsize = *(uint64_t *)data;
 	char *packed = umem_alloc(nvsize, UMEM_NOFAIL);
 
-	VERIFY(0 == dmu_read(os, object, 0, nvsize, packed));
+	VERIFY(0 == dmu_read(os, object, 0, nvsize, packed, DMU_READ_PREFETCH));
 
 	VERIFY(nvlist_unpack(packed, nvsize, &nv, 0) == 0);
 
@@ -431,7 +442,7 @@
 	alloc = 0;
 	for (offset = 0; offset < smo->smo_objsize; offset += sizeof (entry)) {
 		VERIFY(0 == dmu_read(os, smo->smo_object, offset,
-		    sizeof (entry), &entry));
+		    sizeof (entry), &entry, DMU_READ_PREFETCH));
 		if (SM_DEBUG_DECODE(entry)) {
 			(void) printf("\t\t[%4llu] %s: txg %llu, pass %llu\n",
 			    (u_longlong_t)(offset / sizeof (entry)),
@@ -463,6 +474,21 @@
 }
 
 static void
+dump_metaslab_stats(metaslab_t *msp)
+{
+	char maxbuf[5];
+	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);
+
+	(void) printf("\t %20s %10lu   %7s  %6s   %4s %4d%%\n",
+	    "segments", avl_numnodes(t), "maxsize", maxbuf,
+	    "freepct", free_pct);
+}
+
+static void
 dump_metaslab(metaslab_t *msp)
 {
 	char freebuf[5];
@@ -472,22 +498,28 @@
 
 	nicenum(msp->ms_map.sm_size - smo->smo_alloc, freebuf);
 
-	if (dump_opt['d'] <= 5) {
-		(void) printf("\t%10llx   %10llu   %5s\n",
-		    (u_longlong_t)msp->ms_map.sm_start,
-		    (u_longlong_t)smo->smo_object,
-		    freebuf);
-		return;
-	}
-
 	(void) printf(
-	    "\tvdev %llu   offset %08llx   spacemap %4llu   free %5s\n",
+	    "\tvdev %5llu   offset %12llx   spacemap %6llu   free    %5s\n",
 	    (u_longlong_t)vd->vdev_id, (u_longlong_t)msp->ms_map.sm_start,
 	    (u_longlong_t)smo->smo_object, freebuf);
 
-	ASSERT(msp->ms_map.sm_size == (1ULL << vd->vdev_ms_shift));
+	if (dump_opt['m'] > 1) {
+		mutex_enter(&msp->ms_lock);
+		VERIFY(space_map_load(&msp->ms_map, zfs_metaslab_ops,
+		    SM_FREE, &msp->ms_smo, spa->spa_meta_objset) == 0);
+		dump_metaslab_stats(msp);
+		space_map_unload(&msp->ms_map);
+		mutex_exit(&msp->ms_lock);
+	}
+
+	if (dump_opt['d'] > 5 || dump_opt['m'] > 2) {
+		ASSERT(msp->ms_map.sm_size == (1ULL << vd->vdev_ms_shift));
+
+		mutex_enter(&msp->ms_lock);
+		dump_spacemap(spa->spa_meta_objset, smo, &msp->ms_map);
+		mutex_exit(&msp->ms_lock);
+	}
 
-	dump_spacemap(spa->spa_meta_objset, smo, &msp->ms_map);
 }
 
 static void
@@ -502,14 +534,12 @@
 	for (c = 0; c < rvd->vdev_children; c++) {
 		vd = rvd->vdev_child[c];
 
-		(void) printf("\n    vdev %llu\n\n", (u_longlong_t)vd->vdev_id);
+		(void) printf("\t%-10s   %-19s   %-15s   %-10s\n",
+		    "vdev", "offset", "spacemap", "free");
+		(void) printf("\t%10s   %19s   %15s   %10s\n",
+		    "----------", "-------------------",
+		    "---------------", "-------------");
 
-		if (dump_opt['d'] <= 5) {
-			(void) printf("\t%10s   %10s   %5s\n",
-			    "offset", "spacemap", "free");
-			(void) printf("\t%10s   %10s   %5s\n",
-			    "------", "--------", "----");
-		}
 		for (m = 0; m < vd->vdev_ms_count; m++)
 			dump_metaslab(vd->vdev_ms[m]);
 		(void) printf("\n");
@@ -517,44 +547,52 @@
 }
 
 static void
+dump_dtl_seg(space_map_t *sm, uint64_t start, uint64_t size)
+{
+	char *prefix = (void *)sm;
+
+	(void) printf("%s [%llu,%llu) length %llu\n",
+	    prefix,
+	    (u_longlong_t)start,
+	    (u_longlong_t)(start + size),
+	    (u_longlong_t)(size));
+}
+
+static void
 dump_dtl(vdev_t *vd, int indent)
 {
-	avl_tree_t *t = &vd->vdev_dtl_map.sm_root;
-	space_seg_t *ss;
-	vdev_t *pvd;
-	int c;
+	spa_t *spa = vd->vdev_spa;
+	boolean_t required;
+	char *name[DTL_TYPES] = { "missing", "partial", "scrub", "outage" };

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list