svn commit: r274464 - in user/dchagin/lemul: . bin/sh cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/cmd/zstreamdump c...

Dmitry Chagin dchagin at FreeBSD.org
Thu Nov 13 08:41:01 UTC 2014 

Author: dchagin
Date: Thu Nov 13 08:40:51 2014
New Revision: 274464
URL: https://svnweb.freebsd.org/changeset/base/274464

Log:
  MFH.

Added:
  user/dchagin/lemul/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff
     - copied unchanged from r274463, head/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff
  user/dchagin/lemul/contrib/telnet/telnet/baud.h
     - copied unchanged from r274463, head/contrib/telnet/telnet/baud.h
  user/dchagin/lemul/share/man/man4/me.4
     - copied unchanged from r274463, head/share/man/man4/me.4
  user/dchagin/lemul/sys/modules/if_me/
     - copied from r274463, head/sys/modules/if_me/
  user/dchagin/lemul/sys/net/if_me.c
     - copied unchanged from r274463, head/sys/net/if_me.c
  user/dchagin/lemul/sys/netinet6/ip6_gre.c
     - copied unchanged from r274463, head/sys/netinet6/ip6_gre.c
  user/dchagin/lemul/usr.sbin/pw/tests/pw_etcdir.sh
     - copied unchanged from r274463, head/usr.sbin/pw/tests/pw_etcdir.sh
Deleted:
  user/dchagin/lemul/etc/rc.d/faith
  user/dchagin/lemul/share/man/man4/faith.4
  user/dchagin/lemul/sys/modules/if_faith/
  user/dchagin/lemul/sys/net/if_faith.c
  user/dchagin/lemul/sys/netinet/ip_gre.h
  user/dchagin/lemul/sys/sys/sf_base.h
  user/dchagin/lemul/sys/sys/sf_sync.h
  user/dchagin/lemul/usr.sbin/faithd/
Modified:
  user/dchagin/lemul/MAINTAINERS   (contents, props changed)
  user/dchagin/lemul/Makefile.inc1
  user/dchagin/lemul/ObsoleteFiles.inc
  user/dchagin/lemul/UPDATING
  user/dchagin/lemul/bin/sh/sh.1
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
  user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h
  user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c
  user/dchagin/lemul/contrib/hyperv/tools/hv_kvp_daemon.c
  user/dchagin/lemul/contrib/libxo/README.md
  user/dchagin/lemul/contrib/libxo/configure.ac
  user/dchagin/lemul/contrib/libxo/libxo/libxo.c
  user/dchagin/lemul/contrib/libxo/libxo/xoconfig.h
  user/dchagin/lemul/contrib/libxo/libxo/xoversion.h
  user/dchagin/lemul/contrib/libxo/tests/core/Makefile.am
  user/dchagin/lemul/contrib/libxo/tests/core/saved/test_07.J.out
  user/dchagin/lemul/contrib/libxo/tests/core/saved/test_07.JP.out
  user/dchagin/lemul/contrib/libxo/tests/core/saved/test_07.X.out
  user/dchagin/lemul/contrib/libxo/tests/core/saved/test_07.XP.out
  user/dchagin/lemul/contrib/libxo/tests/core/test_07.c
  user/dchagin/lemul/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h
  user/dchagin/lemul/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
  user/dchagin/lemul/contrib/llvm/lib/MC/MCParser/AsmParser.cpp
  user/dchagin/lemul/contrib/ofed/librdmacm/examples/rping.c
  user/dchagin/lemul/contrib/telnet/arpa/telnet.h
  user/dchagin/lemul/contrib/telnet/telnet/commands.c
  user/dchagin/lemul/contrib/telnet/telnet/externs.h
  user/dchagin/lemul/contrib/telnet/telnet/main.c
  user/dchagin/lemul/contrib/telnet/telnet/sys_bsd.c
  user/dchagin/lemul/contrib/telnet/telnet/telnet.1
  user/dchagin/lemul/contrib/telnet/telnet/telnet.c
  user/dchagin/lemul/contrib/telnet/telnet/types.h
  user/dchagin/lemul/contrib/telnet/telnetd/sys_term.c
  user/dchagin/lemul/etc/defaults/rc.conf
  user/dchagin/lemul/etc/network.subr
  user/dchagin/lemul/etc/rc.d/Makefile
  user/dchagin/lemul/etc/rc.d/NETWORKING
  user/dchagin/lemul/etc/rc.d/bridge
  user/dchagin/lemul/etc/rc.d/defaultroute
  user/dchagin/lemul/etc/rc.d/routing
  user/dchagin/lemul/gnu/usr.bin/gdb/kgdb/kgdb.h
  user/dchagin/lemul/gnu/usr.bin/gdb/kgdb/trgt_i386.c
  user/dchagin/lemul/lib/libc/net/getaddrinfo.c
  user/dchagin/lemul/lib/libc/net/getnameinfo.c
  user/dchagin/lemul/lib/libc/sys/Makefile.inc
  user/dchagin/lemul/lib/libc/sys/Symbol.map
  user/dchagin/lemul/lib/libc/sys/poll.2
  user/dchagin/lemul/lib/libexpat/Makefile
  user/dchagin/lemul/libexec/telnetd/Makefile
  user/dchagin/lemul/release/picobsd/bridge/PICOBSD
  user/dchagin/lemul/release/picobsd/qemu/PICOBSD
  user/dchagin/lemul/sbin/camcontrol/camcontrol.c
  user/dchagin/lemul/sbin/gbde/gbde.8
  user/dchagin/lemul/sbin/gbde/gbde.c
  user/dchagin/lemul/sbin/ifconfig/ifgre.c
  user/dchagin/lemul/sbin/route/keywords
  user/dchagin/lemul/sbin/route/route.8
  user/dchagin/lemul/sbin/route/route.c
  user/dchagin/lemul/share/man/man4/Makefile
  user/dchagin/lemul/share/man/man4/gre.4
  user/dchagin/lemul/share/man/man4/inet.4
  user/dchagin/lemul/share/man/man4/inet6.4
  user/dchagin/lemul/share/man/man4/ip6.4
  user/dchagin/lemul/share/man/man5/rc.conf.5
  user/dchagin/lemul/share/man/man7/hier.7
  user/dchagin/lemul/share/man/man7/security.7
  user/dchagin/lemul/share/mk/bsd.lib.mk
  user/dchagin/lemul/share/mk/bsd.own.mk
  user/dchagin/lemul/share/mk/bsd.prog.mk
  user/dchagin/lemul/sys/amd64/amd64/genassym.c
  user/dchagin/lemul/sys/amd64/amd64/support.S
  user/dchagin/lemul/sys/amd64/conf/GENERIC
  user/dchagin/lemul/sys/amd64/include/vmparam.h
  user/dchagin/lemul/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
  user/dchagin/lemul/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
  user/dchagin/lemul/sys/arm/conf/ATMEL
  user/dchagin/lemul/sys/arm/conf/DOCKSTAR
  user/dchagin/lemul/sys/arm/conf/DREAMPLUG-1001
  user/dchagin/lemul/sys/arm/conf/EFIKA_MX
  user/dchagin/lemul/sys/arm/conf/ETHERNUT5
  user/dchagin/lemul/sys/arm/conf/IMX53
  user/dchagin/lemul/sys/arm/conf/IMX6
  user/dchagin/lemul/sys/arm/conf/SAM9260EK
  user/dchagin/lemul/sys/arm/freescale/imx/imx_iomux.c
  user/dchagin/lemul/sys/boot/common/load_elf.c
  user/dchagin/lemul/sys/boot/efi/include/efiapi.h
  user/dchagin/lemul/sys/boot/forth/loader.conf
  user/dchagin/lemul/sys/boot/i386/loader/conf.c
  user/dchagin/lemul/sys/boot/zfs/zfsimpl.c
  user/dchagin/lemul/sys/cam/ctl/ctl.c
  user/dchagin/lemul/sys/cam/ctl/ctl_backend_block.c
  user/dchagin/lemul/sys/cam/ctl/ctl_cmd_table.c
  user/dchagin/lemul/sys/cam/scsi/scsi_all.c
  user/dchagin/lemul/sys/cddl/boot/zfs/zfsimpl.h
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  user/dchagin/lemul/sys/compat/freebsd32/freebsd32_misc.c
  user/dchagin/lemul/sys/compat/freebsd32/freebsd32_proto.h
  user/dchagin/lemul/sys/compat/freebsd32/freebsd32_syscall.h
  user/dchagin/lemul/sys/compat/freebsd32/freebsd32_syscalls.c
  user/dchagin/lemul/sys/compat/freebsd32/freebsd32_sysent.c
  user/dchagin/lemul/sys/compat/linux/linux_misc.c
  user/dchagin/lemul/sys/conf/NOTES
  user/dchagin/lemul/sys/conf/files
  user/dchagin/lemul/sys/conf/newvers.sh
  user/dchagin/lemul/sys/crypto/rijndael/rijndael-api-fst.c
  user/dchagin/lemul/sys/crypto/rijndael/rijndael-api-fst.h
  user/dchagin/lemul/sys/dev/acpica/acpi.c
  user/dchagin/lemul/sys/dev/agp/agp_i810.c
  user/dchagin/lemul/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c
  user/dchagin/lemul/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
  user/dchagin/lemul/sys/dev/cxgbe/common/t4_hw.c
  user/dchagin/lemul/sys/dev/cxgbe/firmware/t4fw_cfg.txt
  user/dchagin/lemul/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt
  user/dchagin/lemul/sys/dev/cxgbe/firmware/t5fw_cfg.txt
  user/dchagin/lemul/sys/dev/cxgbe/firmware/t5fw_cfg_fpga.txt
  user/dchagin/lemul/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt
  user/dchagin/lemul/sys/dev/cxgbe/iw_cxgbe/cm.c
  user/dchagin/lemul/sys/dev/cxgbe/t4_main.c
  user/dchagin/lemul/sys/dev/cxgbe/tom/t4_cpl_io.c
  user/dchagin/lemul/sys/dev/cxgbe/tom/t4_ddp.c
  user/dchagin/lemul/sys/dev/fdt/fdt_pinctrl.c
  user/dchagin/lemul/sys/dev/iscsi/icl.c
  user/dchagin/lemul/sys/dev/netmap/netmap.c
  user/dchagin/lemul/sys/dev/netmap/netmap_freebsd.c
  user/dchagin/lemul/sys/dev/netmap/netmap_generic.c
  user/dchagin/lemul/sys/dev/netmap/netmap_kern.h
  user/dchagin/lemul/sys/dev/netmap/netmap_monitor.c
  user/dchagin/lemul/sys/dev/netmap/netmap_pipe.c
  user/dchagin/lemul/sys/dev/null/null.c
  user/dchagin/lemul/sys/dev/ofw/ofwbus.c
  user/dchagin/lemul/sys/dev/pci/pci.c
  user/dchagin/lemul/sys/dev/random/fortuna.c
  user/dchagin/lemul/sys/dev/random/hash.c
  user/dchagin/lemul/sys/dev/random/hash.h
  user/dchagin/lemul/sys/dev/random/ivy.c
  user/dchagin/lemul/sys/dev/random/nehemiah.c
  user/dchagin/lemul/sys/dev/random/randomdev.c
  user/dchagin/lemul/sys/dev/random/randomdev_soft.c
  user/dchagin/lemul/sys/dev/rp/rp.c
  user/dchagin/lemul/sys/dev/rp/rp_pci.c
  user/dchagin/lemul/sys/dev/rp/rpreg.h
  user/dchagin/lemul/sys/dev/rp/rpvar.h
  user/dchagin/lemul/sys/dev/uart/uart_bus_fdt.c
  user/dchagin/lemul/sys/dev/uart/uart_dev_pl011.c
  user/dchagin/lemul/sys/dev/virtio/network/if_vtnet.c
  user/dchagin/lemul/sys/fs/ext2fs/ext2_extern.h
  user/dchagin/lemul/sys/fs/ext2fs/ext2_inode_cnv.c
  user/dchagin/lemul/sys/fs/ext2fs/ext2_vfsops.c
  user/dchagin/lemul/sys/geom/bde/g_bde.c
  user/dchagin/lemul/sys/geom/bde/g_bde.h
  user/dchagin/lemul/sys/geom/geom_dev.c
  user/dchagin/lemul/sys/i386/conf/GENERIC
  user/dchagin/lemul/sys/i386/conf/XBOX
  user/dchagin/lemul/sys/i386/conf/XEN
  user/dchagin/lemul/sys/kern/init_sysent.c
  user/dchagin/lemul/sys/kern/kern_clock.c
  user/dchagin/lemul/sys/kern/kern_descrip.c
  user/dchagin/lemul/sys/kern/kern_shutdown.c
  user/dchagin/lemul/sys/kern/subr_prof.c
  user/dchagin/lemul/sys/kern/sys_generic.c
  user/dchagin/lemul/sys/kern/sys_socket.c
  user/dchagin/lemul/sys/kern/syscalls.c
  user/dchagin/lemul/sys/kern/uipc_socket.c
  user/dchagin/lemul/sys/kern/uipc_syscalls.c
  user/dchagin/lemul/sys/kern/uipc_usrreq.c
  user/dchagin/lemul/sys/kern/vfs_syscalls.c
  user/dchagin/lemul/sys/mips/conf/GXEMUL
  user/dchagin/lemul/sys/mips/conf/GXEMUL32
  user/dchagin/lemul/sys/mips/conf/OCTEON1
  user/dchagin/lemul/sys/mips/rmi/rootfs_list.txt
  user/dchagin/lemul/sys/modules/Makefile
  user/dchagin/lemul/sys/modules/if_gre/Makefile
  user/dchagin/lemul/sys/modules/random/Makefile
  user/dchagin/lemul/sys/net/ethernet.h
  user/dchagin/lemul/sys/net/if.c
  user/dchagin/lemul/sys/net/if_clone.c
  user/dchagin/lemul/sys/net/if_clone.h
  user/dchagin/lemul/sys/net/if_ethersubr.c
  user/dchagin/lemul/sys/net/if_gre.c
  user/dchagin/lemul/sys/net/if_gre.h
  user/dchagin/lemul/sys/net/if_types.h
  user/dchagin/lemul/sys/net/if_var.h
  user/dchagin/lemul/sys/net/if_vlan_var.h
  user/dchagin/lemul/sys/net/netmap_user.h
  user/dchagin/lemul/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
  user/dchagin/lemul/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
  user/dchagin/lemul/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
  user/dchagin/lemul/sys/netinet/accf_dns.c
  user/dchagin/lemul/sys/netinet/accf_http.c
  user/dchagin/lemul/sys/netinet/in.h
  user/dchagin/lemul/sys/netinet/in_pcb.c
  user/dchagin/lemul/sys/netinet/in_pcb.h
  user/dchagin/lemul/sys/netinet/in_rmx.c
  user/dchagin/lemul/sys/netinet/in_var.h
  user/dchagin/lemul/sys/netinet/ip_fastfwd.c
  user/dchagin/lemul/sys/netinet/ip_gre.c
  user/dchagin/lemul/sys/netinet/ip_icmp.c
  user/dchagin/lemul/sys/netinet/ip_input.c
  user/dchagin/lemul/sys/netinet/ip_output.c
  user/dchagin/lemul/sys/netinet/siftr.c
  user/dchagin/lemul/sys/netinet/tcp_input.c
  user/dchagin/lemul/sys/netinet/tcp_output.c
  user/dchagin/lemul/sys/netinet/tcp_subr.c
  user/dchagin/lemul/sys/netinet6/frag6.c
  user/dchagin/lemul/sys/netinet6/icmp6.c
  user/dchagin/lemul/sys/netinet6/in6.c
  user/dchagin/lemul/sys/netinet6/in6.h
  user/dchagin/lemul/sys/netinet6/in6_ifattach.c
  user/dchagin/lemul/sys/netinet6/in6_pcb.c
  user/dchagin/lemul/sys/netinet6/in6_proto.c
  user/dchagin/lemul/sys/netinet6/in6_rmx.c
  user/dchagin/lemul/sys/netinet6/in6_src.c
  user/dchagin/lemul/sys/netinet6/ip6_input.c
  user/dchagin/lemul/sys/netinet6/ip6_ipsec.c
  user/dchagin/lemul/sys/netinet6/ip6_output.c
  user/dchagin/lemul/sys/netinet6/ip6_var.h
  user/dchagin/lemul/sys/netinet6/nd6.c
  user/dchagin/lemul/sys/netinet6/nd6.h
  user/dchagin/lemul/sys/netinet6/nd6_nbr.c
  user/dchagin/lemul/sys/netinet6/raw_ip6.c
  user/dchagin/lemul/sys/netinet6/scope6.c
  user/dchagin/lemul/sys/netinet6/scope6_var.h
  user/dchagin/lemul/sys/netinet6/sctp6_usrreq.c
  user/dchagin/lemul/sys/netinet6/udp6_usrreq.c
  user/dchagin/lemul/sys/netipsec/ipsec_output.c
  user/dchagin/lemul/sys/netpfil/ipfw/ip_fw_private.h
  user/dchagin/lemul/sys/netpfil/pf/pf.c
  user/dchagin/lemul/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
  user/dchagin/lemul/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c
  user/dchagin/lemul/sys/pc98/conf/GENERIC
  user/dchagin/lemul/sys/powerpc/conf/GENERIC
  user/dchagin/lemul/sys/powerpc/conf/GENERIC64
  user/dchagin/lemul/sys/powerpc/conf/WII
  user/dchagin/lemul/sys/rpc/clnt_vc.c
  user/dchagin/lemul/sys/rpc/svc_vc.c
  user/dchagin/lemul/sys/sparc64/conf/GENERIC
  user/dchagin/lemul/sys/sys/conf.h
  user/dchagin/lemul/sys/sys/file.h
  user/dchagin/lemul/sys/sys/poll.h
  user/dchagin/lemul/sys/sys/protosw.h
  user/dchagin/lemul/sys/sys/sockbuf.h
  user/dchagin/lemul/sys/sys/socket.h
  user/dchagin/lemul/sys/sys/socketvar.h
  user/dchagin/lemul/sys/sys/syscall.h
  user/dchagin/lemul/sys/sys/syscall.mk
  user/dchagin/lemul/sys/sys/syscallsubr.h
  user/dchagin/lemul/sys/sys/sysproto.h
  user/dchagin/lemul/tests/sys/netinet/Makefile
  user/dchagin/lemul/tools/build/mk/OptionalObsoleteFiles.inc
  user/dchagin/lemul/tools/tools/nanobsd/pcengines/ALIX_DSK
  user/dchagin/lemul/tools/tools/nanobsd/pcengines/ALIX_NFS
  user/dchagin/lemul/tools/tools/sysbuild/sysbuild.sh
  user/dchagin/lemul/tools/tools/sysdoc/tunables.mdoc
  user/dchagin/lemul/tools/tools/tinybsd/conf/default/TINYBSD
  user/dchagin/lemul/tools/tools/tinybsd/conf/vpn/TINYBSD
  user/dchagin/lemul/tools/tools/tinybsd/conf/wrap/TINYBSD
  user/dchagin/lemul/usr.bin/mkimg/image.c
  user/dchagin/lemul/usr.bin/w/w.c
  user/dchagin/lemul/usr.bin/yacc/Makefile
  user/dchagin/lemul/usr.sbin/Makefile
  user/dchagin/lemul/usr.sbin/bhyve/block_if.c
  user/dchagin/lemul/usr.sbin/bsdconfig/networking/share/device.subr
  user/dchagin/lemul/usr.sbin/bsdconfig/timezone/timezone
  user/dchagin/lemul/usr.sbin/ctld/Makefile
  user/dchagin/lemul/usr.sbin/ctld/chap.c
  user/dchagin/lemul/usr.sbin/ctld/ctl.conf.5
  user/dchagin/lemul/usr.sbin/ctld/ctld.8
  user/dchagin/lemul/usr.sbin/ctld/ctld.c
  user/dchagin/lemul/usr.sbin/ctld/ctld.h
  user/dchagin/lemul/usr.sbin/ctld/login.c
  user/dchagin/lemul/usr.sbin/ctld/parse.y
  user/dchagin/lemul/usr.sbin/ctld/token.l
  user/dchagin/lemul/usr.sbin/i2c/i2c.c
  user/dchagin/lemul/usr.sbin/inetd/inetd.c
  user/dchagin/lemul/usr.sbin/iscsid/chap.c
  user/dchagin/lemul/usr.sbin/pw/pw.c
  user/dchagin/lemul/usr.sbin/pw/tests/Makefile
  user/dchagin/lemul/usr.sbin/tzsetup/tzsetup.c
  user/dchagin/lemul/usr.sbin/usbconfig/dump.c
Directory Properties:
  user/dchagin/lemul/   (props changed)
  user/dchagin/lemul/cddl/   (props changed)
  user/dchagin/lemul/cddl/contrib/opensolaris/   (props changed)
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  user/dchagin/lemul/contrib/llvm/   (props changed)
  user/dchagin/lemul/etc/   (props changed)
  user/dchagin/lemul/gnu/usr.bin/gdb/   (props changed)
  user/dchagin/lemul/lib/libc/   (props changed)
  user/dchagin/lemul/sbin/   (props changed)
  user/dchagin/lemul/share/   (props changed)
  user/dchagin/lemul/share/man/man4/   (props changed)
  user/dchagin/lemul/sys/   (props changed)
  user/dchagin/lemul/sys/boot/   (props changed)
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/   (props changed)
  user/dchagin/lemul/sys/conf/   (props changed)
  user/dchagin/lemul/usr.bin/mkimg/   (props changed)
  user/dchagin/lemul/usr.sbin/bhyve/   (props changed)

Modified: user/dchagin/lemul/MAINTAINERS
==============================================================================
--- user/dchagin/lemul/MAINTAINERS	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/MAINTAINERS	Thu Nov 13 08:40:51 2014	(r274464)
@@ -48,7 +48,6 @@ cd(4)		ken	Pre-commit review requested.
 pass(4)		ken	Pre-commit review requested.
 ch(4)		ken	Pre-commit review requested.
 em(4)		jfv	Pre-commit review requested.
-bxe(4)		davidch	Pre-commit review requested.
 tdfx(4)		cokane  Just keep me informed of changes, try not to break it.
 sendmail	gshapiro	Pre-commit review requested.
 etc/mail	gshapiro	Pre-commit review requested.

Modified: user/dchagin/lemul/Makefile.inc1
==============================================================================
--- user/dchagin/lemul/Makefile.inc1	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/Makefile.inc1	Thu Nov 13 08:40:51 2014	(r274464)
@@ -1671,7 +1671,7 @@ _lib_libypclnt=	lib/libypclnt
 lib/libradius__L: lib/libmd__L
 .endif
 
-gnu/lib/libdialog__L: lib/ncurses/ncursesw__L
+gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L
 
 .for _lib in ${_prereq_libs}
 ${_lib}__PL: .PHONY .MAKE

Modified: user/dchagin/lemul/ObsoleteFiles.inc
==============================================================================
--- user/dchagin/lemul/ObsoleteFiles.inc	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/ObsoleteFiles.inc	Thu Nov 13 08:40:51 2014	(r274464)
@@ -38,6 +38,12 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20141109: faith/faithd removal
+OLD_FILES+=etc/rc.d/faith
+OLD_FILES+=usr/share/man/man4/faith.4.gz
+OLD_FILES+=usr/share/man/man4/if_faith.4.gz
+OLD_FILES+=usr/sbin/faithd
+OLD_FILES+=usr/share/man/man8/faithd.8.gz
 # 20141102: postrandom obsoleted by new /dev/random code
 OLD_FILES+=etc/rc.d/postrandom
 # 20141031: initrandom obsoleted by new /dev/random code

Modified: user/dchagin/lemul/UPDATING
==============================================================================
--- user/dchagin/lemul/UPDATING	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/UPDATING	Thu Nov 13 08:40:51 2014	(r274464)
@@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20141109:
+	faith(4) and faithd(8) has been removed from base system. It
+	has been obsolete for a very long time.
+
 20141104:
 	vt(4), the new console driver, is enabled by default. It brings
 	support for Unicode and double-width characters, as well as
@@ -833,8 +837,8 @@ COMMON ITEMS:
 	2.) update the ZFS boot block on your boot drive
 
 	The following example updates the ZFS boot block on the first
-	partition (freebsd-boot) of a GPT partitioned drive ad0:
-	"gpart bootcode -p /boot/gptzfsboot -i 1 ad0"
+	partition (freebsd-boot) of a GPT partitioned drive ada0:
+	"gpart bootcode -p /boot/gptzfsboot -i 1 ada0"
 
 	Non-boot pools do not need these updates.
 

Modified: user/dchagin/lemul/bin/sh/sh.1
==============================================================================
--- user/dchagin/lemul/bin/sh/sh.1	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/bin/sh/sh.1	Thu Nov 13 08:40:51 2014	(r274464)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd September 21, 2014
+.Dd November 7, 2014
 .Dt SH 1
 .Os
 .Sh NAME
@@ -2522,7 +2522,8 @@ and so on,
 decreasing the value of
 .Li $#
 by one.
-If there are zero positional parameters, shifting does not do anything.
+For portability, shifting if there are zero positional parameters
+should be avoided, since the shell may abort.
 .It Ic test
 A built-in equivalent of
 .Xr test 1 .

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Thu Nov 13 08:40:51 2014	(r274464)
@@ -77,9 +77,11 @@
 #ifndef lint
 extern boolean_t zfs_recover;
 extern uint64_t zfs_arc_max, zfs_arc_meta_limit;
+extern int zfs_vdev_async_read_max_active;
 #else
 boolean_t zfs_recover;
 uint64_t zfs_arc_max, zfs_arc_meta_limit;
+int zfs_vdev_async_read_max_active;
 #endif
 
 const char cmdname[] = "zdb";
@@ -2145,6 +2147,8 @@ dump_label(const char *dev)
 	(void) close(fd);
 }
 
+static uint64_t num_large_blocks;
+
 /*ARGSUSED*/
 static int
 dump_one_dir(const char *dsname, void *arg)
@@ -2157,6 +2161,8 @@ dump_one_dir(const char *dsname, void *a
 		(void) printf("Could not open %s, error %d\n", dsname, error);
 		return (0);
 	}
+	if (dmu_objset_ds(os)->ds_large_blocks)
+		num_large_blocks++;
 	dump_dir(os);
 	dmu_objset_disown(os, FTAG);
 	fuid_table_destroy();
@@ -2167,7 +2173,7 @@ dump_one_dir(const char *dsname, void *a
 /*
  * Block statistics.
  */
-#define	PSIZE_HISTO_SIZE (SPA_MAXBLOCKSIZE / SPA_MINBLOCKSIZE + 1)
+#define	PSIZE_HISTO_SIZE (SPA_OLD_MAXBLOCKSIZE / SPA_MINBLOCKSIZE + 2)
 typedef struct zdb_blkstats {
 	uint64_t zb_asize;
 	uint64_t zb_lsize;
@@ -2232,7 +2238,15 @@ zdb_count_block(zdb_cb_t *zcb, zilog_t *
 		zb->zb_lsize += BP_GET_LSIZE(bp);
 		zb->zb_psize += BP_GET_PSIZE(bp);
 		zb->zb_count++;
-		zb->zb_psize_histogram[BP_GET_PSIZE(bp) >> SPA_MINBLOCKSHIFT]++;
+
+		/*
+		 * The histogram is only big enough to record blocks up to
+		 * SPA_OLD_MAXBLOCKSIZE; larger blocks go into the last,
+		 * "other", bucket.
+		 */
+		int idx = BP_GET_PSIZE(bp) >> SPA_MINBLOCKSHIFT;
+		idx = MIN(idx, SPA_OLD_MAXBLOCKSIZE / SPA_MINBLOCKSIZE + 1);
+		zb->zb_psize_histogram[idx]++;
 
 		zb->zb_gangs += BP_COUNT_GANG(bp);
 
@@ -2384,8 +2398,14 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog
 
 	zcb->zcb_readfails = 0;
 
-	if (dump_opt['b'] < 5 &&
-	    gethrtime() > zcb->zcb_lastprint + NANOSEC) {
+	/* only call gethrtime() every 100 blocks */
+	static int iters;
+	if (++iters > 100)
+		iters = 0;
+	else
+		return (0);
+
+	if (dump_opt['b'] < 5 && gethrtime() > zcb->zcb_lastprint + NANOSEC) {
 		uint64_t now = gethrtime();
 		char buf[10];
 		uint64_t bytes = zcb->zcb_type[ZB_TOTAL][ZDB_OT_TOTAL].zb_asize;
@@ -2494,6 +2514,14 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
 					    (longlong_t)vd->vdev_ms_count);
 
 					msp->ms_ops = &zdb_metaslab_ops;
+
+					/*
+					 * We don't want to spend the CPU
+					 * manipulating the size-ordered
+					 * tree, so clear the range_tree
+					 * ops.
+					 */
+					msp->ms_tree->rt_ops = NULL;
 					VERIFY0(space_map_load(msp->ms_sm,
 					    msp->ms_tree, SM_ALLOC));
 					msp->ms_loaded = B_TRUE;
@@ -2930,6 +2958,7 @@ dump_zpool(spa_t *spa)
 		dump_metaslab_groups(spa);
 
 	if (dump_opt['d'] || dump_opt['i']) {
+		uint64_t refcount;
 		dump_dir(dp->dp_meta_objset);
 		if (dump_opt['d'] >= 3) {
 			dump_bpobj(&spa->spa_deferred_bpobj,
@@ -2949,8 +2978,21 @@ dump_zpool(spa_t *spa)
 		}
 		(void) dmu_objset_find(spa_name(spa), dump_one_dir,
 		    NULL, DS_FIND_SNAPSHOTS | DS_FIND_CHILDREN);
+
+		(void) feature_get_refcount(spa,
+		    &spa_feature_table[SPA_FEATURE_LARGE_BLOCKS], &refcount);
+		if (num_large_blocks != refcount) {
+			(void) printf("large_blocks feature refcount mismatch: "
+			    "expected %lld != actual %lld\n",
+			    (longlong_t)num_large_blocks,
+			    (longlong_t)refcount);
+			rc = 2;
+		} else {
+			(void) printf("Verified large_blocks feature refcount "
+			    "is correct (%llu)\n", (longlong_t)refcount);
+		}
 	}
-	if (dump_opt['b'] || dump_opt['c'])
+	if (rc == 0 && (dump_opt['b'] || dump_opt['c']))
 		rc = dump_block_stats(spa);
 
 	if (rc == 0)
@@ -3508,6 +3550,13 @@ main(int argc, char **argv)
 	 */
 	zfs_arc_max = zfs_arc_meta_limit = 256 * 1024 * 1024;
 
+	/*
+	 * "zdb -c" uses checksum-verifying scrub i/os which are async reads.
+	 * "zdb -b" uses traversal prefetch which uses async reads.
+	 * For good performance, let several of them be active at once.
+	 */
+	zfs_vdev_async_read_max_active = 10;
+
 	kernel_init(FREAD);
 	g_zfs = libzfs_init();
 	ASSERT(g_zfs != NULL);

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Thu Nov 13 08:40:51 2014	(r274464)
@@ -27,10 +27,11 @@
 .\" Copyright (c) 2014, Joyent, Inc. All rights reserved.
 .\" Copyright (c) 2013, Steven Hartland <smh at FreeBSD.org>
 .\" Copyright (c) 2014, Xin LI <delphij at FreeBSD.org>
+.\" Copyright (c) 2014, The FreeBSD Foundation, All Rights Reserved.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 30, 2014
+.Dd November 12, 2014
 .Dt ZFS 8
 .Os
 .Sh NAME
@@ -179,12 +180,12 @@
 .Ar bookmark
 .Nm
 .Cm send
-.Op Fl DnPpRve
+.Op Fl DnPpRveL
 .Op Fl i Ar snapshot | Fl I Ar snapshot
 .Ar snapshot
 .Nm
 .Cm send
-.Op Fl e
+.Op Fl eL
 .Op Fl i Ar snapshot Ns | Ns bookmark
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Nm
@@ -1187,6 +1188,12 @@ systems is strongly discouraged, and may
 .Pp
 The size specified must be a power of two greater than or equal to 512 and less
 than or equal to 128 Kbytes.
+If the
+.Sy large_blocks
+feature is enabled on the pool, the size may be up to 1 Mbyte.
+See
+.Xr zpool-features 7
+for details on ZFS feature flags.
 .Pp
 Changing the file system's
 .Sy recordsize
@@ -1785,7 +1792,7 @@ descendent file systems.
 Recursively destroy all clones of these snapshots, including the clones,
 snapshots, and children.
 If this flag is specified, the
-.Op fl d
+.Fl d
 flag will have no effect.
 .It Fl n
 Do a dry-run ("No-op") deletion. No data will be deleted. This is useful in
@@ -2477,7 +2484,7 @@ feature.
 .It Xo
 .Nm
 .Cm send
-.Op Fl DnPpRve
+.Op Fl DnPpRveL
 .Op Fl i Ar snapshot | Fl I Ar snapshot
 .Ar snapshot
 .Xc
@@ -2549,6 +2556,22 @@ be used regardless of the dataset's
 property, but performance will be much better if the filesystem uses a
 dedup-capable checksum (eg.
 .Sy sha256 ) .
+.It Fl L
+Generate a stream which may contain blocks larger than 128KB.
+This flag
+has no effect if the
+.Sy large_blocks
+pool feature is disabled, or if the
+.Sy recordsize
+property of this filesystem has never been set above 128KB.
+The receiving system must have the
+.Sy large_blocks
+pool feature enabled as well.
+See
+.Xr zpool-features 7
+for details on ZFS feature flags and the
+.Sy large_blocks
+feature.
 .It Fl e
 Generate a more compact stream by using WRITE_EMBEDDED records for blocks
 which are stored more compactly on disk by the
@@ -2596,7 +2619,7 @@ on future versions of
 .It Xo
 .Nm
 .Cm send
-.Op Fl e
+.Op Fl eL
 .Op Fl i Ar snapshot Ns | Ns Ar bookmark
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Xc
@@ -2622,6 +2645,22 @@ specified as the last component of the n
 If the incremental target is a clone, the incremental source can
 be the origin snapshot, or an earlier snapshot in the origin's filesystem,
 or the origin's origin, etc.
+.It Fl L
+Generate a stream which may contain blocks larger than 128KB.
+This flag
+has no effect if the
+.Sy large_blocks
+pool feature is disabled, or if the
+.Sy recordsize
+property of this filesystem has never been set above 128KB.
+The receiving system must have the
+.Sy large_blocks
+pool feature enabled as well.
+See
+.Xr zpool-features 7
+for details on ZFS feature flags and the
+.Sy large_blocks
+feature.
 .It Fl e
 Generate a more compact stream by using WRITE_EMBEDDED records for blocks
 which are stored more compactly on disk by the

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Thu Nov 13 08:40:51 2014	(r274464)
@@ -274,9 +274,9 @@ get_usage(zfs_help_t idx)
 	case HELP_ROLLBACK:
 		return (gettext("\trollback [-rRf] <snapshot>\n"));
 	case HELP_SEND:
-		return (gettext("\tsend [-DnPpRve] [-[iI] snapshot] "
+		return (gettext("\tsend [-DnPpRvLe] [-[iI] snapshot] "
 		    "<snapshot>\n"
-		    "\tsend [-e] [-i snapshot|bookmark] "
+		    "\tsend [-Le] [-i snapshot|bookmark] "
 		    "<filesystem|volume|snapshot>\n"));
 	case HELP_SET:
 		return (gettext("\tset <property=value> "
@@ -3709,7 +3709,7 @@ zfs_do_send(int argc, char **argv)
 	boolean_t extraverbose = B_FALSE;
 
 	/* check options */
-	while ((c = getopt(argc, argv, ":i:I:RDpvnPe")) != -1) {
+	while ((c = getopt(argc, argv, ":i:I:RDpvnPLe")) != -1) {
 		switch (c) {
 		case 'i':
 			if (fromname)
@@ -3744,6 +3744,9 @@ zfs_do_send(int argc, char **argv)
 		case 'n':
 			flags.dryrun = B_TRUE;
 			break;
+		case 'L':
+			flags.largeblock = B_TRUE;
+			break;
 		case 'e':
 			flags.embed_data = B_TRUE;
 			break;
@@ -3800,6 +3803,8 @@ zfs_do_send(int argc, char **argv)
 		if (zhp == NULL)
 			return (1);
 
+		if (flags.largeblock)
+			lzc_flags |= LZC_SEND_FLAG_LARGE_BLOCK;
 		if (flags.embed_data)
 			lzc_flags |= LZC_SEND_FLAG_EMBED_DATA;
 

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7	Thu Nov 13 08:40:51 2014	(r274464)
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 1, 2014
+.Dd November 10, 2014
 .Dt ZPOOL-FEATURES 7
 .Os
 .Sh NAME
@@ -427,6 +427,33 @@ This feature becomes
 as soon as it is enabled and will
 never return to being
 .Sy enabled .
+.It Sy large_blocks
+.Bl -column "READ\-ONLY COMPATIBLE" "org.open-zfs:large_block"
+.It GUID Ta org.open-zfs:large_block
+.It READ\-ONLY COMPATIBLE Ta no
+.It DEPENDENCIES Ta extensible_dataset
+.El
+.Pp
+The
+.Sy large_block
+feature allows the record size on a dataset to be
+set larger than 128KB.
+.Pp
+This feature becomes
+.Sy active
+once a
+.Sy recordsize
+property has been set larger than 128KB, and will return to being 
+.Sy enabled
+once all filesystems that have ever had their recordsize larger than 128KB
+are destroyed.
+.Pp
+Please note that booting from datasets that have recordsize greater than
+128KB is
+.Em NOT
+supported by the
+.Fx
+boot loader.
 .El
 .Sh SEE ALSO
 .Xr zpool 8

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c	Thu Nov 13 08:40:51 2014	(r274464)
@@ -54,7 +54,6 @@ uint64_t total_stream_len = 0;
 FILE *send_stream = 0;
 boolean_t do_byteswap = B_FALSE;
 boolean_t do_cksum = B_TRUE;
-#define	INITIAL_BUFLEN (1<<20)
 
 static void
 usage(void)
@@ -67,6 +66,18 @@ usage(void)
 	exit(1);
 }
 
+static void *
+safe_malloc(size_t size)
+{
+	void *rv = malloc(size);
+	if (rv == NULL) {
+		(void) fprintf(stderr, "ERROR; failed to allocate %zu bytes\n",
+		    size);
+		abort();
+	}
+	return (rv);
+}
+
 /*
  * ssread - send stream read.
  *
@@ -158,7 +169,7 @@ print_block(char *buf, int length)
 int
 main(int argc, char *argv[])
 {
-	char *buf = malloc(INITIAL_BUFLEN);
+	char *buf = safe_malloc(SPA_MAXBLOCKSIZE);
 	uint64_t drr_record_count[DRR_NUMTYPES] = { 0 };
 	uint64_t total_records = 0;
 	dmu_replay_record_t thedrr;
@@ -307,9 +318,9 @@ main(int argc, char *argv[])
 				nvlist_t *nv;
 				int sz = drr->drr_payloadlen;
 
-				if (sz > INITIAL_BUFLEN) {
+				if (sz > SPA_MAXBLOCKSIZE) {
 					free(buf);
-					buf = malloc(sz);
+					buf = safe_malloc(sz);
 				}
 				(void) ssread(buf, sz, &zc);
 				if (ferror(send_stream))

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/ztest/ztest.c
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Thu Nov 13 08:40:51 2014	(r274464)
@@ -987,9 +987,15 @@ ztest_spa_get_ashift() {
 static int
 ztest_random_blocksize(void)
 {
-	// Choose a block size >= the ashift.
-	uint64_t block_shift =
-	    ztest_random(SPA_MAXBLOCKSHIFT - ztest_spa_get_ashift() + 1);
+	uint64_t block_shift;
+	/*
+	 * Choose a block size >= the ashift.
+	 * If the SPA supports new MAXBLOCKSIZE, test up to 1MB blocks.
+	 */
+	int maxbs = SPA_OLD_MAXBLOCKSHIFT;
+	if (spa_maxblocksize(ztest_spa) == SPA_MAXBLOCKSIZE)
+		maxbs = 20;
+	block_shift = ztest_random(maxbs - ztest_spa_get_ashift() + 1);
 	return (1 << (SPA_MINBLOCKSHIFT + block_shift));
 }
 
@@ -4789,7 +4795,7 @@ ztest_fault_inject(ztest_ds_t *zd, uint6
 	char path0[MAXPATHLEN];
 	char pathrand[MAXPATHLEN];
 	size_t fsize;
-	int bshift = SPA_MAXBLOCKSHIFT + 2;	/* don't scrog all labels */
+	int bshift = SPA_OLD_MAXBLOCKSHIFT + 2;	/* don't scrog all labels */
 	int iters = 1000;
 	int maxfaults;
 	int mirror_save;

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Thu Nov 13 08:40:51 2014	(r274464)
@@ -609,6 +609,9 @@ typedef struct sendflags {
 	/* show progress (ie. -v) */
 	boolean_t progress;
 
+	/* large blocks (>128K) are permitted */
+	boolean_t largeblock;
+
 	/* WRITE_EMBEDDED records of type DATA are permitted */
 	boolean_t embed_data;
 } sendflags_t;

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Thu Nov 13 08:40:51 2014	(r274464)
@@ -1080,21 +1080,36 @@ zfs_valid_proplist(libzfs_handle_t *hdl,
 			break;
 		}
 
-		case ZFS_PROP_RECORDSIZE:
 		case ZFS_PROP_VOLBLOCKSIZE:
-			/* must be power of two within SPA_{MIN,MAX}BLOCKSIZE */
+		case ZFS_PROP_RECORDSIZE:
+		{
+			int maxbs = SPA_MAXBLOCKSIZE;
+			if (zhp != NULL) {
+				maxbs = zpool_get_prop_int(zhp->zpool_hdl,
+				    ZPOOL_PROP_MAXBLOCKSIZE, NULL);
+			}
+			/*
+			 * Volumes are limited to a volblocksize of 128KB,
+			 * because they typically service workloads with
+			 * small random writes, which incur a large performance
+			 * penalty with large blocks.
+			 */
+			if (prop == ZFS_PROP_VOLBLOCKSIZE)
+				maxbs = SPA_OLD_MAXBLOCKSIZE;
+			/*
+			 * The value must be a power of two between
+			 * SPA_MINBLOCKSIZE and maxbs.
+			 */
 			if (intval < SPA_MINBLOCKSIZE ||
-			    intval > SPA_MAXBLOCKSIZE || !ISP2(intval)) {
+			    intval > maxbs || !ISP2(intval)) {
 				zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
-				    "'%s' must be power of 2 from %u "
-				    "to %uk"), propname,
-				    (uint_t)SPA_MINBLOCKSIZE,
-				    (uint_t)SPA_MAXBLOCKSIZE >> 10);
+				    "'%s' must be power of 2 from 512B "
+				    "to %uKB"), propname, maxbs >> 10);
 				(void) zfs_error(hdl, EZFS_BADPROP, errbuf);
 				goto error;
 			}
 			break;
-
+		}
 		case ZFS_PROP_MLSLABEL:
 		{
 #ifdef sun
@@ -1471,7 +1486,9 @@ zfs_setprop_error(libzfs_handle_t *hdl, 
 		break;
 
 	case ERANGE:
-		if (prop == ZFS_PROP_COMPRESSION) {
+	case EDOM:
+		if (prop == ZFS_PROP_COMPRESSION ||
+		    prop == ZFS_PROP_RECORDSIZE) {
 			(void) zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
 			    "property setting is not allowed on "
 			    "bootable datasets"));
@@ -3197,9 +3214,7 @@ zfs_create(libzfs_handle_t *hdl, const c
 		case EDOM:
 			zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
 			    "volume block size must be power of 2 from "
-			    "%u to %uk"),
-			    (uint_t)SPA_MINBLOCKSIZE,
-			    (uint_t)SPA_MAXBLOCKSIZE >> 10);
+			    "512B to 128KB"));
 
 			return (zfs_error(hdl, EZFS_BADPROP, errbuf));
 

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Thu Nov 13 08:40:51 2014	(r274464)
@@ -215,7 +215,7 @@ static void *
 cksummer(void *arg)
 {
 	dedup_arg_t *dda = arg;
-	char *buf = malloc(1<<20);
+	char *buf = zfs_alloc(dda->dedup_hdl, SPA_MAXBLOCKSIZE);
 	dmu_replay_record_t thedrr;
 	dmu_replay_record_t *drr = &thedrr;
 	struct drr_begin *drrb = &thedrr.drr_u.drr_begin;
@@ -280,9 +280,9 @@ cksummer(void *arg)
 			    DMU_COMPOUNDSTREAM && drr->drr_payloadlen != 0) {
 				int sz = drr->drr_payloadlen;
 
-				if (sz > 1<<20) {
-					free(buf);
-					buf = malloc(sz);
+				if (sz > SPA_MAXBLOCKSIZE) {
+					buf = zfs_realloc(dda->dedup_hdl, buf,
+					    SPA_MAXBLOCKSIZE, sz);
 				}
 				(void) ssread(buf, sz, ofp);
 				if (ferror(stdin))
@@ -815,7 +815,7 @@ typedef struct send_dump_data {
 	char prevsnap[ZFS_MAXNAMELEN];
 	uint64_t prevsnap_obj;
 	boolean_t seenfrom, seento, replicate, doall, fromorigin;
-	boolean_t verbose, dryrun, parsable, progress, embed_data;
+	boolean_t verbose, dryrun, parsable, progress, embed_data, large_block;
 	int outfd;
 	boolean_t err;
 	nvlist_t *fss;
@@ -1163,6 +1163,8 @@ dump_snapshot(zfs_handle_t *zhp, void *a
 		}
 
 		enum lzc_send_flags flags = 0;
+		if (sdd->large_block)
+			flags |= LZC_SEND_FLAG_LARGE_BLOCK;
 		if (sdd->embed_data)
 			flags |= LZC_SEND_FLAG_EMBED_DATA;
 
@@ -1511,6 +1513,7 @@ zfs_send(zfs_handle_t *zhp, const char *
 	sdd.parsable = flags->parsable;
 	sdd.progress = flags->progress;
 	sdd.dryrun = flags->dryrun;
+	sdd.large_block = flags->largeblock;
 	sdd.embed_data = flags->embed_data;
 	sdd.filter_cb = filter_func;
 	sdd.filter_cb_arg = cb_arg;
@@ -2545,7 +2548,7 @@ static int
 recv_skip(libzfs_handle_t *hdl, int fd, boolean_t byteswap)
 {
 	dmu_replay_record_t *drr;
-	void *buf = malloc(1<<20);
+	void *buf = zfs_alloc(hdl, SPA_MAXBLOCKSIZE);
 	char errbuf[1024];
 
 	(void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN,

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c	Thu Nov 13 08:40:51 2014	(r274464)
@@ -502,6 +502,10 @@ lzc_get_holds(const char *snapname, nvli
  *
  * "fd" is the file descriptor to write the send stream to.
  *
+ * If "flags" contains LZC_SEND_FLAG_LARGE_BLOCK, the stream is permitted
+ * to contain DRR_WRITE records with drr_length > 128K, and DRR_OBJECT
+ * records with drr_blksz > 128K.
+ *
  * If "flags" contains LZC_SEND_FLAG_EMBED_DATA, the stream is permitted
  * to contain DRR_WRITE_EMBEDDED records with drr_etype==BP_EMBEDDED_TYPE_DATA,
  * which the receiving system must support (as indicated by support
@@ -518,6 +522,8 @@ lzc_send(const char *snapname, const cha
 	fnvlist_add_int32(args, "fd", fd);
 	if (from != NULL)
 		fnvlist_add_string(args, "fromsnap", from);
+	if (flags & LZC_SEND_FLAG_LARGE_BLOCK)
+		fnvlist_add_boolean(args, "largeblockok");
 	if (flags & LZC_SEND_FLAG_EMBED_DATA)
 		fnvlist_add_boolean(args, "embedok");
 	err = lzc_ioctl(ZFS_IOC_SEND_NEW, snapname, args, NULL);

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h	Thu Nov 13 08:40:51 2014	(r274464)
@@ -54,7 +54,8 @@ int lzc_release(nvlist_t *, nvlist_t **)
 int lzc_get_holds(const char *, nvlist_t **);
 
 enum lzc_send_flags {
-	LZC_SEND_FLAG_EMBED_DATA = 1 << 0
+	LZC_SEND_FLAG_EMBED_DATA = 1 << 0,
+	LZC_SEND_FLAG_LARGE_BLOCK = 1 << 1
 };
 
 int lzc_send(const char *, const char *, int, enum lzc_send_flags);

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c	Thu Nov 13 08:40:51 2014	(r274464)
@@ -24,6 +24,8 @@
  */
 /*
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright 2012 Garrett D'Amore <garrett at damore.org>.  All rights reserved.
+ * Copyright (c) 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/zfs_context.h>
@@ -32,8 +34,10 @@ int taskq_now;
 taskq_t *system_taskq;
 
 #define	TASKQ_ACTIVE	0x00010000
+#define	TASKQ_NAMELEN	31
 
 struct taskq {
+	char		tq_name[TASKQ_NAMELEN + 1];
 	kmutex_t	tq_lock;
 	krwlock_t	tq_threadlock;
 	kcondvar_t	tq_dispatch_cv;
@@ -136,6 +140,7 @@ taskq_dispatch(taskq_t *tq, task_func_t 
 	t->tqent_prev->tqent_next = t;
 	t->tqent_func = func;
 	t->tqent_arg = arg;
+	t->tqent_flags = 0;
 	cv_signal(&tq->tq_dispatch_cv);
 	mutex_exit(&tq->tq_lock);
 	return (1);
@@ -245,6 +250,7 @@ taskq_create(const char *name, int nthre
 	cv_init(&tq->tq_dispatch_cv, NULL, CV_DEFAULT, NULL);
 	cv_init(&tq->tq_wait_cv, NULL, CV_DEFAULT, NULL);
 	cv_init(&tq->tq_maxalloc_cv, NULL, CV_DEFAULT, NULL);
+	(void) strncpy(tq->tq_name, name, TASKQ_NAMELEN + 1);
 	tq->tq_flags = flags | TASKQ_ACTIVE;
 	tq->tq_active = nthreads;
 	tq->tq_nthreads = nthreads;

Modified: user/dchagin/lemul/contrib/hyperv/tools/hv_kvp_daemon.c
==============================================================================
--- user/dchagin/lemul/contrib/hyperv/tools/hv_kvp_daemon.c	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/contrib/hyperv/tools/hv_kvp_daemon.c	Thu Nov 13 08:40:51 2014	(r274464)
@@ -285,7 +285,7 @@ kvp_file_init(void)
 	int alloc_unit = sizeof(struct kvp_record) * ENTRIES_PER_BLOCK;
 
 	if (mkdir("/var/db/hyperv/pool", S_IRUSR | S_IWUSR | S_IROTH) < 0 &&
-	    errno != EISDIR) {
+	    (errno != EEXIST && errno != EISDIR)) {
 		KVP_LOG(LOG_ERR, " Failed to create /var/db/hyperv/pool\n");
 		exit(EXIT_FAILURE);
 	}
@@ -511,25 +511,25 @@ kvp_get_value(int pool, __u8 *key, int k
 
 
 static int
-kvp_pool_enumerate(int pool, int index, __u8 *key, int key_size,
+kvp_pool_enumerate(int pool, int idx, __u8 *key, int key_size,
     __u8 *value, int value_size)
 {
 	struct kvp_record *record;
 
 	KVP_LOG(LOG_DEBUG, "kvp_pool_enumerate: pool = %d, index = %d\n,",
-	    pool, index);
+	    pool, idx);
 
 	/* First update our in-memory state first. */
 	kvp_update_mem_state(pool);
 	record = kvp_pools[pool].records;
 
 	/* Index starts with 0 */
-	if (index >= kvp_pools[pool].num_records) {
+	if (idx >= kvp_pools[pool].num_records) {
 		return (1);
 	}
 
-	memcpy(key, record[index].key, key_size);
-	memcpy(value, record[index].value, value_size);
+	memcpy(key, record[idx].key, key_size);
+	memcpy(value, record[idx].value, value_size);
 	return (0);
 }
 

Modified: user/dchagin/lemul/contrib/libxo/README.md
==============================================================================
--- user/dchagin/lemul/contrib/libxo/README.md	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/contrib/libxo/README.md	Thu Nov 13 08:40:51 2014	(r274464)
@@ -60,3 +60,5 @@ option: 
 View the beautiful documentation at:
 
 http://juniper.github.io/libxo/libxo-manual.html
+
+[![Analytics](https://ga-beacon.appspot.com/UA-56056421-1/Juniper/libxo/Readme)](https://github.com/Juniper/libxo)

Modified: user/dchagin/lemul/contrib/libxo/configure.ac
==============================================================================
--- user/dchagin/lemul/contrib/libxo/configure.ac	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/contrib/libxo/configure.ac	Thu Nov 13 08:40:51 2014	(r274464)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.1.4], [phil at juniper.net])
+AC_INIT([libxo], [0.1.5], [phil at juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Modified: user/dchagin/lemul/contrib/libxo/libxo/libxo.c
==============================================================================
--- user/dchagin/lemul/contrib/libxo/libxo/libxo.c	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/contrib/libxo/libxo/libxo.c	Thu Nov 13 08:40:51 2014	(r274464)
@@ -79,7 +79,7 @@ struct xo_handle_s {
     unsigned short xo_indent;	/* Indent level (if pretty) */
     unsigned short xo_indent_by; /* Indent amount (tab stop) */
     xo_write_func_t xo_write;	/* Write callback */
-    xo_close_func_t xo_close;	/* Clo;se callback */
+    xo_close_func_t xo_close;	/* Close callback */
     xo_formatter_t xo_formatter; /* Custom formating function */
     xo_checkpointer_t xo_checkpointer; /* Custom formating support function */
     void *xo_opaque;		/* Opaque data for write function */
@@ -1912,6 +1912,7 @@ xo_format_string (xo_handle_t *xop, xo_b
 		  xo_format_t *xfp)
 {
     static char null[] = "(null)";
+
     char *cp = NULL;
     wchar_t *wcp = NULL;
     int len, cols = 0, rc = 0;
@@ -1922,16 +1923,33 @@ xo_format_string (xo_handle_t *xop, xo_b
     if (xo_check_conversion(xop, xfp->xf_enc, need_enc))
 	return 0;
 
+    len = xfp->xf_width[XF_WIDTH_SIZE];
+
     if (xfp->xf_enc == XF_ENC_WIDE) {
 	wcp = va_arg(xop->xo_vap, wchar_t *);
 	if (xfp->xf_skip)
 	    return 0;
 
+	/*
+	 * Dont' deref NULL; use the traditional "(null)" instead
+	 * of the more accurate "who's been a naughty boy, then?".
+	 */
+	if (wcp == NULL) {
+	    cp = null;
+	    len = sizeof(null) - 1;
+	}
+
     } else {
 	cp = va_arg(xop->xo_vap, char *); /* UTF-8 or native */
 	if (xfp->xf_skip)
 	    return 0;
 
+	/* Echo "Dont' deref NULL" logic */
+	if (cp == NULL) {
+	    cp = null;
+	    len = sizeof(null) - 1;
+	}
+
 	/*
 	 * Optimize the most common case, which is "%s".  We just
 	 * need to copy the complete string to the output buffer.
@@ -1957,17 +1975,6 @@ xo_format_string (xo_handle_t *xop, xo_b
 	}
     }
 
-    len = xfp->xf_width[XF_WIDTH_SIZE];
-
-    /*
-     * Dont' deref NULL; use the traditional "(null)" instead
-     * of the more accurate "who's been a naughty boy, then?".
-     */
-    if (cp == NULL && wcp == NULL) {
-	cp = null;
-	len = sizeof(null) - 1;
-    }
-
     cols = xo_format_string_direct(xop, xbp, flags, wcp, cp, len,
 				   xfp->xf_width[XF_WIDTH_MAX],
 				   need_enc, xfp->xf_enc);
@@ -3859,7 +3866,7 @@ xo_close_list_h (xo_handle_t *xop, const
     rc = xo_printf(xop, "%s%*s]", pre_nl, xo_indent(xop), "");
     xop->xo_stack[xop->xo_depth].xs_flags |= XSF_NOT_FIRST;
 
-    return 0;
+    return rc;
 }
 
 int

Modified: user/dchagin/lemul/contrib/libxo/libxo/xoconfig.h
==============================================================================
--- user/dchagin/lemul/contrib/libxo/libxo/xoconfig.h	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/contrib/libxo/libxo/xoconfig.h	Thu Nov 13 08:40:51 2014	(r274464)
@@ -158,7 +158,7 @@
 #define PACKAGE_NAME "libxo"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libxo 0.1.4"
+#define PACKAGE_STRING "libxo 0.1.5"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libxo"
@@ -167,7 +167,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.1.4"
+#define PACKAGE_VERSION "0.1.5"
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
@@ -181,7 +181,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.1.4"
+#define VERSION "0.1.5"
 
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */

Modified: user/dchagin/lemul/contrib/libxo/libxo/xoversion.h
==============================================================================
--- user/dchagin/lemul/contrib/libxo/libxo/xoversion.h	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/contrib/libxo/libxo/xoversion.h	Thu Nov 13 08:40:51 2014	(r274464)
@@ -18,7 +18,7 @@
 /**
  * The version string
  */
-#define LIBXO_VERSION		"0.1.4"
+#define LIBXO_VERSION		"0.1.5"
 
 /**
  * The version number

Modified: user/dchagin/lemul/contrib/libxo/tests/core/Makefile.am
==============================================================================
--- user/dchagin/lemul/contrib/libxo/tests/core/Makefile.am	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/contrib/libxo/tests/core/Makefile.am	Thu Nov 13 08:40:51 2014	(r274464)
@@ -30,7 +30,7 @@ test_07_test_SOURCES = test_07.c
 
 # TEST_CASES := $(shell cd ${srcdir} ; echo *.c )
 
-bin_PROGRAMS = ${TEST_CASES:.c=.test}
+noinst_PROGRAMS = ${TEST_CASES:.c=.test}
 
 LDADD = \
     ${top_builddir}/libxo/libxo.la
@@ -66,7 +66,7 @@ valgrind:
 
 TEST_ONE = \
   LIBXO_OPTIONS=:W$$fmt \
-      ${CHECKER} $$base.test ${TEST_OPTS} \
+      ${CHECKER} ./$$base.test ${TEST_OPTS} \
       > out/$$base.$$fmt.out 2> out/$$base.$$fmt.err ; \
  ${DIFF} -Nu ${srcdir}/saved/$$base.$$fmt.out out/$$base.$$fmt.out ${S2O} ; \
  ${DIFF} -Nu ${srcdir}/saved/$$base.$$fmt.err out/$$base.$$fmt.err ${S2O}

Modified: user/dchagin/lemul/contrib/libxo/tests/core/saved/test_07.J.out
==============================================================================
--- user/dchagin/lemul/contrib/libxo/tests/core/saved/test_07.J.out	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/contrib/libxo/tests/core/saved/test_07.J.out	Thu Nov 13 08:40:51 2014	(r274464)
@@ -1,2 +1,2 @@
-{"employees": {"v1":"γιγνώσκειν","v2":"ὦ ἄνδρες ᾿Αθηναῖοι","columns":28,"columns":2,"v1":"ახლავე გაიაროთ რეგისტრაცია","v2":"Unicode-ის მეათე საერთაშორისო","columns":55, "employee": ["columns":0, {"first-name":"Jim","nic-name":"\"რეგტ\"","last-name":"გთხოვთ ახ","department":431,"percent-time":90,"columns":23,"benefits":"full"}, {"first-name":"Terry","nic-name":"\"<one\"","last-name":"Οὐχὶ ταὐτὰ παρίσταταί μοι Jones","department":660,"percent-time":90,"columns":47,"benefits":"full"}, {"first-name":"Leslie","nic-name":"\"Les\"","last-name":"Patterson","department":341,"percent-time":60,"columns":25,"benefits":"full"}, {"first-name":"Ashley","nic-name":"\"Ash\"","last-name":"Meter & Smith","department":1440,"percent-time":40,"columns":30}, {"first-name":"0123456789","nic-name":"\"0123456789\"","last-name":"01234567890123
 4567890","department":1440,"percent-time":40,"columns":49}, {"first-name":"ახლა","nic-name":"\"გაიარო\"","last-name":"საერთაშორისო","department":123,"percent-time":90,"columns":29,"benefits":"full"}]}
+{"employees": {"test": [{"filename":"(null)"}],"v1":"γιγνώσκειν","v2":"ὦ ἄνδρες ᾿Αθηναῖοι","columns":28,"columns":2,"v1":"ახლავე გაიაროთ რეგისტრაცია","v2":"Unicode-ის მეათე საერთაშორისო","columns":55, "employee": ["columns":0, {"first-name":"Jim","nic-name":"\"რეგტ\"","last-name":"გთხოვთ ახ","department":431,"percent-time":90,"columns":23,"benefits":"full"}, {"first-name":"Terry","nic-name":"\"<one\"","last-name":"Οὐχὶ ταὐτὰ παρίσταταί μοι Jones","department":660,"percent-time":90,"columns":47,"benefits":"full"}, {"first-name":"Leslie","nic-name":"\"Les\"","last-name":"Patterson","department":341,"percent-time":60,"columns":25,"benefits":"full"}, {"first-name":"Ashley","nic-name":"\"Ash\"","last-name":"Meter & Smith","department":1440,"percent-time":40,"columns":30}, {"first-name":"0123456789","nic-name":"\"012345678
 9\"","last-name":"012345678901234567890","department":1440,"percent-time":40,"columns":49}, {"first-name":"ახლა","nic-name":"\"გაიარო\"","last-name":"საერთაშორისო","department":123,"percent-time":90,"columns":29,"benefits":"full"}]}
 }

Modified: user/dchagin/lemul/contrib/libxo/tests/core/saved/test_07.JP.out
==============================================================================
--- user/dchagin/lemul/contrib/libxo/tests/core/saved/test_07.JP.out	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/contrib/libxo/tests/core/saved/test_07.JP.out	Thu Nov 13 08:40:51 2014	(r274464)
@@ -1,5 +1,10 @@
 {
   "employees": {
+    "test": [
+      {
+        "filename": "(null)"
+      }
+    ],
     "v1": "γιγνώσκειν",
     "v2": "ὦ ἄνδρες ᾿Αθηναῖοι",
     "columns": 28,

Modified: user/dchagin/lemul/contrib/libxo/tests/core/saved/test_07.X.out
==============================================================================
--- user/dchagin/lemul/contrib/libxo/tests/core/saved/test_07.X.out	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/contrib/libxo/tests/core/saved/test_07.X.out	Thu Nov 13 08:40:51 2014	(r274464)
@@ -1 +1 @@
-<employees><v1>γιγνώσκειν</v1><v2>ὦ ἄνδρες ᾿Αθηναῖοι</v2><columns>28</columns><columns>2</columns><v1>ახლავე გაიაროთ რეგისტრაცია</v1><v2>Unicode-ის მეათე საერთაშორისო</v2><columns>55</columns><columns>0</columns><employee><first-name>Jim</first-name><nic-name>"რეგტ"</nic-name><last-name>გთხოვთ ახ</last-name><department>431</department><percent-time>90</percent-time><columns>23</columns><benefits full-time="honest & for true">full</benefits></employee><employee><first-name>Terry</first-name><nic-name>"<one"</nic-name><last-name>Οὐχὶ ταὐτὰ παρίσταταί μοι Jones</last-name><department>660</department><percent-time>90</percent-time><columns>47</columns><benefits full-time="honest & for true">full</benefits></employee><employee><first-name>Leslie</first-name><nic-name>"Les"</nic-name><last-name>Patterson</last-n
 ame><department>341</department><percent-time>60</percent-time><columns>25</columns><benefits full-time="honest & for true">full</benefits></employee><employee><first-name>Ashley</first-name><nic-name>"Ash"</nic-name><last-name>Meter & Smith</last-name><department>1440</department><percent-time>40</percent-time><columns>30</columns></employee><employee><first-name>0123456789</first-name><nic-name>"0123456789"</nic-name><last-name>012345678901234567890</last-name><department>1440</department><percent-time>40</percent-time><columns>49</columns></employee><employee><first-name>ახლა</first-name><nic-name>"გაიარო"</nic-name><last-name>საერთაშორისო</last-name><department>123</department><percent-time>90</percent-time><columns>29</columns><benefits full-time="honest & for true">full</benefits></employee></employees>
\ No newline at end of file
+<employees><test><filename>(null)</filename></test><v1>γιγνώσκειν</v1><v2>ὦ ἄνδρες ᾿Αθηναῖοι</v2><columns>28</columns><columns>2</columns><v1>ახლავე გაიაროთ რეგისტრაცია</v1><v2>Unicode-ის მეათე საერთაშორისო</v2><columns>55</columns><columns>0</columns><employee><first-name>Jim</first-name><nic-name>"რეგტ"</nic-name><last-name>გთხოვთ ახ</last-name><department>431</department><percent-time>90</percent-time><columns>23</columns><benefits full-time="honest & for true">full</benefits></employee><employee><first-name>Terry</first-name><nic-name>"<one"</nic-name><last-name>Οὐχὶ ταὐτὰ παρίσταταί μοι Jones</last-name><department>660</department><percent-time>90</percent-time><columns>47</columns><benefits full-time="honest & for true">full</benefits></employee><employee><first-name>Leslie</first-name><nic-name>"Les
 "</nic-name><last-name>Patterson</last-name><department>341</department><percent-time>60</percent-time><columns>25</columns><benefits full-time="honest & for true">full</benefits></employee><employee><first-name>Ashley</first-name><nic-name>"Ash"</nic-name><last-name>Meter & Smith</last-name><department>1440</department><percent-time>40</percent-time><columns>30</columns></employee><employee><first-name>0123456789</first-name><nic-name>"0123456789"</nic-name><last-name>012345678901234567890</last-name><department>1440</department><percent-time>40</percent-time><columns>49</columns></employee><employee><first-name>ახლა</first-name><nic-name>"გაიარო"</nic-name><last-name>საერთაშორისო</last-name><department>123</department><percent-time>90</percent-time><columns>29</columns><benefits full-time="honest & for true">full</benefits></employee></employees>
\ No newline at end of file

Modified: user/dchagin/lemul/contrib/libxo/tests/core/saved/test_07.XP.out
==============================================================================
--- user/dchagin/lemul/contrib/libxo/tests/core/saved/test_07.XP.out	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/contrib/libxo/tests/core/saved/test_07.XP.out	Thu Nov 13 08:40:51 2014	(r274464)
@@ -1,4 +1,7 @@
 <employees>
+  <test>
+    <filename>(null)</filename>
+  </test>
   <v1>γιγνώσκειν</v1>
   <v2>ὦ ἄνδρες ᾿Αθηναῖοι</v2>
   <columns>28</columns>

Modified: user/dchagin/lemul/contrib/libxo/tests/core/test_07.c
==============================================================================
--- user/dchagin/lemul/contrib/libxo/tests/core/test_07.c	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/contrib/libxo/tests/core/test_07.c	Thu Nov 13 08:40:51 2014	(r274464)
@@ -52,6 +52,12 @@ main (int argc, char **argv)
 
     xo_open_container("employees");
 
+    xo_open_list("test");
+    xo_open_instance("test");
+    xo_emit("{ek:filename/%s}", NULL);
+    xo_close_instance("test");
+    xo_close_list("test");
+
     rc = xo_emit("Οὐχὶ ταὐτὰ παρίσταταί μοι {:v1/%s}, {:v2/%s}\n",
 	    "γιγνώσκειν", "ὦ ἄνδρες ᾿Αθηναῖοι");
     rc = xo_emit("{:columns/%d}\n", rc);

Modified: user/dchagin/lemul/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h
==============================================================================
--- user/dchagin/lemul/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h	Thu Nov 13 08:40:51 2014	(r274464)
@@ -127,6 +127,10 @@ public:
       DbgValMap[Node].push_back(V);
   }
 
+  /// \brief Invalidate all DbgValues attached to the node and remove
+  /// it from the Node-to-DbgValues map.
+  void erase(const SDNode *Node);
+
   void clear() {
     DbgValMap.clear();
     DbgValues.clear();

Modified: user/dchagin/lemul/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
==============================================================================
--- user/dchagin/lemul/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp	Thu Nov 13 05:28:06 2014	(r274463)
+++ user/dchagin/lemul/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp	Thu Nov 13 08:40:51 2014	(r274464)
@@ -625,6 +625,15 @@ void SelectionDAG::DeleteNodeNotInCSEMap
   DeallocateNode(N);
 }
 
+void SDDbgInfo::erase(const SDNode *Node) {
+  DbgValMapType::iterator I = DbgValMap.find(Node);
+  if (I == DbgValMap.end())
+    return;
+  for (auto &Val: I->second)
+    Val->setIsInvalidated();
+  DbgValMap.erase(I);
+}
+
 void SelectionDAG::DeallocateNode(SDNode *N) {
   if (N->OperandsNeedDelete)
     delete[] N->OperandList;
@@ -635,10 +644,9 @@ void SelectionDAG::DeallocateNode(SDNode
 
   NodeAllocator.Deallocate(AllNodes.remove(N));
 
-  // If any of the SDDbgValue nodes refer to this SDNode, invalidate them.
-  ArrayRef<SDDbgValue*> DbgVals = DbgInfo->getSDDbgValues(N);

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-user mailing list