Date: Wed, 26 May 2010 18:50:17 +0000 (UTC) From: Juli Mallett <jmallett@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r208576 - in user/jmallett/octeon: . bin/pax bin/setfacl bin/sh cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensol... Message-ID: <201005261850.o4QIoHFN029109@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jmallett Date: Wed May 26 18:50:16 2010 New Revision: 208576 URL: http://svn.freebsd.org/changeset/base/208576 Log: Merge from head. Added: user/jmallett/octeon/contrib/xz/ - copied from r208575, head/contrib/xz/ user/jmallett/octeon/lib/liblzma/ - copied from r208575, head/lib/liblzma/ user/jmallett/octeon/lib/libutil/quotafile.3 - copied unchanged from r208575, head/lib/libutil/quotafile.3 user/jmallett/octeon/lib/libutil/quotafile.c - copied unchanged from r208575, head/lib/libutil/quotafile.c user/jmallett/octeon/libexec/tftpd/tftp-file.c - copied unchanged from r208575, head/libexec/tftpd/tftp-file.c user/jmallett/octeon/libexec/tftpd/tftp-file.h - copied unchanged from r208575, head/libexec/tftpd/tftp-file.h user/jmallett/octeon/libexec/tftpd/tftp-io.c - copied unchanged from r208575, head/libexec/tftpd/tftp-io.c user/jmallett/octeon/libexec/tftpd/tftp-io.h - copied unchanged from r208575, head/libexec/tftpd/tftp-io.h user/jmallett/octeon/libexec/tftpd/tftp-options.c - copied unchanged from r208575, head/libexec/tftpd/tftp-options.c user/jmallett/octeon/libexec/tftpd/tftp-options.h - copied unchanged from r208575, head/libexec/tftpd/tftp-options.h user/jmallett/octeon/libexec/tftpd/tftp-transfer.c - copied unchanged from r208575, head/libexec/tftpd/tftp-transfer.c user/jmallett/octeon/libexec/tftpd/tftp-transfer.h - copied unchanged from r208575, head/libexec/tftpd/tftp-transfer.h user/jmallett/octeon/libexec/tftpd/tftp-utils.c - copied unchanged from r208575, head/libexec/tftpd/tftp-utils.c user/jmallett/octeon/libexec/tftpd/tftp-utils.h - copied unchanged from r208575, head/libexec/tftpd/tftp-utils.h user/jmallett/octeon/share/man/man4/uep.4 - copied unchanged from r208575, head/share/man/man4/uep.4 user/jmallett/octeon/sys/boot/fdt/ - copied from r208575, head/sys/boot/fdt/ user/jmallett/octeon/sys/cddl/compat/opensolaris/sys/taskq.h - copied unchanged from r208575, head/sys/cddl/compat/opensolaris/sys/taskq.h user/jmallett/octeon/sys/dev/usb/input/uep.c - copied unchanged from r208575, head/sys/dev/usb/input/uep.c user/jmallett/octeon/sys/mips/rmi/mpwait.S - copied unchanged from r208575, head/sys/mips/rmi/mpwait.S user/jmallett/octeon/sys/modules/usb/uep/ - copied from r208575, head/sys/modules/usb/uep/ user/jmallett/octeon/sys/powerpc/powermac/uninorthpci.c - copied unchanged from r208575, head/sys/powerpc/powermac/uninorthpci.c user/jmallett/octeon/sys/x86/x86/ - copied from r208575, head/sys/x86/x86/ user/jmallett/octeon/tools/build/options/WITHOUT_MAN_UTILS - copied unchanged from r208575, head/tools/build/options/WITHOUT_MAN_UTILS user/jmallett/octeon/tools/build/options/WITH_FDT - copied unchanged from r208575, head/tools/build/options/WITH_FDT user/jmallett/octeon/tools/regression/bin/sh/builtins/case2.0 - copied unchanged from r208575, head/tools/regression/bin/sh/builtins/case2.0 user/jmallett/octeon/tools/regression/bin/sh/builtins/case3.0 - copied unchanged from r208575, head/tools/regression/bin/sh/builtins/case3.0 user/jmallett/octeon/tools/regression/bin/sh/builtins/locale1.0 - copied unchanged from r208575, head/tools/regression/bin/sh/builtins/locale1.0 user/jmallett/octeon/tools/regression/bin/sh/builtins/wait1.0 - copied unchanged from r208575, head/tools/regression/bin/sh/builtins/wait1.0 user/jmallett/octeon/tools/regression/bin/sh/builtins/wait2.0 - copied unchanged from r208575, head/tools/regression/bin/sh/builtins/wait2.0 user/jmallett/octeon/tools/regression/bin/sh/expansion/pathname1.0 - copied unchanged from r208575, head/tools/regression/bin/sh/expansion/pathname1.0 user/jmallett/octeon/tools/regression/bin/sh/expansion/pathname2.0 - copied unchanged from r208575, head/tools/regression/bin/sh/expansion/pathname2.0 user/jmallett/octeon/tools/regression/bin/sh/parser/case1.0 - copied unchanged from r208575, head/tools/regression/bin/sh/parser/case1.0 user/jmallett/octeon/tools/regression/bin/sh/parser/case2.0 - copied unchanged from r208575, head/tools/regression/bin/sh/parser/case2.0 user/jmallett/octeon/tools/regression/bin/sh/parser/heredoc3.0 - copied unchanged from r208575, head/tools/regression/bin/sh/parser/heredoc3.0 user/jmallett/octeon/tools/regression/sockets/unix_close_race/ - copied from r208575, head/tools/regression/sockets/unix_close_race/ user/jmallett/octeon/usr.bin/cpio/err.h - copied unchanged from r208575, head/usr.bin/cpio/err.h user/jmallett/octeon/usr.bin/cpio/line_reader.c - copied unchanged from r208575, head/usr.bin/cpio/line_reader.c user/jmallett/octeon/usr.bin/cpio/line_reader.h - copied unchanged from r208575, head/usr.bin/cpio/line_reader.h user/jmallett/octeon/usr.bin/lzmainfo/ - copied from r208575, head/usr.bin/lzmainfo/ user/jmallett/octeon/usr.bin/tftp/tftp.h - copied unchanged from r208575, head/usr.bin/tftp/tftp.h user/jmallett/octeon/usr.bin/xz/ - copied from r208575, head/usr.bin/xz/ user/jmallett/octeon/usr.bin/xzdec/ - copied from r208575, head/usr.bin/xzdec/ Deleted: user/jmallett/octeon/sys/amd64/amd64/local_apic.c user/jmallett/octeon/sys/i386/i386/local_apic.c user/jmallett/octeon/sys/mips/rmi/ehcireg.h user/jmallett/octeon/sys/mips/rmi/ehcivar.h user/jmallett/octeon/sys/mips/rmi/pcibus.c user/jmallett/octeon/sys/mips/rmi/perfmon.h user/jmallett/octeon/sys/mips/rmi/perfmon_kern.c user/jmallett/octeon/sys/mips/rmi/perfmon_percpu.c user/jmallett/octeon/sys/mips/rmi/perfmon_utils.h user/jmallett/octeon/sys/mips/rmi/perfmon_xlrconfig.h user/jmallett/octeon/sys/mips/rmi/xlr_boot1_console.c user/jmallett/octeon/sys/powerpc/powermac/cpchtvar.h Modified: user/jmallett/octeon/Makefile.inc1 user/jmallett/octeon/ObsoleteFiles.inc user/jmallett/octeon/UPDATING user/jmallett/octeon/bin/pax/pat_rep.c user/jmallett/octeon/bin/setfacl/setfacl.1 user/jmallett/octeon/bin/sh/eval.c user/jmallett/octeon/bin/sh/expand.c user/jmallett/octeon/bin/sh/jobs.c user/jmallett/octeon/bin/sh/sh.1 user/jmallett/octeon/bin/sh/var.c user/jmallett/octeon/bin/sh/var.h user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb.c user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c user/jmallett/octeon/cddl/contrib/opensolaris/cmd/ztest/ztest.c user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c user/jmallett/octeon/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c user/jmallett/octeon/contrib/bind9/CHANGES user/jmallett/octeon/contrib/bind9/lib/dns/api user/jmallett/octeon/contrib/bind9/lib/dns/validator.c user/jmallett/octeon/contrib/bind9/version user/jmallett/octeon/contrib/bsnmp/gensnmpdef/gensnmpdef.1 user/jmallett/octeon/contrib/bsnmp/gensnmptree/gensnmptree.1 user/jmallett/octeon/contrib/bsnmp/lib/asn1.3 user/jmallett/octeon/contrib/bsnmp/lib/bsnmpagent.3 user/jmallett/octeon/contrib/bsnmp/lib/bsnmpclient.3 user/jmallett/octeon/contrib/bsnmp/lib/bsnmplib.3 user/jmallett/octeon/contrib/bsnmp/snmp_mibII/snmp_mibII.3 user/jmallett/octeon/contrib/bsnmp/snmpd/bsnmpd.1 user/jmallett/octeon/contrib/bsnmp/snmpd/snmpmod.3 user/jmallett/octeon/contrib/ipfilter/man/ipmon.8 user/jmallett/octeon/contrib/ngatm/man/libngatm.3 user/jmallett/octeon/contrib/ngatm/man/uniaddr.3 user/jmallett/octeon/contrib/ngatm/man/unifunc.3 user/jmallett/octeon/contrib/ngatm/man/unimsg.3 user/jmallett/octeon/contrib/ngatm/man/unisap.3 user/jmallett/octeon/contrib/ngatm/man/unistruct.3 user/jmallett/octeon/contrib/ngatm/snmp_atm/snmp_atm.3 user/jmallett/octeon/contrib/ngatm/sscop/sscop.1 user/jmallett/octeon/contrib/tzcode/zic/private.h user/jmallett/octeon/contrib/tzdata/northamerica user/jmallett/octeon/contrib/tzdata/zone.tab user/jmallett/octeon/etc/Makefile user/jmallett/octeon/etc/csh.login user/jmallett/octeon/etc/defaults/rc.conf user/jmallett/octeon/etc/devd.conf user/jmallett/octeon/etc/mtree/BSD.include.dist user/jmallett/octeon/etc/network.subr user/jmallett/octeon/etc/periodic/daily/310.accounting user/jmallett/octeon/etc/periodic/daily/440.status-mailq user/jmallett/octeon/etc/periodic/weekly/330.catman user/jmallett/octeon/etc/periodic/weekly/Makefile user/jmallett/octeon/etc/profile user/jmallett/octeon/etc/rc.d/SERVERS user/jmallett/octeon/etc/rc.d/bluetooth user/jmallett/octeon/etc/rc.d/bridge user/jmallett/octeon/etc/rc.d/cleanvar user/jmallett/octeon/etc/rc.d/ddb user/jmallett/octeon/etc/rc.d/defaultroute user/jmallett/octeon/etc/rc.d/dumpon user/jmallett/octeon/etc/rc.d/geli user/jmallett/octeon/etc/rc.d/geli2 user/jmallett/octeon/etc/rc.d/hostid user/jmallett/octeon/etc/rc.d/hostid_save user/jmallett/octeon/etc/rc.d/initrandom user/jmallett/octeon/etc/rc.d/ipfw user/jmallett/octeon/etc/rc.d/mdconfig user/jmallett/octeon/etc/rc.d/mdconfig2 user/jmallett/octeon/etc/rc.d/mountcritlocal user/jmallett/octeon/etc/rc.d/nscd user/jmallett/octeon/etc/rc.d/rfcomm_pppd_server user/jmallett/octeon/etc/rc.d/savecore user/jmallett/octeon/etc/rc.d/stf user/jmallett/octeon/etc/rc.d/syscons user/jmallett/octeon/etc/rc.d/sysctl user/jmallett/octeon/etc/rc.d/ubthidhci user/jmallett/octeon/etc/rc.d/zvol user/jmallett/octeon/etc/rc.firewall user/jmallett/octeon/etc/rc.initdiskless user/jmallett/octeon/etc/regdomain.xml user/jmallett/octeon/etc/services user/jmallett/octeon/gnu/lib/libgcc/Makefile user/jmallett/octeon/gnu/lib/libstdc++/Makefile user/jmallett/octeon/gnu/lib/libsupc++/Makefile user/jmallett/octeon/gnu/usr.bin/Makefile user/jmallett/octeon/gnu/usr.bin/cc/Makefile.inc user/jmallett/octeon/gnu/usr.bin/cc/cc_tools/freebsd-native.h user/jmallett/octeon/gnu/usr.bin/cc/include/Makefile user/jmallett/octeon/gnu/usr.bin/dtc/Makefile user/jmallett/octeon/lib/Makefile user/jmallett/octeon/lib/libarchive/Makefile user/jmallett/octeon/lib/libarchive/archive_read_disk.3 user/jmallett/octeon/lib/libarchive/archive_read_open_fd.c user/jmallett/octeon/lib/libarchive/archive_read_open_filename.c user/jmallett/octeon/lib/libarchive/config_freebsd.h user/jmallett/octeon/lib/libarchive/cpio.5 user/jmallett/octeon/lib/libc/compat-43/sigpause.2 user/jmallett/octeon/lib/libc/gen/alarm.3 user/jmallett/octeon/lib/libc/gen/fmtcheck.3 user/jmallett/octeon/lib/libc/gen/glob.c user/jmallett/octeon/lib/libc/gen/isgreater.3 user/jmallett/octeon/lib/libc/gen/raise.3 user/jmallett/octeon/lib/libc/gen/sem_timedwait.3 user/jmallett/octeon/lib/libc/gen/setproctitle.3 user/jmallett/octeon/lib/libc/gen/siginterrupt.3 user/jmallett/octeon/lib/libc/gen/tcgetsid.3 user/jmallett/octeon/lib/libc/gen/ualarm.3 user/jmallett/octeon/lib/libc/locale/isblank.3 user/jmallett/octeon/lib/libc/posix1e/acl_branding.c user/jmallett/octeon/lib/libc/posix1e/acl_get.c user/jmallett/octeon/lib/libc/posix1e/acl_perm.c user/jmallett/octeon/lib/libc/stdio/fgets.3 user/jmallett/octeon/lib/libc/stdio/fopen.3 user/jmallett/octeon/lib/libc/stdio/printf.3 user/jmallett/octeon/lib/libc/stdio/tmpnam.3 user/jmallett/octeon/lib/libc/stdio/wprintf.3 user/jmallett/octeon/lib/libc/stdlib/realpath.3 user/jmallett/octeon/lib/libc/stdlib/strtod.3 user/jmallett/octeon/lib/libc/stdtime/strptime.c user/jmallett/octeon/lib/libc/string/strcat.3 user/jmallett/octeon/lib/libc/string/strcpy.3 user/jmallett/octeon/lib/libc/sys/access.2 user/jmallett/octeon/lib/libc/sys/execve.2 user/jmallett/octeon/lib/libc/sys/fcntl.2 user/jmallett/octeon/lib/libc/sys/getitimer.2 user/jmallett/octeon/lib/libc/sys/getrlimit.2 user/jmallett/octeon/lib/libc/sys/getrusage.2 user/jmallett/octeon/lib/libc/sys/ioctl.2 user/jmallett/octeon/lib/libc/sys/ptrace.2 user/jmallett/octeon/lib/libc/sys/quotactl.2 user/jmallett/octeon/lib/libc/sys/setuid.2 user/jmallett/octeon/lib/libc/sys/sigaction.2 user/jmallett/octeon/lib/libc/sys/sigaltstack.2 user/jmallett/octeon/lib/libc/sys/sigprocmask.2 user/jmallett/octeon/lib/libc/sys/sigreturn.2 user/jmallett/octeon/lib/libc/sys/vfork.2 user/jmallett/octeon/lib/libelf/elf.3 user/jmallett/octeon/lib/libftpio/ftpio.3 user/jmallett/octeon/lib/libmagic/Makefile user/jmallett/octeon/lib/libmagic/config.h user/jmallett/octeon/lib/libpam/modules/pam_krb5/pam_krb5.8 user/jmallett/octeon/lib/libpmc/pmc.mips.3 user/jmallett/octeon/lib/libpmc/pmc.xscale.3 user/jmallett/octeon/lib/librpcsec_gss/rpc_gss_get_error.3 user/jmallett/octeon/lib/librpcsec_gss/rpc_gss_get_mech_info.3 user/jmallett/octeon/lib/librpcsec_gss/rpc_gss_get_mechanisms.3 user/jmallett/octeon/lib/librpcsec_gss/rpc_gss_get_principal_name.3 user/jmallett/octeon/lib/librpcsec_gss/rpc_gss_get_versions.3 user/jmallett/octeon/lib/librpcsec_gss/rpc_gss_getcred.3 user/jmallett/octeon/lib/librpcsec_gss/rpc_gss_is_installed.3 user/jmallett/octeon/lib/librpcsec_gss/rpc_gss_max_data_length.3 user/jmallett/octeon/lib/librpcsec_gss/rpc_gss_mech_to_oid.3 user/jmallett/octeon/lib/librpcsec_gss/rpc_gss_oid_to_mech.3 user/jmallett/octeon/lib/librpcsec_gss/rpc_gss_qop_to_num.3 user/jmallett/octeon/lib/librpcsec_gss/rpc_gss_seccreate.3 user/jmallett/octeon/lib/librpcsec_gss/rpc_gss_set_callback.3 user/jmallett/octeon/lib/librpcsec_gss/rpc_gss_set_defaults.3 user/jmallett/octeon/lib/librpcsec_gss/rpc_gss_set_svc_name.3 user/jmallett/octeon/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3 user/jmallett/octeon/lib/librpcsec_gss/rpcsec_gss.3 user/jmallett/octeon/lib/libthr/thread/thr_condattr.c user/jmallett/octeon/lib/libusb/libusb.h user/jmallett/octeon/lib/libusb/libusb10.c user/jmallett/octeon/lib/libusb/libusb10_desc.c user/jmallett/octeon/lib/libusb/libusb10_io.c user/jmallett/octeon/lib/libusb/libusb20_compat01.c user/jmallett/octeon/lib/libusbhid/data.c user/jmallett/octeon/lib/libusbhid/usbhid.h user/jmallett/octeon/lib/libutil/Makefile user/jmallett/octeon/lib/libutil/libutil.h user/jmallett/octeon/lib/msun/man/fenv.3 user/jmallett/octeon/lib/msun/man/hypot.3 user/jmallett/octeon/libexec/rpc.rquotad/Makefile user/jmallett/octeon/libexec/rpc.rquotad/rquotad.c user/jmallett/octeon/libexec/rtld-elf/amd64/reloc.c user/jmallett/octeon/libexec/rtld-elf/arm/reloc.c user/jmallett/octeon/libexec/rtld-elf/i386/reloc.c user/jmallett/octeon/libexec/rtld-elf/powerpc/reloc.c user/jmallett/octeon/libexec/rtld-elf/rtld.c user/jmallett/octeon/libexec/rtld-elf/sparc64/reloc.c user/jmallett/octeon/libexec/tftpd/Makefile user/jmallett/octeon/libexec/tftpd/tftpd.8 user/jmallett/octeon/libexec/tftpd/tftpd.c user/jmallett/octeon/release/amd64/boot_crunch.conf user/jmallett/octeon/release/doc/en_US.ISO8859-1/hardware/article.sgml user/jmallett/octeon/release/doc/en_US.ISO8859-1/relnotes/article.sgml user/jmallett/octeon/release/doc/share/misc/dev.archlist.txt user/jmallett/octeon/release/i386/boot_crunch.conf user/jmallett/octeon/release/ia64/boot_crunch.conf user/jmallett/octeon/release/pc98/boot_crunch.conf user/jmallett/octeon/release/powerpc/boot_crunch.conf user/jmallett/octeon/release/sparc64/boot_crunch.conf user/jmallett/octeon/release/sun4v/boot_crunch.conf user/jmallett/octeon/rescue/rescue/Makefile user/jmallett/octeon/sbin/bsdlabel/bsdlabel.c user/jmallett/octeon/sbin/fsck_ffs/pass2.c user/jmallett/octeon/sbin/fsck_ffs/pass4.c user/jmallett/octeon/sbin/fsirand/Makefile user/jmallett/octeon/sbin/fsirand/fsirand.8 user/jmallett/octeon/sbin/fsirand/fsirand.c user/jmallett/octeon/sbin/geom/class/part/geom_part.c user/jmallett/octeon/sbin/hastctl/hastctl.8 user/jmallett/octeon/sbin/hastd/hast.conf.5 user/jmallett/octeon/sbin/hastd/hastd.8 user/jmallett/octeon/sbin/ifconfig/ifconfig.8 user/jmallett/octeon/sbin/kldstat/kldstat.c user/jmallett/octeon/sbin/mksnap_ffs/mksnap_ffs.8 user/jmallett/octeon/sbin/mount/mount.8 user/jmallett/octeon/sbin/mount_hpfs/mount_hpfs.8 user/jmallett/octeon/sbin/mount_msdosfs/mount_msdosfs.8 user/jmallett/octeon/sbin/mount_ntfs/mount_ntfs.8 user/jmallett/octeon/sbin/mount_reiserfs/mount_reiserfs.8 user/jmallett/octeon/sbin/mount_std/mount_std.8 user/jmallett/octeon/sbin/quotacheck/Makefile user/jmallett/octeon/sbin/quotacheck/preen.c user/jmallett/octeon/sbin/quotacheck/quotacheck.8 user/jmallett/octeon/sbin/quotacheck/quotacheck.c user/jmallett/octeon/sbin/quotacheck/quotacheck.h user/jmallett/octeon/sbin/rcorder/rcorder.8 user/jmallett/octeon/sbin/restore/symtab.c user/jmallett/octeon/sbin/tunefs/tunefs.c user/jmallett/octeon/share/man/Makefile user/jmallett/octeon/share/man/man1/builtin.1 user/jmallett/octeon/share/man/man3/Makefile user/jmallett/octeon/share/man/man3/fpgetround.3 user/jmallett/octeon/share/man/man3/pthread_cond_timedwait.3 user/jmallett/octeon/share/man/man3/pthread_condattr.3 user/jmallett/octeon/share/man/man4/Makefile user/jmallett/octeon/share/man/man4/ae.4 user/jmallett/octeon/share/man/man4/ahb.4 user/jmallett/octeon/share/man/man4/amdtemp.4 user/jmallett/octeon/share/man/man4/ataraid.4 user/jmallett/octeon/share/man/man4/cas.4 user/jmallett/octeon/share/man/man4/cmx.4 user/jmallett/octeon/share/man/man4/cpuctl.4 user/jmallett/octeon/share/man/man4/ddb.4 user/jmallett/octeon/share/man/man4/ed.4 user/jmallett/octeon/share/man/man4/ef.4 user/jmallett/octeon/share/man/man4/em.4 user/jmallett/octeon/share/man/man4/en.4 user/jmallett/octeon/share/man/man4/fpa.4 user/jmallett/octeon/share/man/man4/fxp.4 user/jmallett/octeon/share/man/man4/geom_fox.4 user/jmallett/octeon/share/man/man4/harp.4 user/jmallett/octeon/share/man/man4/hatm.4 user/jmallett/octeon/share/man/man4/hifn.4 user/jmallett/octeon/share/man/man4/hwpmc.4 user/jmallett/octeon/share/man/man4/igb.4 user/jmallett/octeon/share/man/man4/inet.4 user/jmallett/octeon/share/man/man4/iscsi_initiator.4 user/jmallett/octeon/share/man/man4/kbdmux.4 user/jmallett/octeon/share/man/man4/ksyms.4 user/jmallett/octeon/share/man/man4/lindev.4 user/jmallett/octeon/share/man/man4/malo.4 user/jmallett/octeon/share/man/man4/man4.i386/cs.4 user/jmallett/octeon/share/man/man4/man4.i386/ie.4 user/jmallett/octeon/share/man/man4/man4.i386/mse.4 user/jmallett/octeon/share/man/man4/man4.i386/pnp.4 user/jmallett/octeon/share/man/man4/man4.i386/pnpbios.4 user/jmallett/octeon/share/man/man4/man4.i386/vx.4 user/jmallett/octeon/share/man/man4/man4.i386/wl.4 user/jmallett/octeon/share/man/man4/man4.powerpc/bm.4 user/jmallett/octeon/share/man/man4/man4.powerpc/snd_ai2s.4 user/jmallett/octeon/share/man/man4/man4.powerpc/snd_davbus.4 user/jmallett/octeon/share/man/man4/man4.sparc64/clkbrd.4 user/jmallett/octeon/share/man/man4/man4.sparc64/creator.4 user/jmallett/octeon/share/man/man4/man4.sparc64/machfb.4 user/jmallett/octeon/share/man/man4/man4.sparc64/ofw_console.4 user/jmallett/octeon/share/man/man4/man4.sparc64/openfirm.4 user/jmallett/octeon/share/man/man4/man4.sparc64/openprom.4 user/jmallett/octeon/share/man/man4/md.4 user/jmallett/octeon/share/man/man4/mfi.4 user/jmallett/octeon/share/man/man4/mpt.4 user/jmallett/octeon/share/man/man4/mvs.4 user/jmallett/octeon/share/man/man4/natm.4 user/jmallett/octeon/share/man/man4/ng_bridge.4 user/jmallett/octeon/share/man/man4/ng_ccatm.4 user/jmallett/octeon/share/man/man4/ng_hub.4 user/jmallett/octeon/share/man/man4/nve.4 user/jmallett/octeon/share/man/man4/patm.4 user/jmallett/octeon/share/man/man4/psm.4 user/jmallett/octeon/share/man/man4/run.4 user/jmallett/octeon/share/man/man4/sge.4 user/jmallett/octeon/share/man/man4/smp.4 user/jmallett/octeon/share/man/man4/snd_emu10kx.4 user/jmallett/octeon/share/man/man4/splash.4 user/jmallett/octeon/share/man/man4/syscons.4 user/jmallett/octeon/share/man/man4/tx.4 user/jmallett/octeon/share/man/man4/u3g.4 user/jmallett/octeon/share/man/man4/uath.4 user/jmallett/octeon/share/man/man4/ucom.4 user/jmallett/octeon/share/man/man4/uhso.4 user/jmallett/octeon/share/man/man4/usb.4 user/jmallett/octeon/share/man/man4/usb2_template.4 user/jmallett/octeon/share/man/man4/vkbd.4 user/jmallett/octeon/share/man/man4/wpi.4 user/jmallett/octeon/share/man/man5/boot.config.5 user/jmallett/octeon/share/man/man5/fdescfs.5 user/jmallett/octeon/share/man/man5/linsysfs.5 user/jmallett/octeon/share/man/man5/make.conf.5 user/jmallett/octeon/share/man/man5/reiserfs.5 user/jmallett/octeon/share/man/man5/src.conf.5 user/jmallett/octeon/share/man/man5/xfs.5 user/jmallett/octeon/share/man/man8/nanobsd.8 user/jmallett/octeon/share/man/man9/BUS_DESCRIBE_INTR.9 user/jmallett/octeon/share/man/man9/cr_seeothergids.9 user/jmallett/octeon/share/man/man9/cr_seeotheruids.9 user/jmallett/octeon/share/man/man9/fail.9 user/jmallett/octeon/share/man/man9/make_dev.9 user/jmallett/octeon/share/man/man9/mbpool.9 user/jmallett/octeon/share/man/man9/namei.9 user/jmallett/octeon/share/man/man9/p_candebug.9 user/jmallett/octeon/share/man/man9/p_cansee.9 user/jmallett/octeon/share/man/man9/prison_check.9 user/jmallett/octeon/share/man/man9/uio.9 user/jmallett/octeon/share/man/man9/usbdi.9 user/jmallett/octeon/share/man/man9/watchdog.9 user/jmallett/octeon/share/misc/bsd-family-tree user/jmallett/octeon/share/misc/committers-src.dot user/jmallett/octeon/share/misc/mdoc.template user/jmallett/octeon/share/mk/bsd.README user/jmallett/octeon/share/mk/bsd.libnames.mk user/jmallett/octeon/share/mk/bsd.own.mk user/jmallett/octeon/sys/amd64/amd64/apic_vector.S user/jmallett/octeon/sys/amd64/amd64/db_interface.c user/jmallett/octeon/sys/amd64/amd64/elf_machdep.c user/jmallett/octeon/sys/amd64/amd64/exception.S user/jmallett/octeon/sys/amd64/amd64/identcpu.c user/jmallett/octeon/sys/amd64/amd64/mca.c user/jmallett/octeon/sys/amd64/amd64/mp_machdep.c user/jmallett/octeon/sys/amd64/amd64/pmap.c user/jmallett/octeon/sys/amd64/amd64/trap.c user/jmallett/octeon/sys/amd64/ia32/ia32_syscall.c user/jmallett/octeon/sys/amd64/include/apicreg.h user/jmallett/octeon/sys/amd64/include/apicvar.h user/jmallett/octeon/sys/amd64/include/atomic.h user/jmallett/octeon/sys/amd64/include/clock.h user/jmallett/octeon/sys/amd64/include/mca.h user/jmallett/octeon/sys/amd64/include/pcpu.h user/jmallett/octeon/sys/amd64/include/proc.h user/jmallett/octeon/sys/amd64/include/specialreg.h user/jmallett/octeon/sys/amd64/include/xen/xenfunc.h user/jmallett/octeon/sys/amd64/include/xen/xenvar.h user/jmallett/octeon/sys/amd64/linux32/linux32_sysvec.c user/jmallett/octeon/sys/arm/arm/cpufunc.c user/jmallett/octeon/sys/arm/arm/cpufunc_asm_fa526.S user/jmallett/octeon/sys/arm/arm/elf_machdep.c user/jmallett/octeon/sys/arm/arm/elf_trampoline.c user/jmallett/octeon/sys/arm/arm/identcpu.c user/jmallett/octeon/sys/arm/arm/pmap.c user/jmallett/octeon/sys/arm/arm/trap.c user/jmallett/octeon/sys/arm/include/cpuconf.h user/jmallett/octeon/sys/arm/include/cpufunc.h user/jmallett/octeon/sys/arm/include/disassem.h user/jmallett/octeon/sys/arm/include/md_var.h user/jmallett/octeon/sys/arm/include/metadata.h user/jmallett/octeon/sys/boot/Makefile user/jmallett/octeon/sys/boot/arm/uboot/Makefile user/jmallett/octeon/sys/boot/arm/uboot/version user/jmallett/octeon/sys/boot/common/module.c user/jmallett/octeon/sys/boot/forth/loader.conf user/jmallett/octeon/sys/boot/forth/loader.conf.5 user/jmallett/octeon/sys/boot/i386/zfsboot/zfsboot.c user/jmallett/octeon/sys/boot/powerpc/uboot/Makefile user/jmallett/octeon/sys/boot/powerpc/uboot/version user/jmallett/octeon/sys/boot/uboot/common/main.c user/jmallett/octeon/sys/boot/uboot/common/metadata.c user/jmallett/octeon/sys/boot/uboot/lib/Makefile user/jmallett/octeon/sys/boot/uboot/lib/disk.c user/jmallett/octeon/sys/boot/uboot/lib/glue.c user/jmallett/octeon/sys/cam/ata/ata_da.c user/jmallett/octeon/sys/cam/ata/ata_xpt.c user/jmallett/octeon/sys/cam/scsi/scsi_sg.c user/jmallett/octeon/sys/cam/scsi/scsi_xpt.c user/jmallett/octeon/sys/cddl/boot/zfs/zfsimpl.h user/jmallett/octeon/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c user/jmallett/octeon/sys/cddl/compat/opensolaris/sys/dnlc.h user/jmallett/octeon/sys/cddl/compat/opensolaris/sys/sysmacros.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c user/jmallett/octeon/sys/cddl/dev/systrace/systrace.c user/jmallett/octeon/sys/compat/ia32/ia32_sysvec.c user/jmallett/octeon/sys/compat/ia32/ia32_util.h user/jmallett/octeon/sys/compat/linux/linux_ioctl.c user/jmallett/octeon/sys/compat/linux/linux_ioctl.h user/jmallett/octeon/sys/compat/svr4/svr4_sysvec.c user/jmallett/octeon/sys/conf/NOTES user/jmallett/octeon/sys/conf/files user/jmallett/octeon/sys/conf/files.amd64 user/jmallett/octeon/sys/conf/files.i386 user/jmallett/octeon/sys/conf/files.pc98 user/jmallett/octeon/sys/conf/files.powerpc user/jmallett/octeon/sys/conf/files.sparc64 user/jmallett/octeon/sys/conf/options user/jmallett/octeon/sys/conf/options.arm user/jmallett/octeon/sys/contrib/dev/run/rt2870.fw.uu user/jmallett/octeon/sys/ddb/db_command.c user/jmallett/octeon/sys/ddb/db_command.h user/jmallett/octeon/sys/ddb/db_output.c user/jmallett/octeon/sys/ddb/db_thread.c user/jmallett/octeon/sys/ddb/ddb.h user/jmallett/octeon/sys/dev/acpica/acpi.c user/jmallett/octeon/sys/dev/acpica/acpi_hpet.c user/jmallett/octeon/sys/dev/acpica/acpivar.h user/jmallett/octeon/sys/dev/agp/agp.c user/jmallett/octeon/sys/dev/agp/agp_i810.c user/jmallett/octeon/sys/dev/ahci/ahci.c user/jmallett/octeon/sys/dev/ata/ata-all.c user/jmallett/octeon/sys/dev/ata/ata-disk.c user/jmallett/octeon/sys/dev/ata/ata-pci.c user/jmallett/octeon/sys/dev/ata/ata-pci.h user/jmallett/octeon/sys/dev/ata/chipsets/ata-serverworks.c user/jmallett/octeon/sys/dev/bce/if_bce.c user/jmallett/octeon/sys/dev/bwn/if_bwn.c user/jmallett/octeon/sys/dev/cas/if_cas.c user/jmallett/octeon/sys/dev/cas/if_casreg.h user/jmallett/octeon/sys/dev/cxgb/cxgb_adapter.h user/jmallett/octeon/sys/dev/cxgb/cxgb_ioctl.h user/jmallett/octeon/sys/dev/cxgb/cxgb_main.c user/jmallett/octeon/sys/dev/cxgb/cxgb_sge.c user/jmallett/octeon/sys/dev/cxgb/sys/mvec.h user/jmallett/octeon/sys/dev/cxgb/sys/uipc_mvec.c user/jmallett/octeon/sys/dev/drm/via_dmablit.c user/jmallett/octeon/sys/dev/e1000/if_em.c user/jmallett/octeon/sys/dev/e1000/if_igb.c user/jmallett/octeon/sys/dev/e1000/if_lem.c user/jmallett/octeon/sys/dev/esp/esp_sbus.c user/jmallett/octeon/sys/dev/fb/vesa.c user/jmallett/octeon/sys/dev/fxp/if_fxp.c user/jmallett/octeon/sys/dev/fxp/if_fxpreg.h user/jmallett/octeon/sys/dev/fxp/if_fxpvar.h user/jmallett/octeon/sys/dev/ipw/if_ipw.c user/jmallett/octeon/sys/dev/isp/isp_freebsd.c user/jmallett/octeon/sys/dev/isp/isp_pci.c user/jmallett/octeon/sys/dev/isp/isp_sbus.c user/jmallett/octeon/sys/dev/isp/ispvar.h user/jmallett/octeon/sys/dev/iwn/if_iwn.c user/jmallett/octeon/sys/dev/ixgbe/ixgbe.c user/jmallett/octeon/sys/dev/ixgbe/ixgbe.h user/jmallett/octeon/sys/dev/md/md.c user/jmallett/octeon/sys/dev/mmc/mmc.c user/jmallett/octeon/sys/dev/msk/if_msk.c user/jmallett/octeon/sys/dev/mvs/mvs.c user/jmallett/octeon/sys/dev/mvs/mvs_pci.c user/jmallett/octeon/sys/dev/mvs/mvs_soc.c user/jmallett/octeon/sys/dev/mxge/eth_z8e.h user/jmallett/octeon/sys/dev/mxge/ethp_z8e.h user/jmallett/octeon/sys/dev/mxge/if_mxge.c user/jmallett/octeon/sys/dev/mxge/rss_eth_z8e.h user/jmallett/octeon/sys/dev/mxge/rss_ethp_z8e.h user/jmallett/octeon/sys/dev/pci/pci.c user/jmallett/octeon/sys/dev/puc/pucdata.c user/jmallett/octeon/sys/dev/re/if_re.c user/jmallett/octeon/sys/dev/sge/if_sge.c user/jmallett/octeon/sys/dev/sge/if_sgereg.h user/jmallett/octeon/sys/dev/siis/siis.c user/jmallett/octeon/sys/dev/sound/pcm/buffer.c user/jmallett/octeon/sys/dev/sound/pcm/buffer.h user/jmallett/octeon/sys/dev/syscons/syscons.c user/jmallett/octeon/sys/dev/syscons/syscons.h user/jmallett/octeon/sys/dev/ti/if_ti.c user/jmallett/octeon/sys/dev/usb/controller/ehci.c user/jmallett/octeon/sys/dev/usb/controller/usb_controller.c user/jmallett/octeon/sys/dev/usb/input/ums.c user/jmallett/octeon/sys/dev/usb/net/uhso.c user/jmallett/octeon/sys/dev/usb/quirk/usb_quirk.c user/jmallett/octeon/sys/dev/usb/serial/u3g.c user/jmallett/octeon/sys/dev/usb/serial/uftdi.c user/jmallett/octeon/sys/dev/usb/usb_debug.c user/jmallett/octeon/sys/dev/usb/usb_dev.c user/jmallett/octeon/sys/dev/usb/usb_device.c user/jmallett/octeon/sys/dev/usb/usb_device.h user/jmallett/octeon/sys/dev/usb/usb_generic.c user/jmallett/octeon/sys/dev/usb/usb_hid.c user/jmallett/octeon/sys/dev/usb/usb_hub.c user/jmallett/octeon/sys/dev/usb/usb_request.c user/jmallett/octeon/sys/dev/usb/usbdevs user/jmallett/octeon/sys/dev/usb/usbhid.h user/jmallett/octeon/sys/dev/usb/wlan/if_rum.c user/jmallett/octeon/sys/dev/usb/wlan/if_run.c user/jmallett/octeon/sys/dev/usb/wlan/if_runreg.h user/jmallett/octeon/sys/dev/usb/wlan/if_runvar.h user/jmallett/octeon/sys/dev/xen/netfront/netfront.c user/jmallett/octeon/sys/fs/devfs/devfs_devs.c user/jmallett/octeon/sys/fs/devfs/devfs_int.h user/jmallett/octeon/sys/fs/ext2fs/ext2_readwrite.c user/jmallett/octeon/sys/fs/ext2fs/ext2_vnops.c user/jmallett/octeon/sys/fs/msdosfs/msdosfs_vnops.c user/jmallett/octeon/sys/fs/nfs/nfs_commonkrpc.c user/jmallett/octeon/sys/fs/nfs/nfskpiport.h user/jmallett/octeon/sys/fs/nfs/nfsport.h user/jmallett/octeon/sys/fs/nfsclient/nfs_clbio.c user/jmallett/octeon/sys/fs/nfsclient/nfs_clsubs.c user/jmallett/octeon/sys/fs/nfsclient/nfs_clvfsops.c user/jmallett/octeon/sys/fs/nullfs/null_vnops.c user/jmallett/octeon/sys/fs/nwfs/nwfs_io.c user/jmallett/octeon/sys/fs/procfs/procfs_ctl.c user/jmallett/octeon/sys/fs/smbfs/smbfs_io.c user/jmallett/octeon/sys/fs/tmpfs/tmpfs_vnops.c user/jmallett/octeon/sys/geom/geom.h user/jmallett/octeon/sys/geom/geom_subr.c user/jmallett/octeon/sys/geom/multipath/g_multipath.c user/jmallett/octeon/sys/geom/part/g_part_apm.c user/jmallett/octeon/sys/geom/part/g_part_vtoc8.c user/jmallett/octeon/sys/geom/vinum/geom_vinum.c user/jmallett/octeon/sys/geom/vinum/geom_vinum.h user/jmallett/octeon/sys/geom/vinum/geom_vinum_events.c user/jmallett/octeon/sys/geom/vinum/geom_vinum_var.h user/jmallett/octeon/sys/geom/zero/g_zero.c user/jmallett/octeon/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c user/jmallett/octeon/sys/i386/i386/apic_vector.s user/jmallett/octeon/sys/i386/i386/elf_machdep.c user/jmallett/octeon/sys/i386/i386/geode.c user/jmallett/octeon/sys/i386/i386/identcpu.c user/jmallett/octeon/sys/i386/i386/mca.c user/jmallett/octeon/sys/i386/i386/mp_machdep.c user/jmallett/octeon/sys/i386/i386/pmap.c user/jmallett/octeon/sys/i386/i386/trap.c user/jmallett/octeon/sys/i386/ibcs2/ibcs2_sysvec.c user/jmallett/octeon/sys/i386/include/apicreg.h user/jmallett/octeon/sys/i386/include/apicvar.h user/jmallett/octeon/sys/i386/include/atomic.h user/jmallett/octeon/sys/i386/include/clock.h user/jmallett/octeon/sys/i386/include/mca.h user/jmallett/octeon/sys/i386/include/pcpu.h user/jmallett/octeon/sys/i386/include/proc.h user/jmallett/octeon/sys/i386/include/specialreg.h user/jmallett/octeon/sys/i386/include/xen/xenfunc.h user/jmallett/octeon/sys/i386/include/xen/xenvar.h user/jmallett/octeon/sys/i386/linux/linux_sysvec.c user/jmallett/octeon/sys/i386/xen/pmap.c user/jmallett/octeon/sys/ia64/ia32/ia32_trap.c user/jmallett/octeon/sys/ia64/ia64/db_machdep.c user/jmallett/octeon/sys/ia64/ia64/elf_machdep.c user/jmallett/octeon/sys/ia64/ia64/pmap.c user/jmallett/octeon/sys/ia64/ia64/trap.c user/jmallett/octeon/sys/ia64/include/ia64_cpu.h user/jmallett/octeon/sys/ia64/include/pmap.h user/jmallett/octeon/sys/ia64/include/proc.h user/jmallett/octeon/sys/ia64/include/runq.h user/jmallett/octeon/sys/ia64/include/sal.h user/jmallett/octeon/sys/ia64/include/vmparam.h user/jmallett/octeon/sys/isa/syscons_isa.c user/jmallett/octeon/sys/kern/imgact_aout.c user/jmallett/octeon/sys/kern/init_main.c user/jmallett/octeon/sys/kern/kern_clock.c user/jmallett/octeon/sys/kern/kern_conf.c user/jmallett/octeon/sys/kern/kern_exec.c user/jmallett/octeon/sys/kern/kern_kthread.c user/jmallett/octeon/sys/kern/kern_mutex.c user/jmallett/octeon/sys/kern/kern_proc.c user/jmallett/octeon/sys/kern/kern_resource.c user/jmallett/octeon/sys/kern/kern_sig.c user/jmallett/octeon/sys/kern/kern_thread.c user/jmallett/octeon/sys/kern/sched_4bsd.c user/jmallett/octeon/sys/kern/sched_ule.c user/jmallett/octeon/sys/kern/subr_bufring.c user/jmallett/octeon/sys/kern/subr_pcpu.c user/jmallett/octeon/sys/kern/subr_smp.c user/jmallett/octeon/sys/kern/subr_trap.c user/jmallett/octeon/sys/kern/subr_uio.c user/jmallett/octeon/sys/kern/subr_witness.c user/jmallett/octeon/sys/kern/sys_generic.c user/jmallett/octeon/sys/kern/sys_pipe.c user/jmallett/octeon/sys/kern/sys_process.c user/jmallett/octeon/sys/kern/uipc_cow.c user/jmallett/octeon/sys/kern/uipc_syscalls.c user/jmallett/octeon/sys/kern/vfs_bio.c user/jmallett/octeon/sys/kern/vfs_default.c user/jmallett/octeon/sys/kern/vfs_subr.c user/jmallett/octeon/sys/kern/vfs_vnops.c user/jmallett/octeon/sys/kern/vnode_if.src user/jmallett/octeon/sys/mips/adm5120/if_admsw.c user/jmallett/octeon/sys/mips/conf/XLR user/jmallett/octeon/sys/mips/include/asm.h user/jmallett/octeon/sys/mips/include/hwfunc.h user/jmallett/octeon/sys/mips/include/locore.h user/jmallett/octeon/sys/mips/include/param.h user/jmallett/octeon/sys/mips/include/pmap.h user/jmallett/octeon/sys/mips/include/smp.h user/jmallett/octeon/sys/mips/mips/cpu.c user/jmallett/octeon/sys/mips/mips/db_trace.c user/jmallett/octeon/sys/mips/mips/elf_machdep.c user/jmallett/octeon/sys/mips/mips/machdep.c user/jmallett/octeon/sys/mips/mips/mp_machdep.c user/jmallett/octeon/sys/mips/mips/mpboot.S user/jmallett/octeon/sys/mips/mips/pmap.c user/jmallett/octeon/sys/mips/mips/swtch.S user/jmallett/octeon/sys/mips/mips/trap.c user/jmallett/octeon/sys/mips/rmi/dev/xlr/rge.c user/jmallett/octeon/sys/mips/rmi/files.xlr user/jmallett/octeon/sys/mips/rmi/interrupt.h user/jmallett/octeon/sys/mips/rmi/intr_machdep.c user/jmallett/octeon/sys/mips/rmi/iodi.c user/jmallett/octeon/sys/mips/rmi/on_chip.c user/jmallett/octeon/sys/mips/rmi/pic.h user/jmallett/octeon/sys/mips/rmi/xlr_machdep.c user/jmallett/octeon/sys/mips/rmi/xlr_pci.c user/jmallett/octeon/sys/mips/rmi/xlrconfig.h user/jmallett/octeon/sys/mips/sibyte/sb_machdep.c user/jmallett/octeon/sys/modules/Makefile user/jmallett/octeon/sys/modules/ata/atadisk/Makefile user/jmallett/octeon/sys/modules/cam/Makefile user/jmallett/octeon/sys/modules/cas/Makefile user/jmallett/octeon/sys/modules/linux/Makefile user/jmallett/octeon/sys/modules/mvs/Makefile user/jmallett/octeon/sys/modules/uart/Makefile user/jmallett/octeon/sys/modules/zfs/Makefile user/jmallett/octeon/sys/net/bpf_zerocopy.c user/jmallett/octeon/sys/net/flowtable.c user/jmallett/octeon/sys/net/flowtable.h user/jmallett/octeon/sys/net/if.c user/jmallett/octeon/sys/net/if_var.h user/jmallett/octeon/sys/net/if_vlan.c user/jmallett/octeon/sys/net/route.c user/jmallett/octeon/sys/net/rtsock.c user/jmallett/octeon/sys/net/vnet.c user/jmallett/octeon/sys/netgraph/ng_base.c user/jmallett/octeon/sys/netgraph/ng_bridge.c user/jmallett/octeon/sys/netgraph/ng_bridge.h user/jmallett/octeon/sys/netgraph/ng_hub.c user/jmallett/octeon/sys/netgraph/ng_hub.h user/jmallett/octeon/sys/netgraph/ng_ksocket.c user/jmallett/octeon/sys/netgraph/ng_socket.c user/jmallett/octeon/sys/netinet/in.c user/jmallett/octeon/sys/netinet/in_pcb.c user/jmallett/octeon/sys/netinet/ip_options.c user/jmallett/octeon/sys/netinet/ip_output.c user/jmallett/octeon/sys/netinet/sctp_bsd_addr.c user/jmallett/octeon/sys/netinet/sctp_bsd_addr.h user/jmallett/octeon/sys/netinet/sctp_constants.h user/jmallett/octeon/sys/netinet/sctp_indata.c user/jmallett/octeon/sys/netinet/sctp_input.c user/jmallett/octeon/sys/netinet/sctp_lock_bsd.h user/jmallett/octeon/sys/netinet/sctp_output.c user/jmallett/octeon/sys/netinet/sctp_pcb.c user/jmallett/octeon/sys/netinet/sctp_pcb.h user/jmallett/octeon/sys/netinet/sctp_structs.h user/jmallett/octeon/sys/netinet/sctp_timer.c user/jmallett/octeon/sys/netinet/sctp_usrreq.c user/jmallett/octeon/sys/netinet/sctputil.c user/jmallett/octeon/sys/netinet6/in6.c user/jmallett/octeon/sys/netinet6/in6_proto.c user/jmallett/octeon/sys/netinet6/ip6_input.c user/jmallett/octeon/sys/netinet6/ip6_output.c user/jmallett/octeon/sys/netinet6/udp6_usrreq.c user/jmallett/octeon/sys/netipsec/ipsec_input.c user/jmallett/octeon/sys/netipsec/key.c user/jmallett/octeon/sys/nfsclient/nfs_bio.c user/jmallett/octeon/sys/pc98/cbus/clock.c user/jmallett/octeon/sys/pc98/cbus/syscons_cbus.c user/jmallett/octeon/sys/pc98/include/md_var.h user/jmallett/octeon/sys/pc98/pc98/pc98_machdep.c user/jmallett/octeon/sys/powerpc/aim/mmu_oea.c user/jmallett/octeon/sys/powerpc/aim/mmu_oea64.c user/jmallett/octeon/sys/powerpc/aim/ofw_machdep.c user/jmallett/octeon/sys/powerpc/aim/trap.c user/jmallett/octeon/sys/powerpc/booke/pmap.c user/jmallett/octeon/sys/powerpc/booke/trap.c user/jmallett/octeon/sys/powerpc/cpufreq/pcr.c user/jmallett/octeon/sys/powerpc/include/intr_machdep.h user/jmallett/octeon/sys/powerpc/include/metadata.h user/jmallett/octeon/sys/powerpc/include/pmap.h user/jmallett/octeon/sys/powerpc/include/proc.h user/jmallett/octeon/sys/powerpc/ofw/ofw_pcibus.c user/jmallett/octeon/sys/powerpc/powermac/ata_kauai.c user/jmallett/octeon/sys/powerpc/powermac/cpcht.c user/jmallett/octeon/sys/powerpc/powermac/smu.c user/jmallett/octeon/sys/powerpc/powermac/uninorth.c user/jmallett/octeon/sys/powerpc/powermac/uninorthvar.h user/jmallett/octeon/sys/powerpc/powerpc/elf_machdep.c user/jmallett/octeon/sys/powerpc/powerpc/mmu_if.m user/jmallett/octeon/sys/powerpc/powerpc/openpic.c user/jmallett/octeon/sys/powerpc/powerpc/pmap_dispatch.c user/jmallett/octeon/sys/security/audit/audit_bsm.c user/jmallett/octeon/sys/sparc64/include/md_var.h user/jmallett/octeon/sys/sparc64/include/proc.h user/jmallett/octeon/sys/sparc64/pci/schizo.c user/jmallett/octeon/sys/sparc64/pci/schizoreg.h user/jmallett/octeon/sys/sparc64/pci/schizovar.h user/jmallett/octeon/sys/sparc64/sparc64/ata_machdep.c user/jmallett/octeon/sys/sparc64/sparc64/elf_machdep.c user/jmallett/octeon/sys/sparc64/sparc64/pmap.c user/jmallett/octeon/sys/sparc64/sparc64/trap.c user/jmallett/octeon/sys/sun4v/include/proc.h user/jmallett/octeon/sys/sun4v/sun4v/pmap.c user/jmallett/octeon/sys/sun4v/sun4v/trap.c user/jmallett/octeon/sys/sys/buf_ring.h user/jmallett/octeon/sys/sys/conf.h user/jmallett/octeon/sys/sys/endian.h user/jmallett/octeon/sys/sys/eventhandler.h user/jmallett/octeon/sys/sys/kernel.h user/jmallett/octeon/sys/sys/kthread.h user/jmallett/octeon/sys/sys/lock.h user/jmallett/octeon/sys/sys/mbuf.h user/jmallett/octeon/sys/sys/param.h user/jmallett/octeon/sys/sys/pcpu.h user/jmallett/octeon/sys/sys/proc.h user/jmallett/octeon/sys/sys/ptrace.h user/jmallett/octeon/sys/sys/resource.h user/jmallett/octeon/sys/sys/resourcevar.h user/jmallett/octeon/sys/sys/sysent.h user/jmallett/octeon/sys/sys/systm.h user/jmallett/octeon/sys/sys/vmmeter.h user/jmallett/octeon/sys/sys/vnode.h user/jmallett/octeon/sys/ufs/ffs/ffs_snapshot.c user/jmallett/octeon/sys/ufs/ffs/ffs_softdep.c user/jmallett/octeon/sys/ufs/ffs/ffs_vfsops.c user/jmallett/octeon/sys/ufs/ffs/ffs_vnops.c user/jmallett/octeon/sys/ufs/ffs/softdep.h user/jmallett/octeon/sys/ufs/ufs/quota.h user/jmallett/octeon/sys/ufs/ufs/ufs_quota.c user/jmallett/octeon/sys/ufs/ufs/ufs_vfsops.c user/jmallett/octeon/sys/ufs/ufs/ufsmount.h user/jmallett/octeon/sys/vm/device_pager.c user/jmallett/octeon/sys/vm/phys_pager.c user/jmallett/octeon/sys/vm/pmap.h user/jmallett/octeon/sys/vm/sg_pager.c user/jmallett/octeon/sys/vm/swap_pager.c user/jmallett/octeon/sys/vm/uma_core.c user/jmallett/octeon/sys/vm/vm_contig.c user/jmallett/octeon/sys/vm/vm_fault.c user/jmallett/octeon/sys/vm/vm_glue.c user/jmallett/octeon/sys/vm/vm_map.c user/jmallett/octeon/sys/vm/vm_mmap.c user/jmallett/octeon/sys/vm/vm_object.c user/jmallett/octeon/sys/vm/vm_page.c user/jmallett/octeon/sys/vm/vm_page.h user/jmallett/octeon/sys/vm/vm_pageout.c user/jmallett/octeon/sys/vm/vm_pageout.h user/jmallett/octeon/sys/vm/vnode_pager.c user/jmallett/octeon/sys/x86/isa/clock.c user/jmallett/octeon/tools/regression/bin/sh/builtins/var-assign2.0 user/jmallett/octeon/tools/regression/bin/sh/errors/assignment-error1.0 user/jmallett/octeon/tools/regression/lib/libc/gen/Makefile user/jmallett/octeon/tools/regression/lib/libc/gen/test-fnmatch.c user/jmallett/octeon/tools/tools/ether_reflect/ether_reflect.1 user/jmallett/octeon/tools/tools/vimage/vimage.8 user/jmallett/octeon/usr.bin/Makefile user/jmallett/octeon/usr.bin/ar/Makefile user/jmallett/octeon/usr.bin/ar/acpyacc.y user/jmallett/octeon/usr.bin/ar/ar.1 user/jmallett/octeon/usr.bin/ar/ar.c user/jmallett/octeon/usr.bin/ar/ar.h user/jmallett/octeon/usr.bin/ar/read.c user/jmallett/octeon/usr.bin/ar/write.c user/jmallett/octeon/usr.bin/bsdiff/bsdiff/bsdiff.1 user/jmallett/octeon/usr.bin/bsdiff/bspatch/bspatch.1 user/jmallett/octeon/usr.bin/calendar/calendars/calendar.history user/jmallett/octeon/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common (contents, props changed) user/jmallett/octeon/usr.bin/calendar/io.c user/jmallett/octeon/usr.bin/calendar/parsedata.c user/jmallett/octeon/usr.bin/chpass/Makefile user/jmallett/octeon/usr.bin/chpass/chpass.1 user/jmallett/octeon/usr.bin/cpio/Makefile user/jmallett/octeon/usr.bin/cpio/bsdcpio.1 user/jmallett/octeon/usr.bin/cpio/cmdline.c user/jmallett/octeon/usr.bin/cpio/config_freebsd.h user/jmallett/octeon/usr.bin/cpio/cpio.c user/jmallett/octeon/usr.bin/cpio/cpio.h user/jmallett/octeon/usr.bin/cpio/cpio_platform.h user/jmallett/octeon/usr.bin/cpio/err.c user/jmallett/octeon/usr.bin/cpio/matching.c user/jmallett/octeon/usr.bin/cpio/matching.h user/jmallett/octeon/usr.bin/cpio/pathmatch.c user/jmallett/octeon/usr.bin/cpio/pathmatch.h user/jmallett/octeon/usr.bin/cpio/test/Makefile user/jmallett/octeon/usr.bin/csup/cpasswd.1 user/jmallett/octeon/usr.bin/csup/csup.1 user/jmallett/octeon/usr.bin/find/option.c user/jmallett/octeon/usr.bin/killall/killall.1 user/jmallett/octeon/usr.bin/lastcomm/lastcomm.1 user/jmallett/octeon/usr.bin/less/Makefile user/jmallett/octeon/usr.bin/less/lesspipe.sh user/jmallett/octeon/usr.bin/make/make.1 user/jmallett/octeon/usr.bin/mkuzip/mkuzip.8 user/jmallett/octeon/usr.bin/quota/Makefile user/jmallett/octeon/usr.bin/quota/quota.c user/jmallett/octeon/usr.bin/rpcgen/rpc_cout.c user/jmallett/octeon/usr.bin/setchannel/setchannel.1 user/jmallett/octeon/usr.bin/tar/Makefile user/jmallett/octeon/usr.bin/tar/bsdtar.1 user/jmallett/octeon/usr.bin/tar/config_freebsd.h user/jmallett/octeon/usr.bin/tar/test/Makefile user/jmallett/octeon/usr.bin/tftp/Makefile user/jmallett/octeon/usr.bin/tftp/main.c user/jmallett/octeon/usr.bin/tftp/tftp.1 user/jmallett/octeon/usr.bin/tftp/tftp.c user/jmallett/octeon/usr.bin/vmstat/vmstat.8 user/jmallett/octeon/usr.bin/vmstat/vmstat.c user/jmallett/octeon/usr.bin/wc/wc.c user/jmallett/octeon/usr.bin/wtmpcvt/wtmpcvt.1 user/jmallett/octeon/usr.sbin/Makefile user/jmallett/octeon/usr.sbin/adduser/adduser.conf.5 user/jmallett/octeon/usr.sbin/apm/apm.c user/jmallett/octeon/usr.sbin/apmd/Makefile user/jmallett/octeon/usr.sbin/apmd/README user/jmallett/octeon/usr.sbin/apmd/apmd.8 user/jmallett/octeon/usr.sbin/apmd/apmd.c user/jmallett/octeon/usr.sbin/apmd/apmd.h user/jmallett/octeon/usr.sbin/apmd/apmdlex.l user/jmallett/octeon/usr.sbin/apmd/contrib/pccardq.c user/jmallett/octeon/usr.sbin/bluetooth/bthidd/bthidd.8 user/jmallett/octeon/usr.sbin/bluetooth/bthidd/hid.c user/jmallett/octeon/usr.sbin/bluetooth/btpand/btpand.8 user/jmallett/octeon/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8 user/jmallett/octeon/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8 user/jmallett/octeon/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3 user/jmallett/octeon/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3 user/jmallett/octeon/usr.sbin/clear_locks/clear_locks.8 user/jmallett/octeon/usr.sbin/cpucontrol/cpucontrol.8 user/jmallett/octeon/usr.sbin/cron/crontab/crontab.1 user/jmallett/octeon/usr.sbin/crunch/crunchgen/crunchgen.1 user/jmallett/octeon/usr.sbin/cxgbtool/cxgbtool.c user/jmallett/octeon/usr.sbin/daemon/daemon.8 user/jmallett/octeon/usr.sbin/edquota/Makefile user/jmallett/octeon/usr.sbin/edquota/edquota.8 user/jmallett/octeon/usr.sbin/edquota/edquota.c user/jmallett/octeon/usr.sbin/extattr/rmextattr.c user/jmallett/octeon/usr.sbin/fifolog/lib/fifolog_reader.c user/jmallett/octeon/usr.sbin/gssd/gssd.8 user/jmallett/octeon/usr.sbin/iostat/iostat.8 user/jmallett/octeon/usr.sbin/iostat/iostat.c user/jmallett/octeon/usr.sbin/jail/jail.8 user/jmallett/octeon/usr.sbin/mergemaster/mergemaster.sh user/jmallett/octeon/usr.sbin/mixer/mixer.8 user/jmallett/octeon/usr.sbin/mount_portalfs/mount_portalfs.8 user/jmallett/octeon/usr.sbin/mountd/mountd.c user/jmallett/octeon/usr.sbin/moused/moused.8 user/jmallett/octeon/usr.sbin/mptable/mptable.1 user/jmallett/octeon/usr.sbin/mptutil/mptutil.8 user/jmallett/octeon/usr.sbin/mtree/mtree.5 user/jmallett/octeon/usr.sbin/mtree/mtree.8 user/jmallett/octeon/usr.sbin/newsyslog/newsyslog.8 user/jmallett/octeon/usr.sbin/nscd/nscd.8 user/jmallett/octeon/usr.sbin/nscd/nscd.conf.5 user/jmallett/octeon/usr.sbin/ntp/doc/ntpd.8 user/jmallett/octeon/usr.sbin/pkg_install/updating/pkg_updating.1 user/jmallett/octeon/usr.sbin/pmcstat/pmcpl_calltree.c user/jmallett/octeon/usr.sbin/pmcstat/pmcstat_log.c user/jmallett/octeon/usr.sbin/quotaon/Makefile user/jmallett/octeon/usr.sbin/quotaon/quotaon.c user/jmallett/octeon/usr.sbin/repquota/Makefile user/jmallett/octeon/usr.sbin/repquota/repquota.8 user/jmallett/octeon/usr.sbin/repquota/repquota.c user/jmallett/octeon/usr.sbin/rtadvd/rtadvd.8 user/jmallett/octeon/usr.sbin/rtprio/rtprio.1 user/jmallett/octeon/usr.sbin/rtsold/rtsold.8 user/jmallett/octeon/usr.sbin/sa/sa.8 user/jmallett/octeon/usr.sbin/snapinfo/snapinfo.8 user/jmallett/octeon/usr.sbin/sysinstall/network.c user/jmallett/octeon/usr.sbin/uathload/uathload.8 user/jmallett/octeon/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 Directory Properties: user/jmallett/octeon/ (props changed) user/jmallett/octeon/cddl/contrib/opensolaris/ (props changed) user/jmallett/octeon/contrib/bind9/ (props changed) user/jmallett/octeon/contrib/ee/ (props changed) user/jmallett/octeon/contrib/expat/ (props changed) user/jmallett/octeon/contrib/file/ (props changed) user/jmallett/octeon/contrib/gdb/ (props changed) user/jmallett/octeon/contrib/gdtoa/ (props changed) user/jmallett/octeon/contrib/gnu-sort/ (props changed) user/jmallett/octeon/contrib/groff/ (props changed) user/jmallett/octeon/contrib/less/ (props changed) user/jmallett/octeon/contrib/libpcap/ (props changed) user/jmallett/octeon/contrib/ncurses/ (props changed) user/jmallett/octeon/contrib/netcat/ (props changed) user/jmallett/octeon/contrib/ntp/ (props changed) user/jmallett/octeon/contrib/one-true-awk/ (props changed) user/jmallett/octeon/contrib/openbsm/ (props changed) user/jmallett/octeon/contrib/openpam/ (props changed) user/jmallett/octeon/contrib/pf/ (props changed) user/jmallett/octeon/contrib/sendmail/ (props changed) user/jmallett/octeon/contrib/tcpdump/ (props changed) user/jmallett/octeon/contrib/tcsh/ (props changed) user/jmallett/octeon/contrib/top/ (props changed) user/jmallett/octeon/contrib/top/install-sh (props changed) user/jmallett/octeon/contrib/tzcode/stdtime/ (props changed) user/jmallett/octeon/contrib/tzcode/zic/ (props changed) user/jmallett/octeon/contrib/tzdata/ (props changed) user/jmallett/octeon/contrib/wpa/ (props changed) user/jmallett/octeon/crypto/openssh/ (props changed) user/jmallett/octeon/crypto/openssl/ (props changed) user/jmallett/octeon/lib/libc/ (props changed) user/jmallett/octeon/lib/libc/stdtime/ (props changed) user/jmallett/octeon/lib/libutil/ (props changed) user/jmallett/octeon/lib/libz/ (props changed) user/jmallett/octeon/sbin/ (props changed) user/jmallett/octeon/sbin/ipfw/ (props changed) user/jmallett/octeon/share/man/man4/twa.4 (props changed) user/jmallett/octeon/share/zoneinfo/ (props changed) user/jmallett/octeon/sys/ (props changed) user/jmallett/octeon/sys/amd64/include/xen/ (props changed) user/jmallett/octeon/sys/cddl/contrib/opensolaris/ (props changed) user/jmallett/octeon/sys/contrib/dev/acpica/ (props changed) user/jmallett/octeon/sys/contrib/pf/ (props changed) user/jmallett/octeon/sys/contrib/x86emu/ (props changed) user/jmallett/octeon/sys/dev/xen/xenpci/ (props changed) user/jmallett/octeon/usr.bin/csup/ (props changed) user/jmallett/octeon/usr.bin/procstat/ (props changed) user/jmallett/octeon/usr.sbin/zic/ (props changed) Modified: user/jmallett/octeon/Makefile.inc1 ============================================================================== --- user/jmallett/octeon/Makefile.inc1 Wed May 26 18:36:23 2010 (r208575) +++ user/jmallett/octeon/Makefile.inc1 Wed May 26 18:50:16 2010 (r208576) @@ -1113,7 +1113,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 lib/libbz2 lib/libcom_err lib/libcrypt \ lib/libexpat lib/libfetch \ ${_lib_libgssapi} ${_lib_libipx} \ - lib/libkiconv lib/libkvm lib/libmd \ + lib/libkiconv lib/libkvm lib/liblzma lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus \ Modified: user/jmallett/octeon/ObsoleteFiles.inc ============================================================================== --- user/jmallett/octeon/ObsoleteFiles.inc Wed May 26 18:36:23 2010 (r208575) +++ user/jmallett/octeon/ObsoleteFiles.inc Wed May 26 18:50:16 2010 (r208576) @@ -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 <machine/psl.h> .if ${TARGET_ARCH} == "mips" OLD_FILES+=usr/include/machine/psl.h Modified: user/jmallett/octeon/UPDATING ============================================================================== --- user/jmallett/octeon/UPDATING Wed May 26 18:36:23 2010 (r208575) +++ user/jmallett/octeon/UPDATING Wed May 26 18:50:16 2010 (r208576) @@ -83,6 +83,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 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 Modified: user/jmallett/octeon/bin/pax/pat_rep.c ============================================================================== --- user/jmallett/octeon/bin/pax/pat_rep.c Wed May 26 18:36:23 2010 (r208575) +++ user/jmallett/octeon/bin/pax/pat_rep.c Wed May 26 18:50:16 2010 (r208576) @@ -76,7 +76,7 @@ static char * range_match(char *, int); #ifdef NET2_REGEX static int resub(regexp *, char *, char *, char *); #else -static int resub(regex_t *, regmatch_t *, char *, char *, char *); +static int resub(regex_t *, regmatch_t *, char *, char *, char *, char *); #endif /* @@ -929,7 +929,7 @@ rep_name(char *name, int *nlen, int prnt # ifdef NET2_REGEX if ((res = resub(pt->rcmp,pt->nstr,outpt,endpt)) < 0) { # else - if ((res = resub(&(pt->rcmp),pm,pt->nstr,outpt,endpt)) + if ((res = resub(&(pt->rcmp),pm,inpt,pt->nstr,outpt,endpt)) < 0) { # endif if (prnt) @@ -1071,7 +1071,7 @@ resub(regexp *prog, char *src, char *des */ static int -resub(regex_t *rp, regmatch_t *pm, char *src, char *dest, +resub(regex_t *rp, regmatch_t *pm, char *orig, char *src, char *dest, char *destend) { char *spt; @@ -1121,7 +1121,7 @@ resub(regex_t *rp, regmatch_t *pm, char */ if (len > (destend - dpt)) len = destend - dpt; - if (l_strncpy(dpt, src + pmpt->rm_so, len) != len) + if (l_strncpy(dpt, orig + pmpt->rm_so, len) != len) return(-1); dpt += len; } Modified: user/jmallett/octeon/bin/setfacl/setfacl.1 ============================================================================== --- user/jmallett/octeon/bin/setfacl/setfacl.1 Wed May 26 18:36:23 2010 (r208575) +++ user/jmallett/octeon/bin/setfacl/setfacl.1 Wed May 26 18:50:16 2010 (r208576) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 5, 2009 +.Dd May 13, 2010 .Dt SETFACL 1 .Os .Sh NAME @@ -453,8 +453,13 @@ as part of the .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 . Modified: user/jmallett/octeon/bin/sh/eval.c ============================================================================== --- user/jmallett/octeon/bin/sh/eval.c Wed May 26 18:36:23 2010 (r208575) +++ user/jmallett/octeon/bin/sh/eval.c Wed May 26 18:50:16 2010 (r208576) @@ -937,6 +937,8 @@ evalcommand(union node *cmd, int flags, cmdentry.special = 1; if (cmdentry.special) listsetvar(cmdenviron); + if (argc > 0) + bltinsetlocale(); commandname = argv[0]; argptr = argv + 1; nextopt_optptr = NULL; /* initialize nextopt */ @@ -944,6 +946,8 @@ evalcommand(union node *cmd, int flags, exitstatus = (*builtinfunc[cmdentry.u.index])(argc, argv); flushall(); cmddone: + if (argc > 0) + bltinunsetlocale(); cmdenviron = NULL; out1 = &output; out2 = &errout; @@ -1085,8 +1089,7 @@ breakcmd(int argc, char **argv) int commandcmd(int argc, char **argv) { - static char stdpath[] = _PATH_STDPATH; - char *path; + const char *path; int ch; int cmd = -1; @@ -1097,7 +1100,7 @@ commandcmd(int argc, char **argv) while ((ch = getopt(argc, argv, "pvV")) != -1) { switch (ch) { case 'p': - path = stdpath; + path = _PATH_STDPATH; break; case 'v': cmd = TYPECMD_SMALLV; Modified: user/jmallett/octeon/bin/sh/expand.c ============================================================================== --- user/jmallett/octeon/bin/sh/expand.c Wed May 26 18:36:23 2010 (r208575) +++ user/jmallett/octeon/bin/sh/expand.c Wed May 26 18:50:16 2010 (r208576) @@ -1,6 +1,8 @@ /*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. + * Copyright (c) 1997-2005 + * Herbert Xu <herbert@gondor.apana.org.au>. All rights reserved. * * This code is derived from software contributed to Berkeley by * Kenneth Almquist. @@ -1150,10 +1152,11 @@ expmeta(char *enddir, char *name) 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 @@ expmeta(char *enddir, char *name) 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 @@ expmeta(char *enddir, char *name) atend = 1; } else { atend = 0; - *endname++ = '\0'; + *endname = '\0'; + endname += esc + 1; } matchdot = 0; p = start; @@ -1257,7 +1263,7 @@ expmeta(char *enddir, char *name) } closedir(dirp); if (! atend) - endname[-1] = '/'; + endname[-esc - 1] = esc ? CTLESC : '/'; } Modified: user/jmallett/octeon/bin/sh/jobs.c ============================================================================== --- user/jmallett/octeon/bin/sh/jobs.c Wed May 26 18:36:23 2010 (r208575) +++ user/jmallett/octeon/bin/sh/jobs.c Wed May 26 18:50:16 2010 (r208576) @@ -91,6 +91,7 @@ STATIC void freejob(struct job *); STATIC struct job *getjob(char *); STATIC pid_t dowait(int, struct job *); STATIC pid_t waitproc(int, int *); +STATIC void checkzombies(void); STATIC void cmdtxt(union node *); STATIC void cmdputs(const char *); #if JOBS @@ -400,7 +401,7 @@ showjobs(int change, int mode) struct job *jp; TRACE(("showjobs(%d) called\n", change)); - while (dowait(0, (struct job *)NULL) > 0); + checkzombies(); for (jobno = 1, jp = jobtab ; jobno <= njobs ; jobno++, jp++) { if (! jp->used) continue; @@ -742,6 +743,8 @@ forkshell(struct job *jp, union node *n, TRACE(("forkshell(%%%d, %p, %d) called\n", jp - jobtab, (void *)n, mode)); INTOFF; + if (mode == FORK_BG) + checkzombies(); flushall(); pid = fork(); if (pid == -1) { @@ -1056,6 +1059,15 @@ stoppedjobs(void) return (0); } + +STATIC void +checkzombies(void) +{ + while (njobs > 0 && dowait(0, NULL) > 0) + ; +} + + /* * Return a string identifying a command (to be printed by the * jobs command. Modified: user/jmallett/octeon/bin/sh/sh.1 ============================================================================== --- user/jmallett/octeon/bin/sh/sh.1 Wed May 26 18:36:23 2010 (r208575) +++ user/jmallett/octeon/bin/sh/sh.1 Wed May 26 18:50:16 2010 (r208576) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd April 5, 2010 +.Dd May 24, 2010 .Dt SH 1 .Os .Sh NAME @@ -415,11 +415,11 @@ character, with the exception of the new .Pq Ql \en . A backslash preceding a newline is treated as a line continuation. .El -.Ss Reserved Words -Reserved words are words that have special meaning to the +.Ss Keywords +Keywords or reserved words are words that have special meaning to the shell and are recognized at the beginning of a line and after a control operator. -The following are reserved words: +The following are keywords: .Bl -column "doneXX" "elifXX" "elseXX" "untilXX" "whileX" -offset center .It Li \&! Ta { Ta } Ta Ic case Ta Ic do .It Ic done Ta Ic elif Ta Ic else Ta Ic esac Ta Ic fi @@ -429,8 +429,8 @@ The following are reserved words: An alias is a name and corresponding value set using the .Ic alias built-in command. -Whenever a reserved word may occur (see above), -and after checking for reserved words, the shell +Whenever a keyword may occur (see above), +and after checking for keywords, the shell checks the word to see if it matches an alias. If it does, it replaces it in the input stream with its value. For example, if there is an alias called @@ -469,7 +469,7 @@ of this man page (refer to the BNF in th document). Essentially though, a line is read and if the first word of the line (or after a control operator) -is not a reserved word, then the shell has recognized a +is not a keyword, then the shell has recognized a simple command. Otherwise, a complex command or some other special construct may have been recognized. @@ -665,11 +665,11 @@ Command names containing a slash are sim performing any searches. .It The shell searches each entry in the -.Ev PATH -environment variable +.Va PATH +variable in turn for the command. The value of the -.Ev PATH +.Va PATH variable should be a series of entries separated by colons. Each entry consists of a @@ -695,7 +695,7 @@ Signal numbers are defined in the header .In sys/signal.h . .Ss Complex Commands Complex commands are combinations of simple commands -with control operators or reserved words, together creating a larger complex +with control operators or keywords, together creating a larger complex command. More generally, a command is one of the following: .Bl -item -offset indent @@ -739,7 +739,7 @@ operators that are part of the command. If the pipeline is not in the background (discussed later), the shell waits for all commands to complete. .Pp -If the reserved word +If the keyword .Ic !\& does not precede the pipeline, the exit status is the exit status of the last command specified @@ -1040,13 +1040,9 @@ The .Ic set built-in command can also be used to set or reset them. .Ss Special Parameters -A special parameter is a parameter denoted by a special one-character -name. -The special parameters recognized by the -.Nm -shell of -.Fx -are shown in the following list, exactly as they would appear in input +Special parameters are parameters denoted by a single special character +or the digit zero. +They are shown in the following list, exactly as they would appear in input typed by the user or in the source of a shell script. .Bl -hang .It Li $* @@ -1113,6 +1109,84 @@ pipeline. .It Li $0 (zero) Expands to the name of the shell or shell script. .El +.Ss Special Variables +The following variables are set by the shell or +have special meaning to it: +.Bl -tag -width ".Va HISTSIZE" +.It Va CDPATH +The search path used with the +.Ic cd +built-in. +.It Va EDITOR +The fallback editor used with the +.Ic fc +built-in. +If not set, the default editor is +.Xr ed 1 . +.It Va FCEDIT +The default editor used with the +.Ic fc +built-in. +.It Va HISTSIZE +The number of previous commands that are accessible. +.It Va HOME +The user's home directory, +used in tilde expansion and as a default directory for the +.Ic cd +built-in. +.It Va IFS +Input Field Separators. +This is normally set to +.Aq space , +.Aq tab , +and +.Aq newline . +See the +.Sx White Space Splitting +section for more details. +.It Va LINENO +The current line number in the script or function. +.It Va MAIL +The name of a mail file, that will be checked for the arrival of new +mail. +Overridden by +.Va MAILPATH . +.It Va MAILPATH +A colon +.Pq Ql \&: +separated list of file names, for the shell to check for incoming +mail. +This variable overrides the +.Va MAIL +setting. +There is a maximum of 10 mailboxes that can be monitored at once. +.It Va PATH +The default search path for executables. +See the +.Sx Path Search +section for details. +.It Va PPID +The parent process ID of the invoked shell. +This is set at startup +unless this variable is in the environment. +A later change of parent process ID is not reflected. +A subshell retains the same value of +.Va PPID . +.It Va PS1 +The primary prompt string, which defaults to +.Dq Li "$ " , +unless you are the superuser, in which case it defaults to +.Dq Li "# " . +.It Va PS2 +The secondary prompt string, which defaults to +.Dq Li "> " . +.It Va PS4 +The prefix for the trace output (if +.Fl x +is active). +The default is +.Dq Li "+ " . +.El .Ss Word Expansions This clause describes the various expansions that are performed on words. @@ -1166,7 +1240,7 @@ If the username is missing (as in .Pa ~/foobar ) , the tilde is replaced with the value of the -.Ev HOME +.Va HOME variable (the current user's home directory). .Ss Parameter Expansion The format for parameter expansion is as follows: @@ -1491,10 +1565,10 @@ contains any .Ql / characters, it is used as is. Otherwise, the shell searches the -.Ev PATH +.Va PATH for the file. If it is not found in the -.Ev PATH , +.Va PATH , it is sought in the current working directory. .It Ic \&[ A built-in equivalent of @@ -1538,7 +1612,7 @@ This command is documented in Switch to the specified .Ar directory , or to the directory specified in the -.Ev HOME +.Va HOME environment variable if no .Ar directory is specified. @@ -1549,17 +1623,17 @@ does not begin with or .Pa .. , then the directories listed in the -.Ev CDPATH +.Va CDPATH variable will be searched for the specified .Ar directory . If -.Ev CDPATH +.Va CDPATH is unset, the current directory is searched. The format of -.Ev CDPATH +.Va CDPATH is the same as that of -.Ev PATH . +.Va PATH . In an interactive shell, the .Ic cd @@ -1567,7 +1641,7 @@ command will print out the name of the d that it actually switched to if this is different from the name that the user gave. These may be different either because the -.Ev CDPATH +.Va CDPATH mechanism was used or because a symbolic link was crossed. .Pp If the @@ -1601,7 +1675,7 @@ If the .Fl p option is specified, the command search is performed using a default value of -.Ev PATH +.Va PATH that is guaranteed to find all of the standard utilities. .Pp If the @@ -1760,20 +1834,20 @@ The .Ar editor string is a command name, subject to search via the -.Ev PATH +.Va PATH variable. The value in the -.Ev FCEDIT +.Va FCEDIT variable is used as a default when .Fl e is not specified. If -.Ev FCEDIT +.Va FCEDIT is null or unset, the value of the -.Ev EDITOR +.Va EDITOR variable is used. If -.Ev EDITOR +.Va EDITOR is null or unset, .Xr ed 1 is used as the editor. @@ -1807,7 +1881,7 @@ Re-execute the command without invoking Select the commands to list or edit. The number of previous commands that can be accessed are determined by the value of the -.Ev HISTSIZE +.Va HISTSIZE variable. The value of .Ar first @@ -1838,12 +1912,12 @@ the string form of the first operand can .El .El .Pp -The following environment variables affect the execution of +The following variables affect the execution of .Ic fc : -.Bl -tag -width ".Ev HISTSIZE" -.It Ev FCEDIT +.Bl -tag -width ".Va HISTSIZE" +.It Va FCEDIT Name of the editor to use for history editing. -.It Ev HISTSIZE +.It Va HISTSIZE The number of previous commands that are accessible. .El .It Ic fg Op Ar job @@ -2309,74 +2383,27 @@ command line editing features. .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : -.Bl -tag -width ".Ev HISTSIZE" -.It Ev CDPATH -The search path used with the -.Ic cd -built-in. -.It Ev EDITOR -The fallback editor used with the -.Ic fc -built-in. -If not set, the default editor is -.Xr ed 1 . -.It Ev FCEDIT -The default editor used with the -.Ic fc -built-in. -.It Ev HISTSIZE -The number of previous commands that are accessible. -.It Ev HOME -The starting directory of -.Nm . -.It Ev IFS -Input Field Separators. -This is normally set to -.Aq space , -.Aq tab , -and -.Aq newline . -See the -.Sx White Space Splitting -section for more details. -.It Ev MAIL -The name of a mail file, that will be checked for the arrival of new -mail. -Overridden by -.Ev MAILPATH . -.It Ev MAILPATH -A colon -.Pq Ql \&: -separated list of file names, for the shell to check for incoming -mail. -This environment setting overrides the -.Ev MAIL -setting. -There is a maximum of 10 mailboxes that can be monitored at once. -.It Ev PATH -The default search path for executables. -See the -.Sx Path Search -section for details. -.It Ev PS1 -The primary prompt string, which defaults to -.Dq Li "$ " , -unless you are the superuser, in which case it defaults to -.Dq Li "# " . -.It Ev PS2 -The secondary prompt string, which defaults to -.Dq Li "> " . -.It Ev PS4 -The prefix for the trace output (if -.Fl x -is active). -The default is -.Dq Li "+ " . +.Bl -tag -width ".Ev LANGXXXXXX" +.It Ev ENV +Initialization file for interactive shells. +.It Ev LANG , Ev LC_* +Locale settings. +These are inherited by children of the shell, +and is used in a limited manner by the shell itself. +.It Ev PWD +An absolute pathname for the current directory, +possibly containing symbolic links. +This is used and updated by the shell. .It Ev TERM The default terminal setting for the shell. This is inherited by children of the shell, and is used in the history editing modes. .El +.Pp +Additionally, all environment variables are turned into shell variables +at startup, +which may affect the shell as described under +.Sx Special Variables . .Sh EXIT STATUS Errors that are detected by the shell, such as a syntax error, will cause the shell to exit with a non-zero exit status. Modified: user/jmallett/octeon/bin/sh/var.c ============================================================================== --- user/jmallett/octeon/bin/sh/var.c Wed May 26 18:36:23 2010 (r208575) +++ user/jmallett/octeon/bin/sh/var.c Wed May 26 18:50:16 2010 (r208576) @@ -122,6 +122,14 @@ STATIC const struct varinit varinit[] = STATIC struct var *vartab[VTABSIZE]; +STATIC const char *const locale_names[7] = { + "LC_COLLATE", "LC_CTYPE", "LC_MONETARY", + "LC_NUMERIC", "LC_TIME", "LC_MESSAGES", NULL +}; +STATIC const int locale_categories[7] = { + LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, LC_TIME, LC_MESSAGES, 0 +}; + STATIC struct var **hashvar(const char *); STATIC int varequal(const char *, const char *); STATIC int localevar(const char *); @@ -258,11 +266,7 @@ setvar(const char *name, const char *val STATIC int localevar(const char *s) { - static const char *lnames[7] = { - "ALL", "COLLATE", "CTYPE", "MONETARY", - "NUMERIC", "TIME", NULL - }; - const char **ss; + const char *const *ss; if (*s != 'L') return 0; @@ -270,8 +274,10 @@ localevar(const char *s) return 1; if (strncmp(s + 1, "C_", 2) != 0) return 0; - for (ss = lnames; *ss ; ss++) - if (varequal(s + 3, *ss)) + if (varequal(s + 3, "ALL")) + return 1; + for (ss = locale_names; *ss ; ss++) + if (varequal(s + 3, *ss + 3)) return 1; return 0; } @@ -437,6 +443,61 @@ bltinlookup(const char *name, int doall) } +/* + * Set up locale for a builtin (LANG/LC_* assignments). + */ +void +bltinsetlocale(void) +{ + struct strlist *lp; + int act = 0; + char *loc, *locdef; + int i; + + for (lp = cmdenviron ; lp ; lp = lp->next) { + if (localevar(lp->text)) { + act = 1; + break; + } + } + if (!act) + return; + loc = bltinlookup("LC_ALL", 0); + INTOFF; + if (loc != NULL) { + setlocale(LC_ALL, loc); + INTON; + return; + } + locdef = bltinlookup("LANG", 0); + for (i = 0; locale_names[i] != NULL; i++) { + loc = bltinlookup(locale_names[i], 0); + if (loc == NULL) + loc = locdef; + if (loc != NULL) + setlocale(locale_categories[i], loc); + } + INTON; +} + +/* + * Undo the effect of bltinlocaleset(). + */ +void +bltinunsetlocale(void) +{ + struct strlist *lp; + + INTOFF; + for (lp = cmdenviron ; lp ; lp = lp->next) { + if (localevar(lp->text)) { + setlocale(LC_ALL, ""); + return; + } + } + INTON; +} + /* * Generate a list of exported variables. This routine is used to construct Modified: user/jmallett/octeon/bin/sh/var.h ============================================================================== --- user/jmallett/octeon/bin/sh/var.h Wed May 26 18:36:23 2010 (r208575) +++ user/jmallett/octeon/bin/sh/var.h Wed May 26 18:50:16 2010 (r208576) @@ -107,6 +107,8 @@ struct strlist; void listsetvar(struct strlist *); char *lookupvar(const char *); char *bltinlookup(const char *, int); +void bltinsetlocale(void); +void bltinunsetlocale(void); char **environment(void); int showvarscmd(int, char **); int exportcmd(int, char **); Modified: user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb.c Wed May 26 18:36:23 2010 (r208575) +++ user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb.c Wed May 26 18:50:16 2010 (r208576) @@ -50,6 +50,7 @@ #include <sys/zio_checksum.h> #include <sys/zio_compress.h> #include <sys/zfs_fuid.h> +#include <sys/arc.h> #undef ZFS_MAXNAMELEN #undef verify #include <libzfs.h> @@ -62,8 +63,6 @@ typedef void object_viewer_t(objset_t *, 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 @@ static void 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 @@ usage(void) "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 [!]<pre|post|prune|data|holes> " - "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 @@ fatal(const char *fmt, ...) va_end(ap); (void) fprintf(stderr, "\n"); - exit(1); + abort(); } static void @@ -571,7 +565,7 @@ dump_dnode(objset_t *os, uint64_t object } 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 @@ sprintf_blkptr_compact(char *blkbuf, blk (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; - } - - 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); - } - - if (zb->zb_level > 0) { - uint64_t fill = 0; - blkptr_t *bpx, *bpend; - - 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); - } - } - ASSERT3U(fill, ==, bp->blk_fill); - } + ASSERT3U(BP_GET_TYPE(bp), ==, dnp->dn_type); + ASSERT3U(BP_GET_LEVEL(bp), ==, zb->zb_level); - if (zb->zb_level == 0 && dnp->dn_type == DMU_OT_DNODE) { - 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); - } - - (void) sprintf(blkbuf, "%16llx ", + (void) printf("%16llx ", (u_longlong_t)blkid2offset(dnp, zb->zb_level, zb->zb_blkid)); 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); + (void) printf("L%llx", (u_longlong_t)zb->zb_level); } else { - (void) sprintf(blkbuf + strlen(blkbuf), " "); + (void) printf(" "); } } -out: - if (bp->blk_birth == 0) { - (void) sprintf(blkbuf + strlen(blkbuf), "<hole>"); - (void) printf("%s\n", blkbuf); - } else { - sprintf_blkptr_compact(blkbuf + strlen(blkbuf), bp, - dump_opt['d'] > 5 ? 1 : 0); - (void) printf("%s\n", blkbuf); + 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; + + err = arc_read_nolock(NULL, spa, bp, arc_getbuf_func, &buf, + ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, zb); + if (err) + return (err); + + /* recursively visit blocks below this */ + cbp = buf->b_data; + for (i = 0; i < epb; i++, cbp++) { + zbookmark_t czb; + + 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); } - 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"); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005261850.o4QIoHFN029109>