From owner-p4-projects@FreeBSD.ORG Mon May 17 17:16:36 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7158E106567F; Mon, 17 May 2010 17:16:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3415E106567C for ; Mon, 17 May 2010 17:16:36 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1FE9F8FC1E for ; Mon, 17 May 2010 17:16:36 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4HHGaNA057691 for ; Mon, 17 May 2010 17:16:36 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4HHGZnd057678 for perforce@freebsd.org; Mon, 17 May 2010 17:16:35 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 17 May 2010 17:16:35 GMT Message-Id: <201005171716.o4HHGZnd057678@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178396 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 17:16:36 -0000 http://p4web.freebsd.org/@@178396?ac=10 Change 178396 by gcooper@gcooper-bayonetta on 2010/05/17 17:16:28 IFC Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ObsoleteFiles.inc#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/UPDATING#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/expand.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/cmd/ztest/ztest.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/ipfilter/man/ipmon.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/csh.login#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/defaults/rc.conf#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/devd.conf#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/mtree/BSD.include.dist#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/network.subr#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/periodic/daily/310.accounting#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/periodic/daily/440.status-mailq#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/periodic/weekly/330.catman#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/profile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/bluetooth#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/bridge#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/cleanvar#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/defaultroute#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/geli#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/geli2#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/ipfw#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/mdconfig#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/mdconfig2#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/nscd#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/rfcomm_pppd_server#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/stf#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/syscons#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/ubthidhci#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.firewall#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.initdiskless#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/regdomain.xml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/services#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/lib/libgcc/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/lib/libstdc++/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/lib/libsupc++/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/cc/Makefile.inc#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/cc/cc_tools/freebsd-native.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/cc/include/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libarchive/Makefile#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libarchive/cpio.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/gen/fmtcheck.3#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/gen/glob.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/locale/isblank.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/posix1e/acl_branding.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/posix1e/acl_perm.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/stdio/fgets.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/stdio/fopen.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/stdio/printf.3#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/stdio/tmpnam.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/stdio/wprintf.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/stdlib/realpath.3#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/stdlib/strtod.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/string/strcat.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/string/strcpy.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/sys/access.2#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/sys/execve.2#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/sys/ioctl.2#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/sys/setuid.2#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libelf/elf.3#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/liblzma/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/liblzma/Symbol.map#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/liblzma/Versions.def#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpmc/pmc.mips.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpmc/pmc.xscale.3#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libusb/libusb.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libusb/libusb10.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libusb/libusb10_desc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libusb/libusb10_io.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libusb/libusb20_compat01.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libusbhid/data.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libusbhid/usbhid.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/msun/man/fenv.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/msun/man/hypot.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsirand/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsirand/fsirand.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsirand/fsirand.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/geom/class/part/geom_part.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/hastctl/hastctl.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/hastd/hast.conf.5#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/hastd/hastd.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/kldstat/kldstat.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/mksnap_ffs/mksnap_ffs.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/mount/mount.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/mount_msdosfs/mount_msdosfs.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/mount_ntfs/mount_ntfs.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/mount_reiserfs/mount_reiserfs.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/mount_std/mount_std.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/rcorder/rcorder.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/restore/symtab.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man3/fpgetround.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ae.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ahb.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/amdtemp.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ataraid.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/cmx.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/cpuctl.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ed.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ef.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/em.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/en.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/fpa.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/fxp.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/geom_fox.4#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/harp.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/hatm.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/hifn.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/hwpmc.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/igb.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/inet.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/kbdmux.4#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ksyms.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.i386/cs.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.i386/ie.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.i386/mse.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.i386/pnp.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.i386/pnpbios.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.i386/vx.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.i386/wl.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.powerpc/snd_ai2s.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.powerpc/snd_davbus.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.sparc64/clkbrd.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.sparc64/creator.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.sparc64/machfb.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.sparc64/ofw_console.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.sparc64/openfirm.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.sparc64/openprom.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/mfi.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/mpt.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/natm.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/nve.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/patm.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/psm.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/run.4#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/splash.4#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/syscons.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/twa.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ucom.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/uhso.4#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/vkbd.4#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/wpi.4#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man5/boot.config.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man5/fdescfs.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man5/linsysfs.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man5/make.conf.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man5/reiserfs.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man5/xfs.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/fail.9#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/mbpool.9#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/namei.9#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/uio.9#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/misc/mdoc.template#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/arm/include/disassem.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/arm/include/md_var.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/boot/zfs/zfsimpl.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/files#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/files.powerpc#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/options#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/run/rt2870.fw.uu#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ddb/db_output.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ddb/ddb.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ata/chipsets/ata-serverworks.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/bwn/if_bwn.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/if_em.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/if_igb.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/if_lem.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ixgbe/ixgbe.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/ofw_if.m#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/ofw_standard.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/pci/pci.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/controller/ehci.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/input/ums.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/net/uhso.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/quirk/usb_quirk.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/serial/u3g.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/serial/uftdi.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usb_dev.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usb_device.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usb_device.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usb_generic.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usb_hid.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usb_hub.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usb_request.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usbhid.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/wlan/if_run.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/wlan/if_runreg.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/wlan/if_runvar.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/geom/multipath/g_multipath.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/geom/part/g_part_apm.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/geode.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/xen/pmap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/sched_ule.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_smp.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_witness.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/vfs_default.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/vnode_if.src#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/adm5120/if_admsw.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/conf/XLR#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/locore.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/param.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/smp.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/cpu.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/machdep.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/mp_machdep.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/mpboot.S#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/pmap.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/dev/xlr/rge.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/files.xlr#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/interrupt.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/intr_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/iodi.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/on_chip.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/pic.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/xlr_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/xlr_pci.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/xlrconfig.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/Makefile#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/cas/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/mvs/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net/flowtable.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net/flowtable.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net/vnet.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_bsd_addr.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_constants.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctputil.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/mmu_oea64.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/ofw_machdep.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/booke/pmap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/cpufreq/pcr.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/include/intr_machdep.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/ofw/ofw_pcibus.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/ofw/ofw_real.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/ata_kauai.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/cpcht.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/cpchtvar.h#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/smu.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/uninorth.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/uninorthpci.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/uninorthvar.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/pci/schizo.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/pci/schizoreg.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/pci/schizovar.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sun4v/sun4v/pmap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/eventhandler.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/lock.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/vnode.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_object.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_page.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_page.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/expansion/pathname1.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/expansion/pathname2.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/tools/vimage/vimage.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/ar/Makefile#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/ar/acpyacc.y#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/ar/ar.1#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/ar/ar.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/ar/ar.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/ar/read.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/ar/write.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/bsdiff/bsdiff/bsdiff.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/bsdiff/bspatch/bspatch.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/calendar/calendars/calendar.history#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/chpass/chpass.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/killall/killall.1#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/make/make.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/setchannel/setchannel.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/tar/bsdtar.1#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/wc/wc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/wtmpcvt/wtmpcvt.1#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/adduser/adduser.conf.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/apmd/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/apmd/apmd.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/apmd/apmd.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/apmd/apmd.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/apmd/apmdlex.l#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/apmd/contrib/pccardq.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/bluetooth/bthidd/bthidd.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/bluetooth/btpand/btpand.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/cpucontrol/cpucontrol.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/cron/crontab/crontab.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/crunch/crunchgen/crunchgen.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/daemon/daemon.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/extattr/rmextattr.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/fifolog/lib/fifolog_reader.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/mergemaster/mergemaster.sh#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/mount_portalfs/mount_portalfs.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/moused/moused.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/mptutil/mptutil.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/mtree/mtree.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/mtree/mtree.8#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/newsyslog/newsyslog.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/updating/pkg_updating.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/rtadvd/rtadvd.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/rtprio/rtprio.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/rtsold/rtsold.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sa/sa.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/uathload/uathload.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#3 integrate Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ObsoleteFiles.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.234 2010/04/17 01:17:31 jmallett Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.236 2010/05/14 20:40:37 delphij 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,29 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100514: library version bump for versioned symbols for liblzma +OLD_LIBS+=usr/lib/liblzma.so.0 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/liblzma.so.0 +.endif +# 20100511: move GCC-specific headers to /usr/include/gcc +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/include/emmintrin.h +OLD_FILES+=usr/include/mm_malloc.h +OLD_FILES+=usr/include/pmmintrin.h +OLD_FILES+=usr/include/xmmintrin.h +.endif +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "arm" +OLD_FILES+=usr/include/mmintrin.h +.endif +.if ${TARGET_ARCH} == "ia64" +OLD_FILES+=usr/include/ia64intrin.h +.endif +.if ${TARGET_ARCH} == "powerpc" +OLD_FILES+=usr/include/altivec.h +OLD_FILES+=usr/include/ppc-asm.h +OLD_FILES+=usr/include/spe.h +.endif # 20100416: [mips] removed .if ${TARGET_ARCH} == "mips" OLD_FILES+=usr/include/machine/psl.h ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/UPDATING#4 (text+ko) ==== @@ -83,6 +83,9 @@ The meanings correspond to the relevant IPv4 variables. +20091125: + 8.0-RELEASE. + 20091113: The default terminal emulation for syscons(4) has been changed from cons25 to xterm on all platforms except pc98. This means @@ -1138,4 +1141,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.658 2010/04/30 00:46:43 kmacy Exp $ +$FreeBSD: src/UPDATING,v 1.659 2010/05/12 21:20:04 brueffer Exp $ ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/setfacl/setfacl.1#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.21 2010/03/07 07:59:05 joel Exp $ +.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.22 2010/05/13 16:46:23 trasz Exp $ .\" -.Dd September 5, 2009 +.Dd May 13, 2010 .Dt SETFACL 1 .Os .Sh NAME @@ -453,8 +453,13 @@ .Tn TrustedBSD Project and introduced in .Fx 5.0 . +NFSv4 ACL support was introduced in +.Fx 8.1 . .Sh AUTHORS +.An -nosplit The .Nm utility was written by .An Chris D. Faulhaber Aq jedgar@fxp.org . +NFSv4 ACL support was implemented by +.An Edward Tomasz Napierala Aq trasz@FreeBSD.org . ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/expand.c#4 (text+ko) ==== @@ -1,6 +1,8 @@ /*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. + * Copyright (c) 1997-2005 + * Herbert Xu . All rights reserved. * * This code is derived from software contributed to Berkeley by * Kenneth Almquist. @@ -36,7 +38,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.63 2010/04/25 20:43:19 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.64 2010/05/11 23:19:28 jilles Exp $"); #include #include @@ -1150,10 +1152,11 @@ struct dirent *dp; int atend; int matchdot; + int esc; metaflag = 0; start = name; - for (p = name ; ; p++) { + for (p = name; esc = 0, *p; p += esc + 1) { if (*p == '*' || *p == '?') metaflag = 1; else if (*p == '[') { @@ -1178,12 +1181,14 @@ break; else if (*p == CTLQUOTEMARK) continue; - else if (*p == CTLESC) - p++; - if (*p == '/') { - if (metaflag) - break; - start = p + 1; + else { + if (*p == CTLESC) + esc++; + if (p[esc] == '/') { + if (metaflag) + break; + start = p + esc + 1; + } } } if (metaflag == 0) { /* we've reached the end of the file name */ @@ -1229,7 +1234,8 @@ atend = 1; } else { atend = 0; - *endname++ = '\0'; + *endname = '\0'; + endname += esc + 1; } matchdot = 0; p = start; @@ -1257,7 +1263,7 @@ } closedir(dirp); if (! atend) - endname[-1] = '/'; + endname[-esc - 1] = esc ? CTLESC : '/'; } ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 (text+ko) ==== @@ -50,6 +50,7 @@ #include #include #include +#include #undef ZFS_MAXNAMELEN #undef verify #include @@ -62,8 +63,6 @@ extern void dump_intent_log(zilog_t *); uint64_t *zopt_object = NULL; int zopt_objects = 0; -int zdb_advance = ADVANCE_PRE; -zbookmark_t zdb_noread = { 0, 0, ZB_NO_LEVEL, 0 }; libzfs_handle_t *g_zfs; boolean_t zdb_sig_user_data = B_TRUE; int zdb_sig_cksumalg = ZIO_CHECKSUM_SHA256; @@ -88,8 +87,8 @@ usage(void) { (void) fprintf(stderr, - "Usage: %s [-udibcsvL] [-U cachefile_path] [-O order] " - "[-B os:obj:level:blkid] [-S user:cksumalg] " + "Usage: %s [-udibcsv] [-U cachefile_path] " + "[-S user:cksumalg] " "dataset [object...]\n" " %s -C [pool]\n" " %s -l dev\n" @@ -109,13 +108,8 @@ "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 live pool (allows some errors)\n"); - (void) fprintf(stderr, " -O [!] " - "visitation order\n"); (void) fprintf(stderr, " -U cachefile_path -- use alternate " "cachefile\n"); - (void) fprintf(stderr, " -B objset:object:level:blkid -- " - "simulate bad block\n"); (void) fprintf(stderr, " -R read and display block from a " "device\n"); (void) fprintf(stderr, " -e Pool is exported/destroyed/" @@ -138,7 +132,7 @@ va_end(ap); (void) fprintf(stderr, "\n"); - exit(1); + abort(); } static void @@ -571,7 +565,7 @@ } static uint64_t -blkid2offset(dnode_phys_t *dnp, int level, uint64_t blkid) +blkid2offset(const dnode_phys_t *dnp, int level, uint64_t blkid) { if (level < 0) return (blkid); @@ -602,115 +596,104 @@ (u_longlong_t)bp->blk_birth); } -/* ARGSUSED */ -static int -zdb_indirect_cb(traverse_blk_cache_t *bc, spa_t *spa, void *a) +static void +print_indirect(blkptr_t *bp, const zbookmark_t *zb, + const dnode_phys_t *dnp) { - zbookmark_t *zb = &bc->bc_bookmark; - blkptr_t *bp = &bc->bc_blkptr; - void *data = bc->bc_data; - dnode_phys_t *dnp = bc->bc_dnode; - char blkbuf[BP_SPRINTF_LEN + 80]; + char blkbuf[BP_SPRINTF_LEN]; int l; - if (bc->bc_errno) { - (void) sprintf(blkbuf, - "Error %d reading <%llu, %llu, %lld, %llu>: ", - bc->bc_errno, - (u_longlong_t)zb->zb_objset, - (u_longlong_t)zb->zb_object, - (u_longlong_t)zb->zb_level, - (u_longlong_t)zb->zb_blkid); - goto out; - } + ASSERT3U(BP_GET_TYPE(bp), ==, dnp->dn_type); + ASSERT3U(BP_GET_LEVEL(bp), ==, zb->zb_level); - if (zb->zb_level == -1) { - ASSERT3U(BP_GET_TYPE(bp), ==, DMU_OT_OBJSET); - ASSERT3U(BP_GET_LEVEL(bp), ==, 0); - } else { - ASSERT3U(BP_GET_TYPE(bp), ==, dnp->dn_type); - ASSERT3U(BP_GET_LEVEL(bp), ==, zb->zb_level); - } + (void) printf("%16llx ", + (u_longlong_t)blkid2offset(dnp, zb->zb_level, zb->zb_blkid)); - if (zb->zb_level > 0) { - uint64_t fill = 0; - blkptr_t *bpx, *bpend; + ASSERT(zb->zb_level >= 0); - for (bpx = data, bpend = bpx + BP_GET_LSIZE(bp) / sizeof (*bpx); - bpx < bpend; bpx++) { - if (bpx->blk_birth != 0) { - fill += bpx->blk_fill; - } else { - ASSERT(bpx->blk_fill == 0); - } + for (l = dnp->dn_nlevels - 1; l >= -1; l--) { + if (l == zb->zb_level) { + (void) printf("L%llx", (u_longlong_t)zb->zb_level); + } else { + (void) printf(" "); } - ASSERT3U(fill, ==, bp->blk_fill); } - if (zb->zb_level == 0 && dnp->dn_type == DMU_OT_DNODE) { + sprintf_blkptr_compact(blkbuf, bp, dump_opt['d'] > 5 ? 1 : 0); + (void) printf("%s\n", blkbuf); +} + +#define SET_BOOKMARK(zb, objset, object, level, blkid) \ +{ \ + (zb)->zb_objset = objset; \ + (zb)->zb_object = object; \ + (zb)->zb_level = level; \ + (zb)->zb_blkid = blkid; \ +} + +static int +visit_indirect(spa_t *spa, const dnode_phys_t *dnp, + blkptr_t *bp, const zbookmark_t *zb) +{ + int err; + + if (bp->blk_birth == 0) + return (0); + + print_indirect(bp, zb, dnp); + + if (BP_GET_LEVEL(bp) > 0) { + uint32_t flags = ARC_WAIT; + int i; + blkptr_t *cbp; + int epb = BP_GET_LSIZE(bp) >> SPA_BLKPTRSHIFT; + arc_buf_t *buf; uint64_t fill = 0; - dnode_phys_t *dnx, *dnend; - for (dnx = data, dnend = dnx + (BP_GET_LSIZE(bp)>>DNODE_SHIFT); - dnx < dnend; dnx++) { - if (dnx->dn_type != DMU_OT_NONE) - fill++; - } - ASSERT3U(fill, ==, bp->blk_fill); - } + err = arc_read_nolock(NULL, spa, bp, arc_getbuf_func, &buf, + ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, zb); + if (err) + return (err); - (void) sprintf(blkbuf, "%16llx ", - (u_longlong_t)blkid2offset(dnp, zb->zb_level, zb->zb_blkid)); + /* recursively visit blocks below this */ + cbp = buf->b_data; + for (i = 0; i < epb; i++, cbp++) { + zbookmark_t czb; - ASSERT(zb->zb_level >= 0); - - for (l = dnp->dn_nlevels - 1; l >= -1; l--) { - if (l == zb->zb_level) { - (void) sprintf(blkbuf + strlen(blkbuf), "L%llx", - (u_longlong_t)zb->zb_level); - } else { - (void) sprintf(blkbuf + strlen(blkbuf), " "); + SET_BOOKMARK(&czb, zb->zb_objset, zb->zb_object, + zb->zb_level - 1, + zb->zb_blkid * epb + i); + err = visit_indirect(spa, dnp, cbp, &czb); + if (err) + break; + fill += cbp->blk_fill; } + ASSERT3U(fill, ==, bp->blk_fill); + (void) arc_buf_remove_ref(buf, &buf); } -out: - if (bp->blk_birth == 0) { - (void) sprintf(blkbuf + strlen(blkbuf), ""); - (void) printf("%s\n", blkbuf); - } else { - sprintf_blkptr_compact(blkbuf + strlen(blkbuf), bp, - dump_opt['d'] > 5 ? 1 : 0); - (void) printf("%s\n", blkbuf); - } - - return (bc->bc_errno ? ERESTART : 0); + return (err); } /*ARGSUSED*/ static void -dump_indirect(objset_t *os, uint64_t object, void *data, size_t size) +dump_indirect(dnode_t *dn) { - traverse_handle_t *th; - uint64_t objset = dmu_objset_id(os); - int advance = zdb_advance; + dnode_phys_t *dnp = dn->dn_phys; + int j; + zbookmark_t czb; (void) printf("Indirect blocks:\n"); - if (object == 0) - advance |= ADVANCE_DATA; - - th = traverse_init(dmu_objset_spa(os), zdb_indirect_cb, NULL, advance, - ZIO_FLAG_CANFAIL); - th->th_noread = zdb_noread; - - traverse_add_dnode(th, 0, -1ULL, objset, object); - - while (traverse_more(th) == EAGAIN) - continue; + SET_BOOKMARK(&czb, dmu_objset_id(&dn->dn_objset->os), + dn->dn_object, dnp->dn_nlevels - 1, 0); + for (j = 0; j < dnp->dn_nblkptr; j++) { + czb.zb_blkid = j; + (void) visit_indirect(dmu_objset_spa(&dn->dn_objset->os), dnp, + &dnp->dn_blkptr[j], &czb); + } (void) printf("\n"); - - traverse_fini(th); } /*ARGSUSED*/ @@ -1093,7 +1076,7 @@ } if (verbosity >= 5) - dump_indirect(os, object, NULL, 0); + dump_indirect(dn); if (verbosity >= 5) { /* @@ -1458,18 +1441,17 @@ #define DMU_OT_DEFERRED DMU_OT_NONE #define DMU_OT_TOTAL DMU_OT_NUMTYPES -#define ZB_TOTAL ZB_MAXLEVEL +#define ZB_TOTAL DN_MAX_LEVELS typedef struct zdb_cb { zdb_blkstats_t zcb_type[ZB_TOTAL + 1][DMU_OT_TOTAL + 1]; uint64_t zcb_errors[256]; - traverse_blk_cache_t *zcb_cache; int zcb_readfails; int zcb_haderrors; } zdb_cb_t; static void -zdb_count_block(spa_t *spa, zdb_cb_t *zcb, blkptr_t *bp, int type) +zdb_count_block(spa_t *spa, zdb_cb_t *zcb, blkptr_t *bp, dmu_object_type_t type) { for (int i = 0; i < 4; i++) { int l = (i < 2) ? BP_GET_LEVEL(bp) : ZB_TOTAL; @@ -1485,7 +1467,7 @@ if (dump_opt['S']) { boolean_t print_sig; - print_sig = !zdb_sig_user_data || (BP_GET_LEVEL(bp) == 0 && + print_sig = !zdb_sig_user_data || (BP_GET_LEVEL(bp) == 0 && BP_GET_TYPE(bp) == DMU_OT_PLAIN_FILE_CONTENTS); if (BP_GET_CHECKSUM(bp) < zdb_sig_cksumalg) @@ -1507,56 +1489,55 @@ } } - if (!dump_opt['L']) - VERIFY(zio_wait(zio_claim(NULL, spa, spa_first_txg(spa), bp, - NULL, NULL, ZIO_FLAG_MUSTSUCCEED)) == 0); + VERIFY(zio_wait(zio_claim(NULL, spa, spa_first_txg(spa), bp, + NULL, NULL, ZIO_FLAG_MUSTSUCCEED)) == 0); } static int -zdb_blkptr_cb(traverse_blk_cache_t *bc, spa_t *spa, void *arg) +zdb_blkptr_cb(spa_t *spa, blkptr_t *bp, const zbookmark_t *zb, + const dnode_phys_t *dnp, void *arg) { - zbookmark_t *zb = &bc->bc_bookmark; zdb_cb_t *zcb = arg; - blkptr_t *bp = &bc->bc_blkptr; - dmu_object_type_t type = BP_GET_TYPE(bp); char blkbuf[BP_SPRINTF_LEN]; - int error = 0; + + if (bp == NULL) + return (0); + + zdb_count_block(spa, zcb, bp, BP_GET_TYPE(bp)); - ASSERT(!BP_IS_HOLE(bp)); + if (dump_opt['c'] || dump_opt['S']) { + int ioerr, size; + void *data; - zdb_count_block(spa, zcb, bp, type); + size = BP_GET_LSIZE(bp); + data = malloc(size); + ioerr = zio_wait(zio_read(NULL, spa, bp, data, size, + NULL, NULL, ZIO_PRIORITY_ASYNC_READ, + ZIO_FLAG_CANFAIL | ZIO_FLAG_SCRUB, zb)); + free(data); - if (bc->bc_errno) { - if (zcb->zcb_readfails++ < 10 && dump_opt['L']) { - uberblock_t ub; - vdev_uberblock_load(NULL, spa->spa_root_vdev, &ub); - if (ub.ub_txg != 0) - spa->spa_ubsync = ub; - error = EAGAIN; - } else { + /* We expect io errors on intent log */ + if (ioerr && BP_GET_TYPE(bp) != DMU_OT_INTENT_LOG) { zcb->zcb_haderrors = 1; - zcb->zcb_errors[bc->bc_errno]++; - error = ERESTART; - } + zcb->zcb_errors[ioerr]++; - if (dump_opt['b'] >= 3 || (dump_opt['b'] >= 2 && bc->bc_errno)) - sprintf_blkptr(blkbuf, BP_SPRINTF_LEN, bp); - else - blkbuf[0] = '\0'; + if (dump_opt['b'] >= 2) + sprintf_blkptr(blkbuf, BP_SPRINTF_LEN, bp); + else + blkbuf[0] = '\0'; - if (!dump_opt['S']) { - (void) printf("zdb_blkptr_cb: Got error %d reading " - "<%llu, %llu, %lld, %llx> %s -- %s\n", - bc->bc_errno, - (u_longlong_t)zb->zb_objset, - (u_longlong_t)zb->zb_object, - (u_longlong_t)zb->zb_level, - (u_longlong_t)zb->zb_blkid, - blkbuf, - error == EAGAIN ? "retrying" : "skipping"); + if (!dump_opt['S']) { + (void) printf("zdb_blkptr_cb: " + "Got error %d reading " + "<%llu, %llu, %lld, %llx> %s -- skipping\n", + ioerr, + (u_longlong_t)zb->zb_objset, + (u_longlong_t)zb->zb_object, + (u_longlong_t)zb->zb_level, + (u_longlong_t)zb->zb_blkid, + blkbuf); + } } - - return (error); } zcb->zcb_readfails = 0; @@ -1566,8 +1547,8 @@ (void) printf("objset %llu object %llu offset 0x%llx %s\n", (u_longlong_t)zb->zb_objset, (u_longlong_t)zb->zb_object, - (u_longlong_t)blkid2offset(bc->bc_dnode, - zb->zb_level, zb->zb_blkid), blkbuf); + (u_longlong_t)blkid2offset(dnp, zb->zb_level, zb->zb_blkid), + blkbuf); } return (0); @@ -1576,23 +1557,13 @@ static int dump_block_stats(spa_t *spa) { - traverse_handle_t *th; zdb_cb_t zcb = { 0 }; - traverse_blk_cache_t dummy_cache = { 0 }; zdb_blkstats_t *zb, *tzb; uint64_t alloc, space, logalloc; vdev_t *rvd = spa->spa_root_vdev; int leaks = 0; - int advance = zdb_advance; - int c, e, flags; - - zcb.zcb_cache = &dummy_cache; - - if (dump_opt['c'] || dump_opt['S']) - advance |= ADVANCE_DATA; + int c, e; - advance |= ADVANCE_PRUNE | ADVANCE_ZIL; - if (!dump_opt['S']) { (void) printf("\nTraversing all blocks to %sverify" " nothing leaked ...\n", @@ -1607,8 +1578,7 @@ * it's not part of any space map) is a double allocation, * reference to a freed block, or an unclaimed log block. */ - if (!dump_opt['L']) - zdb_leak_init(spa); + zdb_leak_init(spa); /* * If there's a deferred-free bplist, process that first. @@ -1634,23 +1604,8 @@ bplist_close(bpl); } - /* - * Now traverse the pool. If we're reading all data to verify - * checksums, do a scrubbing read so that we validate all copies. - */ - flags = ZIO_FLAG_CANFAIL; - if (advance & ADVANCE_DATA) - flags |= ZIO_FLAG_SCRUB; - th = traverse_init(spa, zdb_blkptr_cb, &zcb, advance, flags); - th->th_noread = zdb_noread; + zcb.zcb_haderrors |= traverse_pool(spa, zdb_blkptr_cb, &zcb); - traverse_add_pool(th, 0, spa_first_txg(spa) + TXG_CONCURRENT_STATES); - - while (traverse_more(th) == EAGAIN) - continue; - - traverse_fini(th); >>> TRUNCATED FOR MAIL (1000 lines) <<<