Date: Thu, 26 Dec 2013 05:54:59 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r259909 - in projects/altix2: . bin/pax bin/sh bin/sh/tests/parameters cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zhack cddl/contrib/... Message-ID: <201312260554.rBQ5sx8u013192@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Thu Dec 26 05:54:58 2013 New Revision: 259909 URL: http://svnweb.freebsd.org/changeset/base/259909 Log: Merge ^/head@259908 Added: projects/altix2/bin/sh/tests/parameters/optind2.0 - copied unchanged from r259908, head/bin/sh/tests/parameters/optind2.0 projects/altix2/contrib/gcclibs/libcpp/ChangeLog.apple - copied unchanged from r259908, head/contrib/gcclibs/libcpp/ChangeLog.apple projects/altix2/etc/rc.d/casperd - copied unchanged from r259908, head/etc/rc.d/casperd projects/altix2/lib/clang/include/PPCGenAsmMatcher.inc - copied unchanged from r259908, head/lib/clang/include/PPCGenAsmMatcher.inc projects/altix2/lib/clang/libllvmpowerpcasmparser/ - copied from r259908, head/lib/clang/libllvmpowerpcasmparser/ projects/altix2/sys/amd64/vmm/io/vlapic_priv.h - copied unchanged from r259908, head/sys/amd64/vmm/io/vlapic_priv.h projects/altix2/sys/arm/broadcom/bcm2835/bcm2835_fbd.c - copied unchanged from r259908, head/sys/arm/broadcom/bcm2835/bcm2835_fbd.c projects/altix2/sys/arm/freescale/imx/imx51_ipuv3_fbd.c - copied unchanged from r259908, head/sys/arm/freescale/imx/imx51_ipuv3_fbd.c projects/altix2/usr.sbin/bhyve/pm.c - copied unchanged from r259908, head/usr.sbin/bhyve/pm.c Deleted: projects/altix2/sys/i386/i386/symbols.raw Modified: projects/altix2/UPDATING projects/altix2/bin/pax/pax.1 projects/altix2/bin/sh/tests/parameters/Makefile projects/altix2/bin/sh/var.c projects/altix2/bin/sh/var.h projects/altix2/cddl/contrib/opensolaris/cmd/zdb/zdb.c projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/altix2/cddl/contrib/opensolaris/cmd/zhack/zhack.c projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/altix2/contrib/file/compress.c projects/altix2/contrib/gcc/ChangeLog.gcc43 projects/altix2/contrib/gcc/c-common.c projects/altix2/contrib/gcc/c-convert.c projects/altix2/contrib/gcc/c-incpath.c projects/altix2/contrib/gcc/c-opts.c projects/altix2/contrib/gcc/c-typeck.c projects/altix2/contrib/gcc/c.opt projects/altix2/contrib/gcc/calls.c projects/altix2/contrib/gcc/cfg.c projects/altix2/contrib/gcc/collect2.c projects/altix2/contrib/gcc/config/arm/arm.c projects/altix2/contrib/gcc/config/arm/arm.md projects/altix2/contrib/gcc/config/darwin.c projects/altix2/contrib/gcc/config/darwin.h projects/altix2/contrib/gcc/config/rs6000/rs6000.c projects/altix2/contrib/gcc/cp/ChangeLog.gcc43 projects/altix2/contrib/gcc/cp/Make-lang.in projects/altix2/contrib/gcc/cp/cvt.c projects/altix2/contrib/gcc/cp/decl.c projects/altix2/contrib/gcc/cp/mangle.c projects/altix2/contrib/gcc/cp/method.c projects/altix2/contrib/gcc/cp/parser.c projects/altix2/contrib/gcc/cp/pt.c projects/altix2/contrib/gcc/cp/rtti.c projects/altix2/contrib/gcc/cp/typeck.c projects/altix2/contrib/gcc/doc/cppopts.texi projects/altix2/contrib/gcc/doc/invoke.texi projects/altix2/contrib/gcc/doc/tm.texi projects/altix2/contrib/gcc/dwarf2out.c projects/altix2/contrib/gcc/fold-const.c projects/altix2/contrib/gcc/gcc.c projects/altix2/contrib/gcc/gcov.c projects/altix2/contrib/gcc/sched-vis.c projects/altix2/contrib/gcc/target-def.h projects/altix2/contrib/gcc/target.h projects/altix2/contrib/gcc/tlink.c projects/altix2/contrib/gcc/tree-dump.c projects/altix2/contrib/gcc/version.c projects/altix2/contrib/gcclibs/libcpp/charset.c projects/altix2/contrib/gcclibs/libcpp/include/cpplib.h projects/altix2/contrib/gcclibs/libcpp/init.c projects/altix2/contrib/gcclibs/libcpp/lex.c projects/altix2/contrib/gperf/lib/getline.cc projects/altix2/contrib/llvm/lib/Target/X86/X86InstrMMX.td projects/altix2/contrib/llvm/tools/clang/lib/Headers/cpuid.h projects/altix2/contrib/tcpdump/addrtoname.c projects/altix2/contrib/tcpdump/tcpdump.c projects/altix2/contrib/tzcode/stdtime/tzfile.5 projects/altix2/contrib/tzdata/asia projects/altix2/contrib/tzdata/northamerica projects/altix2/etc/defaults/rc.conf projects/altix2/etc/rc.d/Makefile projects/altix2/gnu/lib/csu/Makefile projects/altix2/gnu/lib/libgcc/Makefile projects/altix2/gnu/lib/libstdc++/Makefile projects/altix2/gnu/lib/libsupc++/Makefile projects/altix2/kerberos5/lib/Makefile projects/altix2/kerberos5/lib/libkafs5/Makefile projects/altix2/lib/atf/libatf-c/tests/Makefile projects/altix2/lib/clang/Makefile projects/altix2/lib/clang/include/llvm/Config/AsmParsers.def projects/altix2/lib/libc/sys/shm_open.2 projects/altix2/lib/libc/sys/swapon.2 projects/altix2/lib/libdevstat/devstat.c projects/altix2/lib/libstand/close.c projects/altix2/lib/libstand/dosfs.c projects/altix2/lib/libstand/dosfs.h projects/altix2/lib/libstand/environment.c projects/altix2/lib/libvmmapi/vmmapi.c projects/altix2/lib/libvmmapi/vmmapi.h projects/altix2/release/Makefile projects/altix2/release/doc/Makefile projects/altix2/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/altix2/release/doc/share/xml/release.ent projects/altix2/release/rc.local projects/altix2/release/release.sh projects/altix2/sbin/ipfw/ipfw.8 projects/altix2/sbin/iscontrol/iscsi.conf.5 projects/altix2/sbin/swapon/swapon.c projects/altix2/share/man/man4/arcmsr.4 projects/altix2/share/man/man4/cxgbe.4 projects/altix2/share/man/man5/hosts.5 projects/altix2/share/man/man5/hosts.equiv.5 projects/altix2/share/man/man5/nsswitch.conf.5 projects/altix2/share/man/man5/periodic.conf.5 projects/altix2/share/man/man5/rc.conf.5 projects/altix2/share/man/man5/resolver.5 projects/altix2/share/man/man7/hier.7 projects/altix2/share/man/man7/hostname.7 projects/altix2/share/man/man7/security.7 projects/altix2/share/man/man8/rc.8 projects/altix2/share/man/man9/Makefile projects/altix2/share/man/man9/mbuf.9 projects/altix2/share/misc/committers-ports.dot projects/altix2/share/misc/committers-src.dot projects/altix2/share/mk/bsd.own.mk projects/altix2/share/mk/bsd.sys.mk projects/altix2/sys/amd64/amd64/machdep.c projects/altix2/sys/amd64/amd64/mp_machdep.c projects/altix2/sys/amd64/amd64/pmap.c projects/altix2/sys/amd64/include/cpu.h projects/altix2/sys/amd64/include/pmap.h projects/altix2/sys/amd64/include/vmm.h (contents, props changed) projects/altix2/sys/amd64/include/vmm_dev.h (contents, props changed) projects/altix2/sys/amd64/vmm/amd/amdv.c projects/altix2/sys/amd64/vmm/intel/ept.c projects/altix2/sys/amd64/vmm/intel/vmcs.c projects/altix2/sys/amd64/vmm/intel/vmcs.h projects/altix2/sys/amd64/vmm/intel/vmx.c projects/altix2/sys/amd64/vmm/intel/vmx.h projects/altix2/sys/amd64/vmm/intel/vmx_genassym.c projects/altix2/sys/amd64/vmm/io/ppt.c projects/altix2/sys/amd64/vmm/io/ppt.h projects/altix2/sys/amd64/vmm/io/vhpet.c projects/altix2/sys/amd64/vmm/io/vioapic.c projects/altix2/sys/amd64/vmm/io/vlapic.c projects/altix2/sys/amd64/vmm/io/vlapic.h projects/altix2/sys/amd64/vmm/vmm.c projects/altix2/sys/amd64/vmm/vmm_dev.c projects/altix2/sys/amd64/vmm/vmm_lapic.c projects/altix2/sys/amd64/vmm/vmm_lapic.h projects/altix2/sys/arm/arm/cpufunc.c projects/altix2/sys/arm/arm/elf_trampoline.c projects/altix2/sys/arm/arm/identcpu.c projects/altix2/sys/arm/arm/locore.S projects/altix2/sys/arm/arm/swtch.S projects/altix2/sys/arm/at91/uart_dev_at91usart.c projects/altix2/sys/arm/broadcom/bcm2835/files.bcm2835 projects/altix2/sys/arm/conf/RPI-B projects/altix2/sys/arm/freescale/imx/files.imx51 projects/altix2/sys/arm/include/armreg.h projects/altix2/sys/arm/include/cpuconf.h projects/altix2/sys/arm/include/cpufunc.h projects/altix2/sys/arm/include/intr.h projects/altix2/sys/arm/include/md_var.h projects/altix2/sys/arm/mv/mv_pci.c projects/altix2/sys/arm/ti/am335x/am335x_dmtimer.c projects/altix2/sys/boot/ia64/efi/version projects/altix2/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c projects/altix2/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/altix2/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c projects/altix2/sys/cddl/dev/fbt/fbt_powerpc.c projects/altix2/sys/conf/Makefile.arm projects/altix2/sys/conf/files.arm projects/altix2/sys/conf/options.arm projects/altix2/sys/dev/advansys/adwcam.c projects/altix2/sys/dev/ae/if_ae.c projects/altix2/sys/dev/aic7xxx/aic79xx.c projects/altix2/sys/dev/aic7xxx/aic7xxx.c projects/altix2/sys/dev/arcmsr/arcmsr.c projects/altix2/sys/dev/arcmsr/arcmsr.h projects/altix2/sys/dev/cxgb/common/cxgb_mc5.c projects/altix2/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/altix2/sys/dev/cxgbe/tom/t4_listen.c projects/altix2/sys/dev/cxgbe/tom/t4_tom.h projects/altix2/sys/dev/drm/mach64_dma.c projects/altix2/sys/dev/drm2/drm_edid.c projects/altix2/sys/dev/drm2/radeon/radeon_fence.c projects/altix2/sys/dev/drm2/radeon/radeon_sa.c projects/altix2/sys/dev/drm2/ttm/ttm_bo.c projects/altix2/sys/dev/drm2/ttm/ttm_bo_vm.c projects/altix2/sys/dev/drm2/ttm/ttm_lock.c projects/altix2/sys/dev/e1000/if_lem.c projects/altix2/sys/dev/fb/fbd.c projects/altix2/sys/dev/fdt/fdt_common.h projects/altix2/sys/dev/fdt/fdt_pci.c projects/altix2/sys/dev/hwpmc/hwpmc_core.c projects/altix2/sys/dev/hwpmc/hwpmc_core.h projects/altix2/sys/dev/hwpmc/hwpmc_intel.c projects/altix2/sys/dev/ie/if_ie.c projects/altix2/sys/dev/isp/isp.c projects/altix2/sys/dev/isp/isp_freebsd.c projects/altix2/sys/dev/ixgbe/ixgbe.c projects/altix2/sys/dev/mwl/if_mwl.c projects/altix2/sys/dev/netmap/ixgbe_netmap.h projects/altix2/sys/dev/netmap/netmap.c projects/altix2/sys/dev/netmap/netmap_kern.h projects/altix2/sys/dev/netmap/netmap_vale.c projects/altix2/sys/dev/nmdm/nmdm.c projects/altix2/sys/dev/ofw/ofw_bus_subr.c projects/altix2/sys/dev/ofw/ofw_bus_subr.h projects/altix2/sys/dev/pci/vga_pci.c projects/altix2/sys/dev/sym/sym_hipd.c projects/altix2/sys/dev/syscons/scterm-teken.c projects/altix2/sys/dev/uart/uart_bus_pci.c projects/altix2/sys/dev/uart/uart_cpu.h projects/altix2/sys/dev/uart/uart_tty.c projects/altix2/sys/dev/usb/controller/xhci.c projects/altix2/sys/dev/usb/quirk/usb_quirk.c projects/altix2/sys/dev/usb/usbdevs projects/altix2/sys/dev/usb/wlan/if_run.c projects/altix2/sys/dev/usb/wlan/if_runreg.h projects/altix2/sys/dev/usb/wlan/if_runvar.h projects/altix2/sys/dev/vt/font/vt_font_default.c projects/altix2/sys/dev/vt/hw/fb/vt_fb.c projects/altix2/sys/dev/vt/vt.h projects/altix2/sys/dev/vt/vt_consolectl.c projects/altix2/sys/dev/vt/vt_core.c projects/altix2/sys/dev/vt/vt_font.c projects/altix2/sys/dev/vt/vt_sysmouse.c projects/altix2/sys/fs/ext2fs/ext2_hash.c projects/altix2/sys/fs/fifofs/fifo_vnops.c projects/altix2/sys/fs/nfs/nfs_commonsubs.c projects/altix2/sys/fs/nfs/nfs_var.h projects/altix2/sys/fs/nfsclient/nfs_clstate.c projects/altix2/sys/fs/nfsserver/nfs_fha_new.c projects/altix2/sys/fs/nfsserver/nfs_nfsdcache.c projects/altix2/sys/fs/nfsserver/nfs_nfsdport.c projects/altix2/sys/fs/nfsserver/nfs_nfsdstate.c projects/altix2/sys/geom/mirror/g_mirror_ctl.c projects/altix2/sys/kern/kern_clocksource.c projects/altix2/sys/kern/kern_event.c projects/altix2/sys/kern/kern_fork.c projects/altix2/sys/kern/kern_jail.c projects/altix2/sys/kern/kern_linker.c projects/altix2/sys/kern/kern_rwlock.c projects/altix2/sys/kern/sched_ule.c projects/altix2/sys/kern/subr_terminal.c projects/altix2/sys/kern/subr_trap.c projects/altix2/sys/kern/subr_witness.c projects/altix2/sys/kern/tty.c projects/altix2/sys/kern/uipc_syscalls.c projects/altix2/sys/kern/vfs_mountroot.c projects/altix2/sys/kern/vfs_vnops.c projects/altix2/sys/net/radix.c projects/altix2/sys/netgraph/ng_ksocket.c projects/altix2/sys/netinet/in.h projects/altix2/sys/netinet/in_mcast.c projects/altix2/sys/netinet/ip_output.c projects/altix2/sys/netinet/libalias/alias.c projects/altix2/sys/netinet/libalias/alias_cuseeme.c projects/altix2/sys/netinet/libalias/alias_db.c projects/altix2/sys/netinet/libalias/alias_dummy.c projects/altix2/sys/netinet/libalias/alias_irc.c projects/altix2/sys/netinet/libalias/alias_mod.c projects/altix2/sys/netinet/libalias/alias_mod.h projects/altix2/sys/netinet/libalias/alias_nbt.c projects/altix2/sys/netinet/libalias/alias_pptp.c projects/altix2/sys/netinet/libalias/alias_skinny.c projects/altix2/sys/netinet/libalias/alias_smedia.c projects/altix2/sys/netinet/libalias/libalias.3 projects/altix2/sys/netinet/tcp_input.c projects/altix2/sys/netinet6/in6_mcast.c projects/altix2/sys/netinet6/send.c projects/altix2/sys/netpfil/ipfw/ip_fw_dynamic.c projects/altix2/sys/netpfil/pf/pf.c projects/altix2/sys/netpfil/pf/pf.h projects/altix2/sys/nfs/nfs_fha.c projects/altix2/sys/nfs/nfs_fha.h projects/altix2/sys/nfsserver/nfs_fha_old.c projects/altix2/sys/powerpc/include/openpicreg.h projects/altix2/sys/powerpc/include/openpicvar.h projects/altix2/sys/powerpc/include/pmc_mdep.h projects/altix2/sys/powerpc/ofw/ofw_pci.c projects/altix2/sys/powerpc/ofw/ofw_pcib_pci.c projects/altix2/sys/powerpc/ofw/openpic_ofw.c projects/altix2/sys/powerpc/powermac/ata_macio.c projects/altix2/sys/powerpc/powermac/atibl.c projects/altix2/sys/powerpc/powermac/cpcht.c projects/altix2/sys/powerpc/powermac/dbdma.c projects/altix2/sys/powerpc/powermac/dbdmavar.h projects/altix2/sys/powerpc/powerpc/openpic.c projects/altix2/sys/powerpc/psim/openpic_iobus.c projects/altix2/sys/rpc/clnt_dg.c projects/altix2/sys/rpc/clnt_vc.c projects/altix2/sys/rpc/rpcb_clnt.c projects/altix2/sys/rpc/svc.c projects/altix2/sys/rpc/svc.h projects/altix2/sys/rpc/svc_vc.c projects/altix2/sys/security/mac/mac_framework.c projects/altix2/sys/sparc64/ebus/ebus.c projects/altix2/sys/sparc64/isa/ofw_isa.c projects/altix2/sys/sparc64/pci/fire.c projects/altix2/sys/sparc64/pci/ofw_pcib_subr.c projects/altix2/sys/sparc64/pci/psycho.c projects/altix2/sys/sparc64/pci/schizo.c projects/altix2/sys/sys/consio.h projects/altix2/sys/sys/dtrace_bsd.h projects/altix2/sys/sys/fbio.h projects/altix2/sys/sys/terminal.h projects/altix2/sys/sys/tty.h projects/altix2/sys/teken/demo/teken_demo.c projects/altix2/sys/teken/teken.h projects/altix2/sys/teken/teken_subr.h projects/altix2/sys/vm/vm_pageout.c projects/altix2/sys/x86/acpica/acpi_wakeup.c projects/altix2/tools/build/mk/OptionalObsoleteFiles.inc projects/altix2/tools/tools/ath/athstats/Makefile projects/altix2/tools/tools/net80211/wlanstats/Makefile projects/altix2/tools/tools/vt/fontcvt/fontcvt.c projects/altix2/tools/tools/vt/mkkfont/mkkfont.c projects/altix2/tools/tools/vt/setfont/setfont.c projects/altix2/usr.bin/clang/clang/Makefile projects/altix2/usr.bin/clang/llc/Makefile projects/altix2/usr.bin/clang/lldb/Makefile projects/altix2/usr.bin/clang/llvm-mc/Makefile projects/altix2/usr.bin/clang/llvm-objdump/Makefile projects/altix2/usr.bin/clang/llvm-rtdyld/Makefile projects/altix2/usr.bin/clang/opt/Makefile projects/altix2/usr.bin/kdump/kdump.c projects/altix2/usr.bin/mkcsmapper/Makefile.inc projects/altix2/usr.bin/netstat/if.c projects/altix2/usr.bin/netstat/main.c projects/altix2/usr.bin/netstat/mroute.c projects/altix2/usr.bin/netstat/mroute6.c projects/altix2/usr.bin/netstat/netgraph.c projects/altix2/usr.bin/netstat/netstat.h projects/altix2/usr.bin/netstat/route.c projects/altix2/usr.bin/sort/radixsort.c projects/altix2/usr.sbin/bhyve/Makefile projects/altix2/usr.sbin/bhyve/acpi.c projects/altix2/usr.sbin/bhyve/bhyve.8 projects/altix2/usr.sbin/bhyve/bhyverun.c projects/altix2/usr.sbin/bhyve/inout.h projects/altix2/usr.sbin/bhyve/mptbl.c projects/altix2/usr.sbin/bhyve/pci_emul.c projects/altix2/usr.sbin/bhyve/pci_emul.h projects/altix2/usr.sbin/bhyve/pci_passthru.c projects/altix2/usr.sbin/bhyve/xmsr.c projects/altix2/usr.sbin/bhyve/xmsr.h projects/altix2/usr.sbin/bhyvectl/bhyvectl.c projects/altix2/usr.sbin/bsdinstall/scripts/auto projects/altix2/usr.sbin/bsdinstall/scripts/config projects/altix2/usr.sbin/bsdinstall/scripts/zfsboot projects/altix2/usr.sbin/crashinfo/crashinfo.sh projects/altix2/usr.sbin/ndiscvt/ndisgen.sh projects/altix2/usr.sbin/pkg/pkg.c Directory Properties: projects/altix2/ (props changed) projects/altix2/cddl/ (props changed) projects/altix2/cddl/contrib/opensolaris/ (props changed) projects/altix2/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/altix2/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/altix2/contrib/file/ (props changed) projects/altix2/contrib/gcc/ (props changed) projects/altix2/contrib/llvm/ (props changed) projects/altix2/contrib/llvm/tools/clang/ (props changed) projects/altix2/contrib/tcpdump/ (props changed) projects/altix2/contrib/tzcode/stdtime/ (props changed) projects/altix2/contrib/tzdata/ (props changed) projects/altix2/etc/ (props changed) projects/altix2/gnu/lib/ (props changed) projects/altix2/lib/libc/ (props changed) projects/altix2/lib/libvmmapi/ (props changed) projects/altix2/sbin/ (props changed) projects/altix2/sbin/ipfw/ (props changed) projects/altix2/share/man/man4/ (props changed) projects/altix2/sys/ (props changed) projects/altix2/sys/amd64/vmm/ (props changed) projects/altix2/sys/boot/ (props changed) projects/altix2/sys/boot/ia64/efi/ (props changed) projects/altix2/sys/cddl/contrib/opensolaris/ (props changed) projects/altix2/sys/conf/ (props changed) projects/altix2/usr.sbin/bhyve/ (props changed) projects/altix2/usr.sbin/bhyvectl/ (props changed) projects/altix2/usr.sbin/ndiscvt/ (props changed) Modified: projects/altix2/UPDATING ============================================================================== --- projects/altix2/UPDATING Thu Dec 26 05:46:10 2013 (r259908) +++ projects/altix2/UPDATING Thu Dec 26 05:54:58 2013 (r259909) @@ -1943,7 +1943,7 @@ COMMON ITEMS: make buildkernel KERNCONF=YOUR_KERNEL_HERE <maybe newfs current's root partition> <mount current's root partition on directory ${CURRENT_ROOT}> - make installworld DESTDIR=${CURRENT_ROOT} + make installworld DESTDIR=${CURRENT_ROOT} -DDB_FROM_SRC make distribution DESTDIR=${CURRENT_ROOT} # if newfs'd make installkernel KERNCONF=YOUR_KERNEL_HERE DESTDIR=${CURRENT_ROOT} cp /etc/fstab ${CURRENT_ROOT}/etc/fstab # if newfs'd Modified: projects/altix2/bin/pax/pax.1 ============================================================================== --- projects/altix2/bin/pax/pax.1 Thu Dec 26 05:46:10 2013 (r259908) +++ projects/altix2/bin/pax/pax.1 Thu Dec 26 05:54:58 2013 (r259909) @@ -33,7 +33,7 @@ .\" @(#)pax.1 8.4 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd August 29, 2010 +.Dd December 21, 2013 .Dt PAX 1 .Os .Sh NAME @@ -587,6 +587,16 @@ precedence. For example, if .Dl Fl p Ar eme is specified, file modification times are still preserved. +.Pp +File flags set by +.Xr chflags 1 +are not understood by +.Nm , +however +.Xr tar 1 +and +.Xr dump 1 +will preserve these. .It Fl s Ar replstr Modify the file or archive member names specified by the .Ar pattern @@ -1195,3 +1205,11 @@ at the University of California, San Die The .Nm utility does not recognize multibyte characters. +.Pp +File flags set by +.Xr chflags 1 +are not preserved by +.Nm . +The BUGS section of +.Xr chflags 1 +has a list of utilities that are unaware of flags. Modified: projects/altix2/bin/sh/tests/parameters/Makefile ============================================================================== --- projects/altix2/bin/sh/tests/parameters/Makefile Thu Dec 26 05:46:10 2013 (r259908) +++ projects/altix2/bin/sh/tests/parameters/Makefile Thu Dec 26 05:54:58 2013 (r259909) @@ -10,6 +10,7 @@ FILES+= exitstatus1.0 FILES+= mail1.0 FILES+= mail2.0 FILES+= optind1.0 +FILES+= optind2.0 FILES+= positional1.0 FILES+= positional2.0 FILES+= pwd1.0 Copied: projects/altix2/bin/sh/tests/parameters/optind2.0 (from r259908, head/bin/sh/tests/parameters/optind2.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/altix2/bin/sh/tests/parameters/optind2.0 Thu Dec 26 05:54:58 2013 (r259909, copy of r259908, head/bin/sh/tests/parameters/optind2.0) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +[ "$(OPTIND=42 ${SH} -c 'printf %s "$OPTIND"')" = 1 ] Modified: projects/altix2/bin/sh/var.c ============================================================================== --- projects/altix2/bin/sh/var.c Thu Dec 26 05:46:10 2013 (r259908) +++ projects/altix2/bin/sh/var.c Thu Dec 26 05:54:58 2013 (r259909) @@ -88,11 +88,9 @@ struct var vifs; struct var vmail; struct var vmpath; struct var vpath; -struct var vppid; struct var vps1; struct var vps2; struct var vps4; -struct var vvers; static struct var voptind; struct var vdisvfork; @@ -111,8 +109,6 @@ static const struct varinit varinit[] = NULL }, { &vpath, 0, "PATH=" _PATH_DEFPATH, changepath }, - { &vppid, VUNSET, "PPID=", - NULL }, /* * vps1 depends on uid */ @@ -180,15 +176,14 @@ initvar(void) vps1.text = __DECONST(char *, geteuid() ? "PS1=$ " : "PS1=# "); vps1.flags = VSTRFIXED|VTEXTFIXED; } - if ((vppid.flags & VEXPORT) == 0) { - fmtstr(ppid, sizeof(ppid), "%d", (int)getppid()); - setvarsafe("PPID", ppid, 0); - } + fmtstr(ppid, sizeof(ppid), "%d", (int)getppid()); + setvarsafe("PPID", ppid, 0); for (envp = environ ; *envp ; envp++) { if (strchr(*envp, '=')) { setvareq(*envp, VEXPORT|VTEXTFIXED); } } + setvareq("OPTIND=1", VTEXTFIXED); } /* Modified: projects/altix2/bin/sh/var.h ============================================================================== --- projects/altix2/bin/sh/var.h Thu Dec 26 05:46:10 2013 (r259908) +++ projects/altix2/bin/sh/var.h Thu Dec 26 05:54:58 2013 (r259909) @@ -75,7 +75,6 @@ extern struct var vifs; extern struct var vmail; extern struct var vmpath; extern struct var vpath; -extern struct var vppid; extern struct var vps1; extern struct var vps2; extern struct var vps4; Modified: projects/altix2/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- projects/altix2/cddl/contrib/opensolaris/cmd/zdb/zdb.c Thu Dec 26 05:46:10 2013 (r259908) +++ projects/altix2/cddl/contrib/opensolaris/cmd/zdb/zdb.c Thu Dec 26 05:54:58 2013 (r259909) @@ -559,16 +559,20 @@ get_metaslab_refcount(vdev_t *vd) static int verify_spacemap_refcounts(spa_t *spa) { - int expected_refcount, actual_refcount; + uint64_t expected_refcount = 0; + uint64_t actual_refcount; - expected_refcount = spa_feature_get_refcount(spa, - &spa_feature_table[SPA_FEATURE_SPACEMAP_HISTOGRAM]); + (void) feature_get_refcount(spa, + &spa_feature_table[SPA_FEATURE_SPACEMAP_HISTOGRAM], + &expected_refcount); actual_refcount = get_dtl_refcount(spa->spa_root_vdev); actual_refcount += get_metaslab_refcount(spa->spa_root_vdev); if (expected_refcount != actual_refcount) { - (void) printf("space map refcount mismatch: expected %d != " - "actual %d\n", expected_refcount, actual_refcount); + (void) printf("space map refcount mismatch: expected %lld != " + "actual %lld\n", + (longlong_t)expected_refcount, + (longlong_t)actual_refcount); return (2); } return (0); @@ -670,8 +674,7 @@ dump_metaslab(metaslab_t *msp) } if (dump_opt['m'] > 1 && sm != NULL && - spa_feature_is_active(spa, - &spa_feature_table[SPA_FEATURE_SPACEMAP_HISTOGRAM])) { + spa_feature_is_active(spa, SPA_FEATURE_SPACEMAP_HISTOGRAM)) { /* * The space map histogram represents free space in chunks * of sm_shift (i.e. bucket 0 refers to 2^sm_shift). @@ -2417,8 +2420,7 @@ dump_block_stats(spa_t *spa) (void) bpobj_iterate_nofree(&spa->spa_dsl_pool->dp_free_bpobj, count_block_cb, &zcb, NULL); } - if (spa_feature_is_active(spa, - &spa_feature_table[SPA_FEATURE_ASYNC_DESTROY])) { + if (spa_feature_is_active(spa, SPA_FEATURE_ASYNC_DESTROY)) { VERIFY3U(0, ==, bptree_iterate(spa->spa_meta_objset, spa->spa_dsl_pool->dp_bptree_obj, B_FALSE, count_block_cb, &zcb, NULL)); @@ -2719,7 +2721,7 @@ dump_zpool(spa_t *spa) } if (spa_feature_is_active(spa, - &spa_feature_table[SPA_FEATURE_ASYNC_DESTROY])) { + SPA_FEATURE_ASYNC_DESTROY)) { dump_bptree(spa->spa_meta_objset, spa->spa_dsl_pool->dp_bptree_obj, "Pool dataset frees"); Modified: projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Thu Dec 26 05:46:10 2013 (r259908) +++ projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Thu Dec 26 05:54:58 2013 (r259909) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 23, 2013 +.Dd December 24, 2013 .Dt ZFS 8 .Os .Sh NAME @@ -102,7 +102,7 @@ .Nm .Cm list .Op Fl r Ns | Ns Fl d Ar depth -.Op Fl H +.Op Fl Hp .Op Fl o Ar property Ns Oo , Ns property Ns Oc Ns ... .Op Fl t Ar type Ns Oo , Ns type Ns Oc Ns ... .Oo Fl s Ar property Oc Ns ... @@ -1807,7 +1807,7 @@ only dataset that can be renamed recursi .Nm .Cm list .Op Fl r Ns | Ns Fl d Ar depth -.Op Fl H +.Op Fl Hp .Op Fl o Ar property Ns Oo , Ns Ar property Oc Ns ... .Op Fl t Ar type Ns Oo , Ns Ar type Oc Ns ... .Oo Fl s Ar property Oc Ns ... @@ -1838,6 +1838,8 @@ will display only the dataset and its di .It Fl H Used for scripting mode. Do not print headers and separate fields by a single tab instead of arbitrary white space. +.It Fl p +Display numbers in parsable (exact) values. .It Fl o Ar property Ns Oo , Ns Ar property Oc Ns ... A comma-separated list of properties to display. The property must be: .Bl -bullet -offset 2n @@ -1978,7 +1980,7 @@ Display output in a form more easily par omitted, and fields are explicitly separated by a single tab instead of an arbitrary amount of space. .It Fl p -Display numbers in parseable (exact) values. +Display numbers in parsable (exact) values. .It Fl o Cm all | Ar field Ns Oo , Ns Ar field Oc Ns ... A comma-separated list of columns to display. Supported values are .Sy name,property,value,received,source . @@ -2820,7 +2822,7 @@ option of .It \&P Ta event port (not supported on Fx ) .El .It Fl H -Give more parseable tab-separated output, without header lines and without +Give more parsable tab-separated output, without header lines and without arrows. .It Fl t Display the path's inode change time as the first column of output. Modified: projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c ============================================================================== --- projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c Thu Dec 26 05:46:10 2013 (r259908) +++ projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c Thu Dec 26 05:54:58 2013 (r259909) @@ -18,10 +18,12 @@ * * CDDL HEADER END */ + /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 Pawel Jakub Dawidek <pawel@dawidek.net>. * All rights reserved. + * Copyright 2013 Nexenta Systems, Inc. All rights reserved. */ #include <libintl.h> @@ -109,7 +111,8 @@ zfs_callback(zfs_handle_t *zhp, void *da cb->cb_props_table); if (zfs_expand_proplist(zhp, cb->cb_proplist, - (cb->cb_flags & ZFS_ITER_RECVD_PROPS)) + (cb->cb_flags & ZFS_ITER_RECVD_PROPS), + (cb->cb_flags & ZFS_ITER_LITERAL_PROPS)) != 0) { free(node); return (-1); Modified: projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h ============================================================================== --- projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h Thu Dec 26 05:46:10 2013 (r259908) +++ projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h Thu Dec 26 05:54:58 2013 (r259909) @@ -18,9 +18,11 @@ * * CDDL HEADER END */ + /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright 2013 Nexenta Systems, Inc. All rights reserved. */ #ifndef ZFS_ITER_H @@ -44,6 +46,7 @@ typedef struct zfs_sort_column { #define ZFS_ITER_DEPTH_LIMIT (1 << 3) #define ZFS_ITER_RECVD_PROPS (1 << 4) #define ZFS_ITER_SIMPLE (1 << 5) +#define ZFS_ITER_LITERAL_PROPS (1 << 6) int zfs_for_each(int, char **, int options, zfs_type_t, zfs_sort_column_t *, zprop_list_t **, int, zfs_iter_f, void *); Modified: projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Thu Dec 26 05:46:10 2013 (r259908) +++ projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Thu Dec 26 05:54:58 2013 (r259909) @@ -21,7 +21,6 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2012 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. * Copyright 2012 Milan Jurik. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. @@ -29,6 +28,7 @@ * All rights reserved. * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. + * Copyright 2013 Nexenta Systems, Inc. All rights reserved. */ #include <assert.h> @@ -249,9 +249,8 @@ get_usage(zfs_help_t idx) case HELP_UNJAIL: return (gettext("\tunjail <jailid|jailname> <filesystem>\n")); case HELP_LIST: - return (gettext("\tlist [-rH][-d max] " - "[-o property[,...]] [-t type[,...]] [-s property] ...\n" - "\t [-S property] ... " + return (gettext("\tlist [-Hp] [-r|-d max] [-o property[,...]] " + "[-s property]...\n\t [-S property]... [-t type[,...]] " "[filesystem|volume|snapshot] ...\n")); case HELP_MOUNT: return (gettext("\tmount\n" @@ -310,12 +309,12 @@ get_usage(zfs_help_t idx) "<filesystem|volume>\n")); case HELP_USERSPACE: return (gettext("\tuserspace [-Hinp] [-o field[,...]] " - "[-s field] ...\n\t[-S field] ... " - "[-t type[,...]] <filesystem|snapshot>\n")); + "[-s field]...\n\t [-S field]... [-t type[,...]] " + "<filesystem|snapshot>\n")); case HELP_GROUPSPACE: return (gettext("\tgroupspace [-Hinp] [-o field[,...]] " - "[-s field] ...\n\t[-S field] ... " - "[-t type[,...]] <filesystem|snapshot>\n")); + "[-s field]...\n\t [-S field]... [-t type[,...]] " + "<filesystem|snapshot>\n")); case HELP_HOLD: return (gettext("\thold [-r] <tag> <snapshot> ...\n")); case HELP_HOLDS: @@ -2124,7 +2123,7 @@ zfs_do_upgrade(int argc, char **argv) * -i Translate SID to POSIX ID. * -n Print numeric ID instead of user/group name. * -o Control which fields to display. - * -p Use exact (parseable) numeric output. + * -p Use exact (parsable) numeric output. * -s Specify sort columns, descending order. * -S Specify sort columns, ascending order. * -t Control which object types to display. @@ -2811,24 +2810,25 @@ zfs_do_userspace(int argc, char **argv) } /* - * list [-r][-d max] [-H] [-o property[,property]...] [-t type[,type]...] - * [-s property [-s property]...] [-S property [-S property]...] - * <dataset> ... + * list [-Hp][-r|-d max] [-o property[,...]] [-s property] ... [-S property] ... + * [-t type[,...]] [filesystem|volume|snapshot] ... * - * -r Recurse over all children + * -H Scripted mode; elide headers and separate columns by tabs. + * -p Display values in parsable (literal) format. + * -r Recurse over all children. * -d Limit recursion by depth. - * -H Scripted mode; elide headers and separate columns by tabs * -o Control which fields to display. - * -t Control which object types to display. * -s Specify sort columns, descending order. * -S Specify sort columns, ascending order. + * -t Control which object types to display. * - * When given no arguments, lists all filesystems in the system. + * When given no arguments, list all filesystems in the system. * Otherwise, list the specified datasets, optionally recursing down them if * '-r' is specified. */ typedef struct list_cbdata { boolean_t cb_first; + boolean_t cb_literal; boolean_t cb_scripted; zprop_list_t *cb_proplist; } list_cbdata_t; @@ -2837,8 +2837,9 @@ typedef struct list_cbdata { * Given a list of columns to display, output appropriate headers for each one. */ static void -print_header(zprop_list_t *pl) +print_header(list_cbdata_t *cb) { + zprop_list_t *pl = cb->cb_proplist; char headerbuf[ZFS_MAXPROPLEN]; const char *header; int i; @@ -2879,19 +2880,19 @@ print_header(zprop_list_t *pl) * to the described layout. */ static void -print_dataset(zfs_handle_t *zhp, zprop_list_t *pl, boolean_t scripted) +print_dataset(zfs_handle_t *zhp, list_cbdata_t *cb) { + zprop_list_t *pl = cb->cb_proplist; boolean_t first = B_TRUE; char property[ZFS_MAXPROPLEN]; nvlist_t *userprops = zfs_get_user_props(zhp); nvlist_t *propval; char *propstr; boolean_t right_justify; - int width; for (; pl != NULL; pl = pl->pl_next) { if (!first) { - if (scripted) + if (cb->cb_scripted) (void) printf("\t"); else (void) printf(" "); @@ -2906,22 +2907,22 @@ print_dataset(zfs_handle_t *zhp, zprop_l right_justify = zfs_prop_align_right(pl->pl_prop); } else if (pl->pl_prop != ZPROP_INVAL) { if (zfs_prop_get(zhp, pl->pl_prop, property, - sizeof (property), NULL, NULL, 0, B_FALSE) != 0) + sizeof (property), NULL, NULL, 0, + cb->cb_literal) != 0) propstr = "-"; else propstr = property; - right_justify = zfs_prop_align_right(pl->pl_prop); } else if (zfs_prop_userquota(pl->pl_user_prop)) { if (zfs_prop_get_userquota(zhp, pl->pl_user_prop, - property, sizeof (property), B_FALSE) != 0) + property, sizeof (property), cb->cb_literal) != 0) propstr = "-"; else propstr = property; right_justify = B_TRUE; } else if (zfs_prop_written(pl->pl_user_prop)) { if (zfs_prop_get_written(zhp, pl->pl_user_prop, - property, sizeof (property), B_FALSE) != 0) + property, sizeof (property), cb->cb_literal) != 0) propstr = "-"; else propstr = property; @@ -2936,19 +2937,17 @@ print_dataset(zfs_handle_t *zhp, zprop_l right_justify = B_FALSE; } - width = pl->pl_width; - /* * If this is being called in scripted mode, or if this is the * last column and it is left-justified, don't include a width * format specifier. */ - if (scripted || (pl->pl_next == NULL && !right_justify)) + if (cb->cb_scripted || (pl->pl_next == NULL && !right_justify)) (void) printf("%s", propstr); else if (right_justify) - (void) printf("%*s", width, propstr); + (void) printf("%*s", pl->pl_width, propstr); else - (void) printf("%-*s", width, propstr); + (void) printf("%-*s", pl->pl_width, propstr); } (void) printf("\n"); @@ -2964,11 +2963,11 @@ list_callback(zfs_handle_t *zhp, void *d if (cbp->cb_first) { if (!cbp->cb_scripted) - print_header(cbp->cb_proplist); + print_header(cbp); cbp->cb_first = B_FALSE; } - print_dataset(zhp, cbp->cb_proplist, cbp->cb_scripted); + print_dataset(zhp, cbp); return (0); } @@ -2977,7 +2976,6 @@ static int zfs_do_list(int argc, char **argv) { int c; - boolean_t scripted = B_FALSE; static char default_fields[] = "name,used,available,referenced,mountpoint"; int types = ZFS_TYPE_DATASET; @@ -2991,11 +2989,15 @@ zfs_do_list(int argc, char **argv) int flags = ZFS_ITER_PROP_LISTSNAPS | ZFS_ITER_ARGS_CAN_BE_PATHS; /* check options */ - while ((c = getopt(argc, argv, ":d:o:rt:Hs:S:")) != -1) { + while ((c = getopt(argc, argv, "HS:d:o:prs:t:")) != -1) { switch (c) { case 'o': fields = optarg; break; + case 'p': + cb.cb_literal = B_TRUE; + flags |= ZFS_ITER_LITERAL_PROPS; + break; case 'd': limit = parse_depth(optarg, &flags); break; @@ -3003,7 +3005,7 @@ zfs_do_list(int argc, char **argv) flags |= ZFS_ITER_RECURSE; break; case 'H': - scripted = B_TRUE; + cb.cb_scripted = B_TRUE; break; case 's': if (zfs_add_sort_column(&sortcol, optarg, @@ -3093,7 +3095,6 @@ zfs_do_list(int argc, char **argv) != 0) usage(B_FALSE); - cb.cb_scripted = scripted; cb.cb_first = B_TRUE; ret = zfs_for_each(argc, argv, flags, types, sortcol, &cb.cb_proplist, Modified: projects/altix2/cddl/contrib/opensolaris/cmd/zhack/zhack.c ============================================================================== --- projects/altix2/cddl/contrib/opensolaris/cmd/zhack/zhack.c Thu Dec 26 05:46:10 2013 (r259908) +++ projects/altix2/cddl/contrib/opensolaris/cmd/zhack/zhack.c Thu Dec 26 05:54:58 2013 (r259909) @@ -20,7 +20,7 @@ */ /* - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. */ @@ -85,10 +85,15 @@ usage(void) static void -fatal(const char *fmt, ...) +fatal(spa_t *spa, void *tag, const char *fmt, ...) { va_list ap; + if (spa != NULL) { + spa_close(spa, tag); + (void) spa_export(g_pool, NULL, B_TRUE, B_FALSE); + } + va_start(ap, fmt); (void) fprintf(stderr, "%s: ", cmdname); (void) vfprintf(stderr, fmt, ap); @@ -159,13 +164,14 @@ import_pool(const char *target, boolean_ g_importargs.can_be_active = B_TRUE; if (zpool_search_import(g_zfs, &g_importargs) != NULL || spa_open(target, &spa, FTAG) == 0) { - fatal("cannot import '%s': pool is active; run " - "\"zpool export %s\" first\n", - g_pool, g_pool); + fatal(spa, FTAG, "cannot import '%s': pool is " + "active; run " "\"zpool export %s\" " + "first\n", g_pool, g_pool); } } - fatal("cannot import '%s': no such pool available\n", g_pool); + fatal(NULL, FTAG, "cannot import '%s': no such pool " + "available\n", g_pool); } elem = nvlist_next_nvpair(pools, NULL); @@ -186,7 +192,8 @@ import_pool(const char *target, boolean_ error = 0; if (error) - fatal("can't import '%s': %s", name, strerror(error)); + fatal(NULL, FTAG, "can't import '%s': %s", name, + strerror(error)); } static void @@ -201,10 +208,11 @@ zhack_spa_open(const char *target, boole zfeature_checks_disable = B_FALSE; if (err != 0) - fatal("cannot open '%s': %s", target, strerror(err)); + fatal(*spa, FTAG, "cannot open '%s': %s", target, + strerror(err)); if (spa_version(*spa) < SPA_VERSION_FEATURES) { - fatal("'%s' has version %d, features not enabled", target, - (int)spa_version(*spa)); + fatal(*spa, FTAG, "'%s' has version %d, features not enabled", + target, (int)spa_version(*spa)); } } @@ -275,12 +283,13 @@ zhack_do_feature_stat(int argc, char **a } static void -feature_enable_sync(void *arg, dmu_tx_t *tx) +zhack_feature_enable_sync(void *arg, dmu_tx_t *tx) { spa_t *spa = dmu_tx_pool(tx)->dp_spa; zfeature_info_t *feature = arg; - spa_feature_enable(spa, feature, tx); + feature_enable_sync(spa, feature, tx); + spa_history_log_internal(spa, "zhack enable feature", tx, "name=%s can_readonly=%u", feature->fi_guid, feature->fi_can_readonly); @@ -294,7 +303,7 @@ zhack_do_feature_enable(int argc, char * spa_t *spa; objset_t *mos; zfeature_info_t feature; - zfeature_info_t *nodeps[] = { NULL }; + spa_feature_t nodeps[] = { SPA_FEATURE_NONE }; /* * Features are not added to the pool's label until their refcounts @@ -336,18 +345,19 @@ zhack_do_feature_enable(int argc, char * feature.fi_guid = argv[1]; if (!zfeature_is_valid_guid(feature.fi_guid)) - fatal("invalid feature guid: %s", feature.fi_guid); + fatal(NULL, FTAG, "invalid feature guid: %s", feature.fi_guid); zhack_spa_open(target, B_FALSE, FTAG, &spa); mos = spa->spa_meta_objset; - if (0 == zfeature_lookup_guid(feature.fi_guid, NULL)) - fatal("'%s' is a real feature, will not enable"); + if (zfeature_is_supported(feature.fi_guid)) + fatal(spa, FTAG, "'%s' is a real feature, will not enable"); if (0 == zap_contains(mos, spa->spa_feat_desc_obj, feature.fi_guid)) - fatal("feature already enabled: %s", feature.fi_guid); + fatal(spa, FTAG, "feature already enabled: %s", + feature.fi_guid); VERIFY0(dsl_sync_task(spa_name(spa), NULL, - feature_enable_sync, &feature, 5)); + zhack_feature_enable_sync, &feature, 5)); spa_close(spa, FTAG); @@ -359,8 +369,10 @@ feature_incr_sync(void *arg, dmu_tx_t *t { spa_t *spa = dmu_tx_pool(tx)->dp_spa; zfeature_info_t *feature = arg; + uint64_t refcount; - spa_feature_incr(spa, feature, tx); + VERIFY0(feature_get_refcount(spa, feature, &refcount)); + feature_sync(spa, feature, refcount + 1, tx); spa_history_log_internal(spa, "zhack feature incr", tx, "name=%s", feature->fi_guid); } @@ -370,8 +382,10 @@ feature_decr_sync(void *arg, dmu_tx_t *t { spa_t *spa = dmu_tx_pool(tx)->dp_spa; zfeature_info_t *feature = arg; + uint64_t refcount; - spa_feature_decr(spa, feature, tx); + VERIFY0(feature_get_refcount(spa, feature, &refcount)); + feature_sync(spa, feature, refcount - 1, tx); spa_history_log_internal(spa, "zhack feature decr", tx, "name=%s", feature->fi_guid); } @@ -385,7 +399,7 @@ zhack_do_feature_ref(int argc, char **ar spa_t *spa; objset_t *mos; zfeature_info_t feature; - zfeature_info_t *nodeps[] = { NULL }; + spa_feature_t nodeps[] = { SPA_FEATURE_NONE }; /* * fi_desc does not matter here because it was written to disk @@ -423,13 +437,15 @@ zhack_do_feature_ref(int argc, char **ar feature.fi_guid = argv[1]; if (!zfeature_is_valid_guid(feature.fi_guid)) - fatal("invalid feature guid: %s", feature.fi_guid); + fatal(NULL, FTAG, "invalid feature guid: %s", feature.fi_guid); zhack_spa_open(target, B_FALSE, FTAG, &spa); mos = spa->spa_meta_objset; - if (0 == zfeature_lookup_guid(feature.fi_guid, NULL)) - fatal("'%s' is a real feature, will not change refcount"); + if (zfeature_is_supported(feature.fi_guid)) { + fatal(spa, FTAG, + "'%s' is a real feature, will not change refcount"); + } if (0 == zap_contains(mos, spa->spa_feat_for_read_obj, feature.fi_guid)) { @@ -438,11 +454,17 @@ zhack_do_feature_ref(int argc, char **ar feature.fi_guid)) { feature.fi_can_readonly = B_TRUE; } else { - fatal("feature is not enabled: %s", feature.fi_guid); + fatal(spa, FTAG, "feature is not enabled: %s", feature.fi_guid); } - if (decr && !spa_feature_is_active(spa, &feature)) - fatal("feature refcount already 0: %s", feature.fi_guid); + if (decr) { + uint64_t count; + if (feature_get_refcount(spa, &feature, &count) == 0 && + count != 0) { + fatal(spa, FTAG, "feature refcount already 0: %s", + feature.fi_guid); + } + } VERIFY0(dsl_sync_task(spa_name(spa), NULL, decr ? feature_decr_sync : feature_incr_sync, &feature, 5)); @@ -530,8 +552,8 @@ main(int argc, char **argv) usage(); } - if (!g_readonly && spa_export(g_pool, NULL, B_TRUE, B_TRUE) != 0) { - fatal("pool export failed; " + if (!g_readonly && spa_export(g_pool, NULL, B_TRUE, B_FALSE) != 0) { + fatal(NULL, FTAG, "pool export failed; " "changes may not be committed to disk\n"); } Modified: projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 ============================================================================== --- projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Thu Dec 26 05:46:10 2013 (r259908) +++ projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Thu Dec 26 05:54:58 2013 (r259909) @@ -269,6 +269,23 @@ an existing space map is upgraded to the Once the feature is .Sy active , it will remain in that state until the pool is destroyed. +.It Sy extensible_dataset +.Bl -column "READ\-ONLY COMPATIBLE" "com.delphix:extensible_dataset" +.It GUID Ta com.delphix:extensible_dataset +.It READ\-ONLY COMPATIBLE Ta no +.It DEPENDENCIES Ta none +.El +.Pp +This feature allows more flexible use of internal ZFS data structures, +and exists for other features to depend on. +.Pp +This feature will be +.Sy active +when the first dependent feature uses it, +and will be returned to the +.Sy enabled +state when all datasets that use +this feature are destroyed. .El .Sh SEE ALSO .Xr zpool 8 Modified: projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Thu Dec 26 05:46:10 2013 (r259908) +++ projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Thu Dec 26 05:54:58 2013 (r259909) @@ -22,7 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2012 by Frederik Wessels. All rights reserved. * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved. * Copyright (c) 2013 by Prasad Joshi (sTec). All rights reserved. @@ -1004,7 +1004,7 @@ zpool_do_create(int argc, char **argv) * Hand off to libzfs. */ if (enable_all_pool_feat) { - int i; + spa_feature_t i; for (i = 0; i < SPA_FEATURES; i++) { char propname[MAXPATHLEN]; zfeature_info_t *feat = &spa_feature_table[i]; Modified: projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h ============================================================================== --- projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Thu Dec 26 05:46:10 2013 (r259908) +++ projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Thu Dec 26 05:54:58 2013 (r259909) @@ -21,13 +21,13 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>. * All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. + * Copyright 2013 Nexenta Systems, Inc. All rights reserved. */ #ifndef _LIBZFS_H @@ -463,7 +463,8 @@ typedef struct zprop_list { boolean_t pl_fixed; } zprop_list_t; -extern int zfs_expand_proplist(zfs_handle_t *, zprop_list_t **, boolean_t); +extern int zfs_expand_proplist(zfs_handle_t *, zprop_list_t **, boolean_t, + boolean_t); extern void zfs_prune_proplist(zfs_handle_t *, uint8_t *); #define ZFS_MOUNTPOINT_NONE "none" Modified: projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Thu Dec 26 05:46:10 2013 (r259908) +++ projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Thu Dec 26 05:54:58 2013 (r259909) @@ -23,11 +23,11 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2012 DEY Storage Systems, Inc. All rights reserved. - * Copyright 2012 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>. * All rights reserved. * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. + * Copyright 2013 Nexenta Systems, Inc. All rights reserved. */ #include <ctype.h> @@ -3882,7 +3882,8 @@ zfs_get_recvd_props(zfs_handle_t *zhp) * of the RECEIVED column. */ int -zfs_expand_proplist(zfs_handle_t *zhp, zprop_list_t **plp, boolean_t received) +zfs_expand_proplist(zfs_handle_t *zhp, zprop_list_t **plp, boolean_t received, + boolean_t literal) { libzfs_handle_t *hdl = zhp->zfs_hdl; zprop_list_t *entry; @@ -3944,18 +3945,18 @@ zfs_expand_proplist(zfs_handle_t *zhp, z * Now go through and check the width of any non-fixed columns */ for (entry = *plp; entry != NULL; entry = entry->pl_next) { - if (entry->pl_fixed) + if (entry->pl_fixed && !literal) continue; if (entry->pl_prop != ZPROP_INVAL) { if (zfs_prop_get(zhp, entry->pl_prop, - buf, sizeof (buf), NULL, NULL, 0, B_FALSE) == 0) { + buf, sizeof (buf), NULL, NULL, 0, literal) == 0) { if (strlen(buf) > entry->pl_width) entry->pl_width = strlen(buf); } if (received && zfs_prop_get_recvd(zhp, zfs_prop_to_name(entry->pl_prop), - buf, sizeof (buf), B_FALSE) == 0) + buf, sizeof (buf), literal) == 0) if (strlen(buf) > entry->pl_recvd_width) entry->pl_recvd_width = strlen(buf); } else { @@ -3968,7 +3969,7 @@ zfs_expand_proplist(zfs_handle_t *zhp, z } if (received && zfs_prop_get_recvd(zhp, entry->pl_user_prop, - buf, sizeof (buf), B_FALSE) == 0) + buf, sizeof (buf), literal) == 0) if (strlen(buf) > entry->pl_recvd_width) entry->pl_recvd_width = strlen(buf); } Modified: projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c ============================================================================== --- projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Thu Dec 26 05:46:10 2013 (r259908) +++ projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Thu Dec 26 05:54:58 2013 (r259909) @@ -22,7 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. */ @@ -443,10 +443,9 @@ zpool_valid_proplist(libzfs_handle_t *hd prop = zpool_name_to_prop(propname); if (prop == ZPROP_INVAL && zpool_prop_feature(propname)) { int err; - zfeature_info_t *feature; char *fname = strchr(propname, '@') + 1; - err = zfeature_lookup_name(fname, &feature); + err = zfeature_lookup_name(fname, NULL); if (err != 0) { ASSERT3U(err, ==, ENOENT); zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, @@ -839,14 +838,14 @@ zpool_prop_get_feature(zpool_handle_t *z */ if (supported) { int ret; - zfeature_info_t *fi; + spa_feature_t fid; - ret = zfeature_lookup_name(feature, &fi); + ret = zfeature_lookup_name(feature, &fid); if (ret != 0) { (void) strlcpy(buf, "-", len); return (ENOTSUP); } - feature = fi->fi_guid; + feature = spa_feature_table[fid].fi_guid; } if (nvlist_lookup_uint64(features, feature, &refcount) == 0) Modified: projects/altix2/contrib/file/compress.c ============================================================================== --- projects/altix2/contrib/file/compress.c Thu Dec 26 05:46:10 2013 (r259908) +++ projects/altix2/contrib/file/compress.c Thu Dec 26 05:54:58 2013 (r259909) @@ -480,7 +480,7 @@ uncompressbuf(struct magic_set *ms, int #endif free(*newch); n = 0; - newch[0] = '\0'; + *newch = NULL; goto err; } else { n = r; Modified: projects/altix2/contrib/gcc/ChangeLog.gcc43 ============================================================================== --- projects/altix2/contrib/gcc/ChangeLog.gcc43 Thu Dec 26 05:46:10 2013 (r259908) +++ projects/altix2/contrib/gcc/ChangeLog.gcc43 Thu Dec 26 05:54:58 2013 (r259909) @@ -45,12 +45,32 @@ * flags.h (force_align_functions_log): Delete. * toplev.c (force_align_functions_log): Delete. +2007-07-06 Josh Conner <jconner@apple.com> (r126422) + + PR middle-end/32602 + PR middle-end/32603 + * calls.c (store_one_arg): Handle arguments which are partially + on the stack when detecting argument overlap. + +2007-07-03 Eric Christopher <echristo@apple.com> (r126278) + + * doc/cppopts.texi: Add conflicting option note to -dM. + * doc/invoke.texi: Add note about possible conflicts with + -E for -dCHARS and note that -dM will not produce + any results if there is no machine dependent reorg. + 2007-06-28 Geoffrey Keating <geoffk@apple.com> (r126088) * doc/invoke.texi (C++ Dialect Options): Document fvisibility-ms-compat. * c.opt (fvisibility-ms-compat): New. +2007-06-23 Richard Earnshaw <rearnsha@arm.com> (r125973) + + PR target/31152 + * arm.md (negscc): Match the correct operand for optimized LT0 test. + Remove optimization for GT. + 2007-06-05 Joerg Wunsch <j.gnu@uriah.heep.sax.de> (r125346) PR preprocessor/23479 @@ -94,6 +114,14 @@ regs_invalidated_by_call, rather than just checking the membership of REGNO (REG). +2007-05-18 Geoffrey Keating <geoffk@apple.com> (r124839) + + * dwarf2out.c (print_die): Use '%ld' not '%lu' to print a 'long'. + (output_die): Use 'unsigned long' with %x. + * sched-vis.c (print_value): Use 'unsigned HOST_WIDE_INT' and + HOST_WIDE_INT_PRINT_HEX to print HOST_WIDE_INT. + * tree-dump.c (dump_pointer): Use 'unsigned long' for %lx. + 2007-05-16 Eric Christopher <echristo@apple.com> (r124763) * config/rs6000/rs6000.c (rs6000_emit_prologue): Move altivec register @@ -399,6 +427,12 @@ (override_options): Add PTA_CX16 flag. Set x86_cmpxchg16b for CPUs that have PTA_CX16 set. +2007-01-18 Josh Conner <jconner@apple.com> (r120902) + + PR target/30485 + * config/rs6000/rs6000.c (rs6000_emit_vector_compare): Add + support for UNLE, UNLT, UNGE, and UNGT. + 2007-01-17 Eric Christopher <echristo@apple.com> (r120846) * config.gcc: Support core2 processor. @@ -408,6 +442,14 @@ * c-common.c (vector_types_convertible_p): Treat opaque types as always convertible if they have the same size, but not otherwise. +2007-01-08 Geoffrey Keating <geoffk@apple.com> (r120611) + + * target.h (struct gcc_target): New field library_rtti_comdat. + * target-def.h (TARGET_CXX_LIBRARY_RTTI_COMDAT): New. + (TARGET_CXX): Add TARGET_CXX_LIBRARY_RTTI_COMDAT. + * doc/tm.texi (C++ ABI): Document TARGET_CXX_LIBRARY_RTTI_COMDAT. + * config/darwin.h (TARGET_CXX_LIBRARY_RTTI_COMDAT): Define. + 2007-01-08 Mark Shinwell <shinwell@codesourcery.com> (r120572) * c.opt: Add -flax-vector-conversions. @@ -514,6 +556,37 @@ (override_options): Add entries for Core2. (ix86_issue_rate): Add case for Core2. +2006-11-14 Caroline Tice <ctice@apple.com> (r118826) + + * dwarf2out.c (debug_pubtypes_section): New static global variable. + (pubname_entry): Add DEF_VEC_O and DEF_VEC_ALLOC_O statements for + this type. + (pubname_table): Redefine as a vector. + (pubtype_table): New static global variable, defined as a vector. + (pubname_table_allocated): Remove static global variable. + (pubname_table_in_use): Remove static global variable. + (PUBNAME_TABLE_INCREMENT): Remove constant. + (size_of_pubnames): Add parameter to deal with either pubnames or + pubtypes, and change code to deal with table being a vector. + (add_pubname): Change to deal with table being a vector. + (add_pubtype): New function. + (output_pubnames): Add parameter to deal with either pubnames or + pubtypes, and change code to deal with table being a vector. + (gen_array_type_die): Add call to add_pubtype. + (gen_enumeration_type_die): Add call to add_pubtype. + (gen_struct_or_union_type_die): Add call to add_pubtype. + (gen_subroutine_type_die): Add call to add_pubtype. + (gen_typedef_die): Add call to add_pubtype. + (dwarf2out_init): Add code to initialize pubname_table and + pubtype_table vectors; also initialize debug_pubtypes_section. *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312260554.rBQ5sx8u013192>