Date: Mon, 15 Aug 2011 20:31:28 +0000 (UTC) From: "Justin T. Gibbs" <gibbs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r224899 - in projects/zfsd/head: . bin/ps cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/ztest cddl/contrib/opensolaris/lib/libzfs/common contrib/bsnmp/snmp_usm contrib/g... Message-ID: <201108152031.p7FKVSCV026318@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gibbs Date: Mon Aug 15 20:31:27 2011 New Revision: 224899 URL: http://svn.freebsd.org/changeset/base/224899 Log: Integrate FreeBSD/head into projects/zfsd/head as of SVN revision 224870. Added: projects/zfsd/head/crypto/openssh/README.hpn - copied unchanged from r224870, head/crypto/openssh/README.hpn projects/zfsd/head/lib/libarchive/test/test_open_failure.c - copied unchanged from r224870, head/lib/libarchive/test/test_open_failure.c projects/zfsd/head/lib/libc/amd64/string/stpcpy.S - copied unchanged from r224870, head/lib/libc/amd64/string/stpcpy.S projects/zfsd/head/lib/libc/amd64/string/strcpy.c - copied unchanged from r224870, head/lib/libc/amd64/string/strcpy.c projects/zfsd/head/lib/libc/sys/cap_new.2 - copied unchanged from r224870, head/lib/libc/sys/cap_new.2 projects/zfsd/head/sys/boot/powerpc/ps3/ps3cdrom.c - copied unchanged from r224870, head/sys/boot/powerpc/ps3/ps3cdrom.c projects/zfsd/head/sys/powerpc/ps3/ps3cdrom.c - copied unchanged from r224870, head/sys/powerpc/ps3/ps3cdrom.c projects/zfsd/head/tools/regression/security/cap_test/cap_test.t - copied unchanged from r224870, head/tools/regression/security/cap_test/cap_test.t projects/zfsd/head/tools/regression/security/cap_test/cap_test_capabilities.c - copied unchanged from r224870, head/tools/regression/security/cap_test/cap_test_capabilities.c projects/zfsd/head/tools/regression/security/cap_test/cap_test_fcntl.c - copied unchanged from r224870, head/tools/regression/security/cap_test/cap_test_fcntl.c projects/zfsd/head/tools/regression/security/cap_test/cap_test_relative.c - copied unchanged from r224870, head/tools/regression/security/cap_test/cap_test_relative.c projects/zfsd/head/tools/tools/ath/athradar/ - copied from r224870, head/tools/tools/ath/athradar/ projects/zfsd/head/tools/tools/cxgbtool/ - copied from r224870, head/tools/tools/cxgbtool/ Deleted: projects/zfsd/head/lib/libc/amd64/string/strcpy.S projects/zfsd/head/usr.sbin/cxgbtool/ projects/zfsd/head/usr.sbin/named.reload/ Modified: projects/zfsd/head/MAINTAINERS projects/zfsd/head/Makefile.inc1 projects/zfsd/head/bin/ps/keyword.c projects/zfsd/head/bin/ps/print.c projects/zfsd/head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/zfsd/head/cddl/contrib/opensolaris/cmd/ztest/ztest.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/zfsd/head/contrib/bsnmp/snmp_usm/snmp_usm.3 projects/zfsd/head/contrib/gcc/cp/ChangeLog projects/zfsd/head/contrib/gcc/cp/decl.c projects/zfsd/head/contrib/gdb/FREEBSD-diffs projects/zfsd/head/contrib/gdb/gdb/sparc64fbsd-tdep.c projects/zfsd/head/contrib/one-true-awk/FIXES projects/zfsd/head/contrib/one-true-awk/awkgram.y projects/zfsd/head/contrib/one-true-awk/b.c projects/zfsd/head/contrib/one-true-awk/lex.c projects/zfsd/head/contrib/one-true-awk/lib.c projects/zfsd/head/contrib/one-true-awk/main.c projects/zfsd/head/contrib/one-true-awk/makefile projects/zfsd/head/contrib/one-true-awk/proto.h projects/zfsd/head/contrib/one-true-awk/run.c projects/zfsd/head/contrib/one-true-awk/tran.c projects/zfsd/head/contrib/top/display.c projects/zfsd/head/contrib/top/top.c projects/zfsd/head/crypto/openssh/buffer.c (contents, props changed) projects/zfsd/head/crypto/openssh/buffer.h (contents, props changed) projects/zfsd/head/crypto/openssh/channels.c (contents, props changed) projects/zfsd/head/crypto/openssh/channels.h (contents, props changed) projects/zfsd/head/crypto/openssh/cipher.c (contents, props changed) projects/zfsd/head/crypto/openssh/clientloop.c (contents, props changed) projects/zfsd/head/crypto/openssh/compat.c (contents, props changed) projects/zfsd/head/crypto/openssh/compat.h (contents, props changed) projects/zfsd/head/crypto/openssh/kex.c (contents, props changed) projects/zfsd/head/crypto/openssh/kex.h (contents, props changed) projects/zfsd/head/crypto/openssh/misc.c (contents, props changed) projects/zfsd/head/crypto/openssh/misc.h (contents, props changed) projects/zfsd/head/crypto/openssh/myproposal.h (contents, props changed) projects/zfsd/head/crypto/openssh/packet.c (contents, props changed) projects/zfsd/head/crypto/openssh/packet.h (contents, props changed) projects/zfsd/head/crypto/openssh/readconf.c projects/zfsd/head/crypto/openssh/readconf.h (contents, props changed) projects/zfsd/head/crypto/openssh/servconf.c projects/zfsd/head/crypto/openssh/servconf.h (contents, props changed) projects/zfsd/head/crypto/openssh/serverloop.c (contents, props changed) projects/zfsd/head/crypto/openssh/session.c projects/zfsd/head/crypto/openssh/sftp.1 projects/zfsd/head/crypto/openssh/sftp.c (contents, props changed) projects/zfsd/head/crypto/openssh/ssh.c projects/zfsd/head/crypto/openssh/sshconnect.c projects/zfsd/head/crypto/openssh/sshconnect2.c (contents, props changed) projects/zfsd/head/crypto/openssh/sshd.c projects/zfsd/head/crypto/openssh/sshd_config projects/zfsd/head/crypto/openssh/version.c projects/zfsd/head/crypto/openssh/version.h projects/zfsd/head/etc/Makefile projects/zfsd/head/etc/rc.d/kld projects/zfsd/head/gnu/usr.bin/gdb/arch/sparc64/Makefile projects/zfsd/head/gnu/usr.bin/gdb/arch/sparc64/init.c projects/zfsd/head/lib/libarchive/archive_read.c projects/zfsd/head/lib/libarchive/archive_read_support_compression_uu.c projects/zfsd/head/lib/libarchive/archive_read_support_format_iso9660.c projects/zfsd/head/lib/libarchive/archive_read_support_format_mtree.c projects/zfsd/head/lib/libarchive/archive_write_open_fd.c projects/zfsd/head/lib/libarchive/archive_write_open_file.c projects/zfsd/head/lib/libarchive/archive_write_open_filename.c projects/zfsd/head/lib/libarchive/archive_write_set_compression_xz.c projects/zfsd/head/lib/libarchive/archive_write_set_format_zip.c projects/zfsd/head/lib/libarchive/test/Makefile projects/zfsd/head/lib/libarchive/test/test_read_format_mtree.c projects/zfsd/head/lib/libarchive/test/test_write_compress_lzma.c projects/zfsd/head/lib/libarchive/test/test_write_compress_xz.c projects/zfsd/head/lib/libc/amd64/string/Makefile.inc projects/zfsd/head/lib/libc/net/ethers.3 projects/zfsd/head/lib/libc/net/sctp_sys_calls.c projects/zfsd/head/lib/libc/stdlib/Makefile.inc projects/zfsd/head/lib/libc/sys/Makefile.inc projects/zfsd/head/lib/libc/sys/Symbol.map projects/zfsd/head/lib/libc/sys/dup.2 projects/zfsd/head/lib/libkvm/kvm_ia64.c projects/zfsd/head/lib/libkvm/kvm_proc.c projects/zfsd/head/lib/libmemstat/libmemstat.3 projects/zfsd/head/lib/libmemstat/memstat.c projects/zfsd/head/lib/libmemstat/memstat.h projects/zfsd/head/lib/libmemstat/memstat_internal.h projects/zfsd/head/lib/libmemstat/memstat_malloc.c projects/zfsd/head/lib/libmemstat/memstat_uma.c projects/zfsd/head/lib/libproc/proc_create.c projects/zfsd/head/lib/libprocstat/libprocstat.c projects/zfsd/head/lib/libprocstat/libprocstat.h projects/zfsd/head/lib/libthread_db/arch/amd64/libpthread_md.c projects/zfsd/head/lib/libthread_db/arch/sparc64/libpthread_md.c projects/zfsd/head/lib/libthread_db/libthr_db.c projects/zfsd/head/lib/libusbhid/parse.c projects/zfsd/head/lib/libz/Makefile projects/zfsd/head/libexec/tftpd/tftp-transfer.c projects/zfsd/head/libexec/tftpd/tftpd.8 projects/zfsd/head/release/Makefile.sysinstall projects/zfsd/head/release/amd64/make-memstick.sh projects/zfsd/head/release/doc/en_US.ISO8859-1/hardware/article.sgml projects/zfsd/head/release/i386/make-memstick.sh projects/zfsd/head/release/powerpc/make-memstick.sh projects/zfsd/head/release/powerpc/mkisoimages.sh projects/zfsd/head/sbin/ifconfig/af_inet.c projects/zfsd/head/sbin/ifconfig/af_inet6.c projects/zfsd/head/sbin/ifconfig/ifconfig.c projects/zfsd/head/sbin/ifconfig/ifieee80211.c projects/zfsd/head/sbin/mount/mount.c projects/zfsd/head/sbin/rcorder/rcorder.8 projects/zfsd/head/share/man/man4/dc.4 projects/zfsd/head/share/man/man4/gif.4 projects/zfsd/head/share/man/man4/hptiop.4 projects/zfsd/head/share/man/man4/lmc.4 projects/zfsd/head/share/man/man4/mpt.4 projects/zfsd/head/share/man/man4/pcm.4 projects/zfsd/head/share/man/man4/rue.4 projects/zfsd/head/share/man/man4/smp.4 projects/zfsd/head/share/man/man4/stf.4 projects/zfsd/head/share/man/man4/wi.4 projects/zfsd/head/share/man/man5/reiserfs.5 projects/zfsd/head/share/man/man8/crash.8 projects/zfsd/head/share/man/man8/diskless.8 projects/zfsd/head/share/man/man9/taskqueue.9 projects/zfsd/head/share/man/man9/vfs_getopt.9 projects/zfsd/head/sys/amd64/amd64/genassym.c projects/zfsd/head/sys/amd64/amd64/intr_machdep.c projects/zfsd/head/sys/amd64/amd64/machdep.c projects/zfsd/head/sys/amd64/amd64/pmap.c projects/zfsd/head/sys/amd64/amd64/support.S projects/zfsd/head/sys/amd64/conf/GENERIC projects/zfsd/head/sys/amd64/include/param.h projects/zfsd/head/sys/amd64/linux32/linux32_machdep.c projects/zfsd/head/sys/arm/arm/irq_dispatch.S projects/zfsd/head/sys/arm/arm/pmap.c projects/zfsd/head/sys/arm/conf/AVILA projects/zfsd/head/sys/arm/conf/BWCT projects/zfsd/head/sys/arm/conf/CAMBRIA projects/zfsd/head/sys/arm/conf/CNS11XXNAS projects/zfsd/head/sys/arm/conf/CRB projects/zfsd/head/sys/arm/conf/DB-78XXX projects/zfsd/head/sys/arm/conf/DB-88F5XXX projects/zfsd/head/sys/arm/conf/DB-88F6XXX projects/zfsd/head/sys/arm/conf/DOCKSTAR projects/zfsd/head/sys/arm/conf/EP80219 projects/zfsd/head/sys/arm/conf/GUMSTIX projects/zfsd/head/sys/arm/conf/HL200 projects/zfsd/head/sys/arm/conf/HL201 projects/zfsd/head/sys/arm/conf/IQ31244 projects/zfsd/head/sys/arm/conf/KB920X projects/zfsd/head/sys/arm/conf/LN2410SBC projects/zfsd/head/sys/arm/conf/NSLU projects/zfsd/head/sys/arm/conf/QILA9G20 projects/zfsd/head/sys/arm/conf/SAM9G20EK projects/zfsd/head/sys/arm/conf/SHEEVAPLUG projects/zfsd/head/sys/arm/conf/SIMICS projects/zfsd/head/sys/arm/conf/TS7800 projects/zfsd/head/sys/arm/include/param.h projects/zfsd/head/sys/arm/sa11x0/sa11x0_irq.S projects/zfsd/head/sys/boot/common/util.c projects/zfsd/head/sys/boot/forth/loader.conf projects/zfsd/head/sys/boot/forth/loader.conf.5 projects/zfsd/head/sys/boot/powerpc/ps3/Makefile projects/zfsd/head/sys/boot/powerpc/ps3/conf.c projects/zfsd/head/sys/boot/powerpc/ps3/devicename.c projects/zfsd/head/sys/boot/powerpc/ps3/lv1call.S projects/zfsd/head/sys/boot/powerpc/ps3/lv1call.h projects/zfsd/head/sys/boot/powerpc/ps3/main.c projects/zfsd/head/sys/boot/powerpc/ps3/ps3stor.c projects/zfsd/head/sys/cam/ata/ata_da.c projects/zfsd/head/sys/cam/cam_periph.c projects/zfsd/head/sys/cam/cam_xpt.c projects/zfsd/head/sys/cam/cam_xpt.h projects/zfsd/head/sys/cddl/compat/opensolaris/sys/file.h projects/zfsd/head/sys/cddl/contrib/opensolaris/common/acl/acl_common.c projects/zfsd/head/sys/cddl/contrib/opensolaris/common/acl/acl_common.h projects/zfsd/head/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/zfsd/head/sys/compat/freebsd32/freebsd32.h projects/zfsd/head/sys/compat/freebsd32/freebsd32_ioctl.c projects/zfsd/head/sys/compat/linprocfs/linprocfs.c projects/zfsd/head/sys/compat/linux/linux_file.c projects/zfsd/head/sys/compat/linux/linux_ioctl.c projects/zfsd/head/sys/compat/linux/linux_socket.c projects/zfsd/head/sys/compat/linux/linux_stats.c projects/zfsd/head/sys/compat/svr4/svr4_fcntl.c projects/zfsd/head/sys/compat/svr4/svr4_filio.c projects/zfsd/head/sys/compat/svr4/svr4_ioctl.c projects/zfsd/head/sys/compat/svr4/svr4_misc.c projects/zfsd/head/sys/compat/svr4/svr4_stream.c projects/zfsd/head/sys/conf/NOTES projects/zfsd/head/sys/conf/files.powerpc projects/zfsd/head/sys/conf/newvers.sh projects/zfsd/head/sys/conf/options projects/zfsd/head/sys/dev/aac/aac_linux.c projects/zfsd/head/sys/dev/acpica/acpi_pcib_acpi.c projects/zfsd/head/sys/dev/ahci/ahci.c projects/zfsd/head/sys/dev/ahci/ahci.h projects/zfsd/head/sys/dev/amr/amr_linux.c projects/zfsd/head/sys/dev/ata/ata-pci.c projects/zfsd/head/sys/dev/ata/ata-pci.h projects/zfsd/head/sys/dev/ata/chipsets/ata-acard.c projects/zfsd/head/sys/dev/ata/chipsets/ata-acerlabs.c projects/zfsd/head/sys/dev/ata/chipsets/ata-intel.c projects/zfsd/head/sys/dev/ata/chipsets/ata-nvidia.c projects/zfsd/head/sys/dev/ata/chipsets/ata-promise.c projects/zfsd/head/sys/dev/ath/ath_dfs/null/dfs_null.c projects/zfsd/head/sys/dev/ath/ath_hal/ah.c projects/zfsd/head/sys/dev/ath/ath_hal/ah.h projects/zfsd/head/sys/dev/ath/ath_hal/ah_desc.h projects/zfsd/head/sys/dev/ath/ath_hal/ah_eeprom.h projects/zfsd/head/sys/dev/ath/ath_hal/ah_eeprom_9287.c projects/zfsd/head/sys/dev/ath/ath_hal/ah_eeprom_v14.c projects/zfsd/head/sys/dev/ath/ath_hal/ah_eeprom_v14.h projects/zfsd/head/sys/dev/ath/ath_hal/ah_eeprom_v4k.c projects/zfsd/head/sys/dev/ath/ath_hal/ah_internal.h projects/zfsd/head/sys/dev/ath/ath_hal/ah_regdomain.c projects/zfsd/head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_ctry.h projects/zfsd/head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h projects/zfsd/head/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/zfsd/head/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c projects/zfsd/head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c projects/zfsd/head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c projects/zfsd/head/sys/dev/ath/ath_hal/ar5416/ar5416.h projects/zfsd/head/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c projects/zfsd/head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c projects/zfsd/head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c projects/zfsd/head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c projects/zfsd/head/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c projects/zfsd/head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c projects/zfsd/head/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c projects/zfsd/head/sys/dev/ath/ath_hal/ar9002/ar9280.c projects/zfsd/head/sys/dev/ath/ath_hal/ar9002/ar9280.h projects/zfsd/head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c projects/zfsd/head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c projects/zfsd/head/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c projects/zfsd/head/sys/dev/ath/if_ath.c projects/zfsd/head/sys/dev/ath/if_ath_sysctl.c projects/zfsd/head/sys/dev/ath/if_athdfs.h projects/zfsd/head/sys/dev/ath/if_athioctl.h projects/zfsd/head/sys/dev/ath/if_athvar.h projects/zfsd/head/sys/dev/hptiop/hptiop.c projects/zfsd/head/sys/dev/hwpmc/hwpmc_logging.c projects/zfsd/head/sys/dev/ipmi/ipmi_linux.c projects/zfsd/head/sys/dev/iscsi/initiator/iscsi.c projects/zfsd/head/sys/dev/isp/isp.c projects/zfsd/head/sys/dev/isp/isp_freebsd.c projects/zfsd/head/sys/dev/isp/isp_freebsd.h projects/zfsd/head/sys/dev/isp/isp_pci.c projects/zfsd/head/sys/dev/isp/ispvar.h projects/zfsd/head/sys/dev/mfi/mfi_linux.c projects/zfsd/head/sys/dev/mmc/mmcsd.c projects/zfsd/head/sys/dev/mpt/mpilib/mpi_ioc.h projects/zfsd/head/sys/dev/mpt/mpt.c projects/zfsd/head/sys/dev/mpt/mpt.h projects/zfsd/head/sys/dev/mpt/mpt_cam.c projects/zfsd/head/sys/dev/mpt/mpt_debug.c projects/zfsd/head/sys/dev/mpt/mpt_pci.c projects/zfsd/head/sys/dev/mpt/mpt_raid.c projects/zfsd/head/sys/dev/mpt/mpt_raid.h projects/zfsd/head/sys/dev/mpt/mpt_user.c projects/zfsd/head/sys/dev/pci/pci.c projects/zfsd/head/sys/dev/re/if_re.c projects/zfsd/head/sys/dev/snp/snp.c projects/zfsd/head/sys/dev/tdfx/tdfx_linux.c projects/zfsd/head/sys/dev/usb/input/ums.c projects/zfsd/head/sys/dev/usb/net/if_aue.c projects/zfsd/head/sys/dev/usb/net/if_axe.c projects/zfsd/head/sys/dev/usb/net/if_mos.c projects/zfsd/head/sys/dev/usb/net/if_rue.c projects/zfsd/head/sys/dev/usb/net/if_udav.c projects/zfsd/head/sys/dev/usb/serial/u3g.c projects/zfsd/head/sys/dev/usb/usb_dev.c projects/zfsd/head/sys/dev/usb/usb_device.c projects/zfsd/head/sys/dev/usb/usb_device.h projects/zfsd/head/sys/dev/usb/usb_request.c projects/zfsd/head/sys/dev/usb/usbdevs projects/zfsd/head/sys/dev/usb/usbdi.h projects/zfsd/head/sys/fs/cd9660/iso.h projects/zfsd/head/sys/fs/coda/coda_psdev.c projects/zfsd/head/sys/fs/devfs/devfs_devs.c projects/zfsd/head/sys/fs/fdescfs/fdesc_vnops.c projects/zfsd/head/sys/fs/msdosfs/msdosfsmount.h projects/zfsd/head/sys/fs/nfsclient/nfs_clnode.c projects/zfsd/head/sys/fs/nfsclient/nfs_clport.c projects/zfsd/head/sys/fs/nfsclient/nfs_clvnops.c projects/zfsd/head/sys/fs/nfsclient/nfsnode.h projects/zfsd/head/sys/fs/nfsserver/nfs_nfsdport.c projects/zfsd/head/sys/fs/nfsserver/nfs_nfsdserv.c projects/zfsd/head/sys/fs/ntfs/ntfs.h projects/zfsd/head/sys/fs/portalfs/portal_vfsops.c projects/zfsd/head/sys/fs/portalfs/portal_vnops.c projects/zfsd/head/sys/fs/smbfs/smbfs.h projects/zfsd/head/sys/gnu/fs/xfs/xfs_dfrag.c projects/zfsd/head/sys/i386/conf/GENERIC projects/zfsd/head/sys/i386/conf/XBOX projects/zfsd/head/sys/i386/conf/XEN projects/zfsd/head/sys/i386/i386/genassym.c projects/zfsd/head/sys/i386/i386/intr_machdep.c projects/zfsd/head/sys/i386/i386/machdep.c projects/zfsd/head/sys/i386/i386/pmap.c projects/zfsd/head/sys/i386/i386/support.s projects/zfsd/head/sys/i386/ibcs2/ibcs2_fcntl.c projects/zfsd/head/sys/i386/ibcs2/ibcs2_ioctl.c projects/zfsd/head/sys/i386/ibcs2/ibcs2_misc.c projects/zfsd/head/sys/i386/ibcs2/imgact_coff.c projects/zfsd/head/sys/i386/include/param.h projects/zfsd/head/sys/i386/linux/linux_machdep.c projects/zfsd/head/sys/i386/xen/pmap.c projects/zfsd/head/sys/ia64/conf/DEFAULTS projects/zfsd/head/sys/ia64/ia64/dump_machdep.c projects/zfsd/head/sys/ia64/ia64/locore.S projects/zfsd/head/sys/ia64/ia64/nexus.c projects/zfsd/head/sys/ia64/ia64/pmap.c projects/zfsd/head/sys/ia64/include/param.h projects/zfsd/head/sys/kern/capabilities.conf projects/zfsd/head/sys/kern/init_sysent.c projects/zfsd/head/sys/kern/kern_clock.c projects/zfsd/head/sys/kern/kern_conf.c projects/zfsd/head/sys/kern/kern_descrip.c projects/zfsd/head/sys/kern/kern_event.c projects/zfsd/head/sys/kern/kern_exec.c projects/zfsd/head/sys/kern/kern_intr.c projects/zfsd/head/sys/kern/kern_jail.c projects/zfsd/head/sys/kern/kern_linker.c projects/zfsd/head/sys/kern/kern_lock.c projects/zfsd/head/sys/kern/kern_proc.c projects/zfsd/head/sys/kern/kern_resource.c projects/zfsd/head/sys/kern/kern_shutdown.c projects/zfsd/head/sys/kern/sched_ule.c projects/zfsd/head/sys/kern/subr_pcpu.c projects/zfsd/head/sys/kern/subr_smp.c projects/zfsd/head/sys/kern/sys_capability.c projects/zfsd/head/sys/kern/sys_generic.c projects/zfsd/head/sys/kern/syscalls.c projects/zfsd/head/sys/kern/tty.c projects/zfsd/head/sys/kern/uipc_mqueue.c projects/zfsd/head/sys/kern/uipc_sem.c projects/zfsd/head/sys/kern/uipc_syscalls.c projects/zfsd/head/sys/kern/vfs_acl.c projects/zfsd/head/sys/kern/vfs_aio.c projects/zfsd/head/sys/kern/vfs_extattr.c projects/zfsd/head/sys/kern/vfs_lookup.c projects/zfsd/head/sys/kern/vfs_mount.c projects/zfsd/head/sys/kern/vfs_subr.c projects/zfsd/head/sys/kern/vfs_syscalls.c projects/zfsd/head/sys/mips/cavium/asm_octeon.S projects/zfsd/head/sys/mips/cavium/octeon_mp.c projects/zfsd/head/sys/mips/conf/XLP projects/zfsd/head/sys/mips/conf/XLP64 projects/zfsd/head/sys/mips/conf/XLPN32 projects/zfsd/head/sys/mips/include/param.h projects/zfsd/head/sys/mips/mips/dump_machdep.c projects/zfsd/head/sys/mips/mips/exception.S projects/zfsd/head/sys/mips/mips/pmap.c projects/zfsd/head/sys/net/if_lagg.c projects/zfsd/head/sys/net/route.c projects/zfsd/head/sys/net80211/ieee80211_proto.c projects/zfsd/head/sys/net80211/ieee80211_scan_sta.c projects/zfsd/head/sys/netgraph/ng_ether.c projects/zfsd/head/sys/netgraph/ng_mppc.c projects/zfsd/head/sys/netgraph/ng_parse.c projects/zfsd/head/sys/netgraph/ng_socket.c projects/zfsd/head/sys/netinet/in.c projects/zfsd/head/sys/netinet/ip_divert.c projects/zfsd/head/sys/netinet/sctp.h projects/zfsd/head/sys/netinet/sctp_asconf.c projects/zfsd/head/sys/netinet/sctp_cc_functions.c projects/zfsd/head/sys/netinet/sctp_constants.h projects/zfsd/head/sys/netinet/sctp_header.h projects/zfsd/head/sys/netinet/sctp_indata.c projects/zfsd/head/sys/netinet/sctp_input.c projects/zfsd/head/sys/netinet/sctp_output.c projects/zfsd/head/sys/netinet/sctp_output.h projects/zfsd/head/sys/netinet/sctp_pcb.c projects/zfsd/head/sys/netinet/sctp_pcb.h projects/zfsd/head/sys/netinet/sctp_structs.h projects/zfsd/head/sys/netinet/sctp_sysctl.c projects/zfsd/head/sys/netinet/sctp_sysctl.h projects/zfsd/head/sys/netinet/sctp_timer.c projects/zfsd/head/sys/netinet/sctp_timer.h projects/zfsd/head/sys/netinet/sctp_uio.h projects/zfsd/head/sys/netinet/sctp_usrreq.c projects/zfsd/head/sys/netinet/sctp_var.h projects/zfsd/head/sys/netinet/sctputil.c projects/zfsd/head/sys/netinet6/sctp6_usrreq.c projects/zfsd/head/sys/nfsclient/nfs_bio.c projects/zfsd/head/sys/nfsclient/nfs_node.c projects/zfsd/head/sys/nfsclient/nfs_vfsops.c projects/zfsd/head/sys/nfsclient/nfs_vnops.c projects/zfsd/head/sys/nfsclient/nfsnode.h projects/zfsd/head/sys/nfsserver/nfs_srvkrpc.c projects/zfsd/head/sys/pc98/conf/GENERIC projects/zfsd/head/sys/pc98/pc98/machdep.c projects/zfsd/head/sys/pci/if_rlreg.h projects/zfsd/head/sys/powerpc/aim/locore32.S projects/zfsd/head/sys/powerpc/aim/locore64.S projects/zfsd/head/sys/powerpc/aim/mmu_oea.c projects/zfsd/head/sys/powerpc/aim/mmu_oea64.c projects/zfsd/head/sys/powerpc/booke/locore.S projects/zfsd/head/sys/powerpc/booke/platform_bare.c projects/zfsd/head/sys/powerpc/booke/pmap.c projects/zfsd/head/sys/powerpc/conf/MPC85XX projects/zfsd/head/sys/powerpc/include/param.h projects/zfsd/head/sys/powerpc/include/pmap.h projects/zfsd/head/sys/powerpc/mpc85xx/atpic.c projects/zfsd/head/sys/powerpc/powermac/fcu.c projects/zfsd/head/sys/security/audit/audit.h projects/zfsd/head/sys/security/audit/audit_arg.c projects/zfsd/head/sys/security/audit/audit_bsm.c projects/zfsd/head/sys/security/audit/audit_private.h projects/zfsd/head/sys/security/mac/mac_syscalls.c projects/zfsd/head/sys/sparc64/conf/GENERIC projects/zfsd/head/sys/sparc64/include/param.h projects/zfsd/head/sys/sparc64/sparc64/dump_machdep.c projects/zfsd/head/sys/sparc64/sparc64/exception.S projects/zfsd/head/sys/sparc64/sparc64/intr_machdep.c projects/zfsd/head/sys/sparc64/sparc64/mp_machdep.c projects/zfsd/head/sys/sparc64/sparc64/pmap.c projects/zfsd/head/sys/sparc64/sparc64/tsb.c projects/zfsd/head/sys/sys/capability.h projects/zfsd/head/sys/sys/file.h projects/zfsd/head/sys/sys/filedesc.h projects/zfsd/head/sys/sys/interrupt.h projects/zfsd/head/sys/sys/mount.h projects/zfsd/head/sys/sys/namei.h projects/zfsd/head/sys/sys/param.h projects/zfsd/head/sys/sys/pcpu.h projects/zfsd/head/sys/sys/resourcevar.h projects/zfsd/head/sys/sys/syscall.h projects/zfsd/head/sys/sys/syscall.mk projects/zfsd/head/sys/sys/sysproto.h projects/zfsd/head/sys/sys/systm.h projects/zfsd/head/sys/sys/user.h projects/zfsd/head/sys/ufs/ffs/ffs_alloc.c projects/zfsd/head/sys/ufs/ffs/ffs_softdep.c projects/zfsd/head/sys/ufs/ffs/ffs_vfsops.c projects/zfsd/head/sys/ufs/ffs/ffs_vnops.c projects/zfsd/head/sys/ufs/ufs/inode.h projects/zfsd/head/sys/vm/device_pager.c projects/zfsd/head/sys/vm/swap_pager.c projects/zfsd/head/sys/vm/swap_pager.h projects/zfsd/head/sys/vm/vm_contig.c projects/zfsd/head/sys/vm/vm_kern.c projects/zfsd/head/sys/vm/vm_mmap.c projects/zfsd/head/sys/vm/vm_object.c projects/zfsd/head/sys/vm/vm_page.c projects/zfsd/head/sys/vm/vm_page.h projects/zfsd/head/tools/regression/netinet/tcpdrop/tcpdrop.c projects/zfsd/head/tools/regression/security/cap_test/Makefile projects/zfsd/head/tools/regression/security/cap_test/cap_test.c projects/zfsd/head/tools/regression/security/cap_test/cap_test.h projects/zfsd/head/tools/regression/security/cap_test/cap_test_capmode.c projects/zfsd/head/tools/regression/security/cap_test/cap_test_sysctl.c projects/zfsd/head/tools/tools/README projects/zfsd/head/tools/tools/ath/Makefile projects/zfsd/head/tools/tools/sysdoc/tunables.mdoc projects/zfsd/head/usr.bin/ar/write.c projects/zfsd/head/usr.bin/catman/catman.c projects/zfsd/head/usr.bin/cpio/Makefile projects/zfsd/head/usr.bin/man/man.1 projects/zfsd/head/usr.bin/netstat/sctp.c projects/zfsd/head/usr.bin/procstat/procstat.1 projects/zfsd/head/usr.bin/procstat/procstat.c projects/zfsd/head/usr.bin/procstat/procstat.h projects/zfsd/head/usr.bin/procstat/procstat_cred.c projects/zfsd/head/usr.bin/procstat/procstat_files.c projects/zfsd/head/usr.bin/procstat/procstat_kstack.c projects/zfsd/head/usr.bin/procstat/procstat_threads.c projects/zfsd/head/usr.bin/tail/forward.c projects/zfsd/head/usr.bin/tar/Makefile projects/zfsd/head/usr.bin/top/machine.c projects/zfsd/head/usr.bin/unzip/unzip.1 projects/zfsd/head/usr.bin/usbhidaction/usbhidaction.c projects/zfsd/head/usr.bin/usbhidctl/usbhid.c projects/zfsd/head/usr.bin/vmstat/vmstat.c projects/zfsd/head/usr.bin/xlint/lint1/tree.c projects/zfsd/head/usr.sbin/Makefile projects/zfsd/head/usr.sbin/bsdinstall/scripts/mirrorselect projects/zfsd/head/usr.sbin/bsdinstall/scripts/netconfig_ipv4 projects/zfsd/head/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1 projects/zfsd/head/usr.sbin/diskinfo/diskinfo.c projects/zfsd/head/usr.sbin/faithd/faithd.8 projects/zfsd/head/usr.sbin/jail/jail.8 projects/zfsd/head/usr.sbin/jls/jls.c projects/zfsd/head/usr.sbin/makefs/cd9660.c projects/zfsd/head/usr.sbin/makefs/cd9660.h projects/zfsd/head/usr.sbin/makefs/cd9660/cd9660_conversion.c projects/zfsd/head/usr.sbin/makefs/cd9660/cd9660_eltorito.c projects/zfsd/head/usr.sbin/makefs/cd9660/cd9660_write.c projects/zfsd/head/usr.sbin/makefs/cd9660/iso9660_rrip.c projects/zfsd/head/usr.sbin/mergemaster/mergemaster.8 projects/zfsd/head/usr.sbin/mergemaster/mergemaster.sh projects/zfsd/head/usr.sbin/mfiutil/mfi_show.c projects/zfsd/head/usr.sbin/pmcstat/pmcstat.c projects/zfsd/head/usr.sbin/pmcstat/pmcstat.h projects/zfsd/head/usr.sbin/pmcstat/pmcstat_log.c projects/zfsd/head/usr.sbin/pw/pw_user.c projects/zfsd/head/usr.sbin/service/service.8 Directory Properties: projects/zfsd/head/ (props changed) projects/zfsd/head/cddl/contrib/opensolaris/ (props changed) projects/zfsd/head/contrib/ee/ (props changed) projects/zfsd/head/contrib/expat/ (props changed) projects/zfsd/head/contrib/file/ (props changed) projects/zfsd/head/contrib/gdb/ (props changed) projects/zfsd/head/contrib/gnu-sort/ (props changed) projects/zfsd/head/contrib/groff/ (props changed) projects/zfsd/head/contrib/less/ (props changed) projects/zfsd/head/contrib/libpcap/ (props changed) projects/zfsd/head/contrib/ncurses/ (props changed) projects/zfsd/head/contrib/one-true-awk/ (props changed) projects/zfsd/head/contrib/openbsm/ (props changed) projects/zfsd/head/contrib/openpam/ (props changed) projects/zfsd/head/contrib/pf/ (props changed) projects/zfsd/head/contrib/tcpdump/ (props changed) projects/zfsd/head/contrib/tcsh/ (props changed) projects/zfsd/head/contrib/tnftp/ (props changed) projects/zfsd/head/contrib/tzcode/stdtime/ (props changed) projects/zfsd/head/contrib/tzcode/zic/ (props changed) projects/zfsd/head/contrib/tzdata/ (props changed) projects/zfsd/head/contrib/wpa/ (props changed) projects/zfsd/head/lib/libutil/ (props changed) projects/zfsd/head/lib/libz/ (props changed) projects/zfsd/head/sbin/ (props changed) projects/zfsd/head/sbin/ipfw/ (props changed) projects/zfsd/head/share/mk/bsd.arch.inc.mk (props changed) projects/zfsd/head/sys/contrib/dev/acpica/ (props changed) projects/zfsd/head/usr.bin/csup/ (props changed) projects/zfsd/head/usr.bin/procstat/ (props changed) projects/zfsd/head/usr.sbin/rtadvctl/ (props changed) projects/zfsd/head/usr.sbin/rtadvd/ (props changed) Modified: projects/zfsd/head/MAINTAINERS ============================================================================== --- projects/zfsd/head/MAINTAINERS Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/MAINTAINERS Mon Aug 15 20:31:27 2011 (r224899) @@ -115,7 +115,6 @@ lib/libsdp emax Pre-commit review prefe usr.bin/bluetooth emax Pre-commit review preferred. usr.sbin/bluetooth emax Pre-commit review preferred. gnu/usr.bin/send-pr bugmaster Pre-commit review requested. -ncurses rafan Heads-up appreciated, try not to break it. *env(3) secteam Due to the problematic security history of this code, please have patches reviewed by secteam. share/zoneinfo edwin Heads-up appreciated, since our data is coming Modified: projects/zfsd/head/Makefile.inc1 ============================================================================== --- projects/zfsd/head/Makefile.inc1 Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/Makefile.inc1 Mon Aug 15 20:31:27 2011 (r224899) @@ -1014,6 +1014,10 @@ _lex= usr.bin/lex _yacc= usr.bin/yacc .endif +.if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041 +_awk= usr.bin/awk +.endif + .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -1052,6 +1056,7 @@ bootstrap-tools: ${_groff} \ ${_ar} \ ${_dtc} \ + ${_awk} \ usr.bin/lorder \ usr.bin/makewhatis \ ${_mklocale} \ Modified: projects/zfsd/head/bin/ps/keyword.c ============================================================================== --- projects/zfsd/head/bin/ps/keyword.c Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/bin/ps/keyword.c Mon Aug 15 20:31:27 2011 (r224899) @@ -82,7 +82,7 @@ static VAR var[] = { {"class", "CLASS", NULL, LJUST, loginclass, s_loginclass, MAXLOGNAME-1, 0, CHAR, NULL, 0}, {"comm", "COMMAND", NULL, LJUST, ucomm, s_comm, - COMMLEN + OCOMMLEN + 1, 0, CHAR, NULL, 0}, + COMMLEN + TDNAMLEN + 1, 0, CHAR, NULL, 0}, {"command", "COMMAND", NULL, COMM|LJUST|USER, command, NULL, 16, 0, CHAR, NULL, 0}, {"cpu", "CPU", NULL, 0, kvar, NULL, 3, KOFF(ki_estcpu), UINT, "d", @@ -212,7 +212,7 @@ static VAR var[] = { {"tt", "TT ", NULL, 0, tname, NULL, 4, 0, CHAR, NULL, 0}, {"tty", "TTY", NULL, LJUST, longtname, NULL, 8, 0, CHAR, NULL, 0}, {"ucomm", "UCOMM", NULL, LJUST, ucomm, s_comm, - COMMLEN + OCOMMLEN + 1, 0, CHAR, NULL, 0}, + COMMLEN + TDNAMLEN + 1, 0, CHAR, NULL, 0}, {"uid", "UID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_uid), UINT, UIDFMT, 0}, {"upr", "UPR", NULL, 0, upr, NULL, 3, 0, CHAR, NULL, 0}, Modified: projects/zfsd/head/bin/ps/print.c ============================================================================== --- projects/zfsd/head/bin/ps/print.c Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/bin/ps/print.c Mon Aug 15 20:31:27 2011 (r224899) @@ -136,7 +136,7 @@ command(KINFO *k, VARENT *ve) (void)printf("%s", k->ki_d.prefix); (void)printf("%s", k->ki_p->ki_comm); if (showthreads && k->ki_p->ki_numthreads > 1) - (void)printf("/%s", k->ki_p->ki_ocomm); + (void)printf("/%s", k->ki_p->ki_tdname); } else (void)printf("%-*s", v->width, k->ki_p->ki_comm); return; @@ -190,7 +190,7 @@ command(KINFO *k, VARENT *ve) void ucomm(KINFO *k, VARENT *ve) { - char tmpbuff[COMMLEN + OCOMMLEN + 2]; + char tmpbuff[COMMLEN + TDNAMLEN + 2]; VAR *v; v = ve->var; @@ -199,12 +199,12 @@ ucomm(KINFO *k, VARENT *ve) (void)printf("%s", k->ki_d.prefix); (void)printf("%s", k->ki_p->ki_comm); if (showthreads && k->ki_p->ki_numthreads > 1) - printf("/%s", k->ki_p->ki_ocomm); + printf("/%s", k->ki_p->ki_tdname); } else { bzero(tmpbuff, sizeof(tmpbuff)); if (showthreads && k->ki_p->ki_numthreads > 1) sprintf(tmpbuff, "%s/%s", k->ki_p->ki_comm, - k->ki_p->ki_ocomm); + k->ki_p->ki_tdname); else sprintf(tmpbuff, "%s", k->ki_p->ki_comm); (void)printf("%-*s", v->width, tmpbuff); @@ -218,7 +218,7 @@ tdnam(KINFO *k, VARENT *ve) v = ve->var; if (showthreads && k->ki_p->ki_numthreads > 1) - (void)printf("%-*s", v->width, k->ki_p->ki_ocomm); + (void)printf("%-*s", v->width, k->ki_p->ki_tdname); else (void)printf("%-*s", v->width, " "); } @@ -943,12 +943,12 @@ loginclass(KINFO *k, VARENT *ve) int s_comm(KINFO *k) { - char tmpbuff[COMMLEN + OCOMMLEN + 2]; + char tmpbuff[COMMLEN + TDNAMLEN + 2]; bzero(tmpbuff, sizeof(tmpbuff)); if (showthreads && k->ki_p->ki_numthreads > 1) sprintf(tmpbuff, "%s/%s", k->ki_p->ki_comm, - k->ki_p->ki_ocomm); + k->ki_p->ki_tdname); else sprintf(tmpbuff, "%s", k->ki_p->ki_comm); return (strlen(tmpbuff)); Modified: projects/zfsd/head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/zfsd/head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Mon Aug 15 20:31:27 2011 (r224899) @@ -6,6 +6,7 @@ .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. .\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] +.\" Copyright 2011 Nexenta Systems, Inc. All rights reserved. .\" Copyright 2011 by Delphix. All rights reserved. .TH zfs 1M "24 Sep 2009" "SunOS 5.11" "System Administration Commands" .SH NAME @@ -642,7 +643,7 @@ When the property value is set to \fBpas .ad .sp .6 .RS 4n -Controls how an \fBACL\fR is modified during \fBchmod\fR(2). A file system with an \fBaclmode\fR property of \fBdiscard\fR deletes all \fBACL\fR entries that do not represent the mode of the file. An \fBaclmode\fR property of \fBgroupmask\fR (the default) reduces user or group permissions. The permissions are reduced, such that they are no greater than the group permission bits, unless it is a user entry that has the same \fBUID\fR as the owner of the file or directory. In this case, the \fBACL\fR permissions are reduced so that they are no greater than owner permission bits. A file system with an \fBaclmode\fR property of \fBpassthrough\fR indicates that no changes are made to the \fBACL\fR other than generating the necessary \fBACL\fR entries to represent the new mode of the file or directory. +Controls how an \fBACL\fR is modified during \fBchmod\fR(2). A file system with an \fBaclmode\fR property of \fBdiscard\fR (the default) deletes all \fBACL\fR entries that do not represent the mode of the file. An \fBaclmode\fR property of \fBgroupmask\fR reduces permissions granted in all \fBALLOW\fR entries found in the \fBACL\fR such that they are no greater than the group permissions specified by \fBchmod\fR. A file system with an \fBaclmode\fR property of \fBpassthrough\fR indicates that no changes are made to the \fBACL\fR other than creating or updating the necessary \fBACL\fR entries to represent the new mode of the file or directory. .RE .sp @@ -2697,7 +2698,7 @@ pool/home/bob setuid on pool/home/bob readonly off default pool/home/bob zoned off default pool/home/bob snapdir hidden default -pool/home/bob aclmode groupmask default +pool/home/bob aclmode discard default pool/home/bob aclinherit restricted default pool/home/bob canmount on default pool/home/bob shareiscsi off default Modified: projects/zfsd/head/cddl/contrib/opensolaris/cmd/ztest/ztest.c ============================================================================== --- projects/zfsd/head/cddl/contrib/opensolaris/cmd/ztest/ztest.c Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/cddl/contrib/opensolaris/cmd/ztest/ztest.c Mon Aug 15 20:31:27 2011 (r224899) @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011 by Delphix. All rights reserved. */ /* @@ -204,6 +205,7 @@ typedef struct ztest_od { */ typedef struct ztest_ds { objset_t *zd_os; + rwlock_t zd_zilog_lock; zilog_t *zd_zilog; uint64_t zd_seq; ztest_od_t *zd_od; /* debugging aid */ @@ -237,6 +239,7 @@ ztest_func_t ztest_dmu_commit_callbacks; ztest_func_t ztest_zap; ztest_func_t ztest_zap_parallel; ztest_func_t ztest_zil_commit; +ztest_func_t ztest_zil_remount; ztest_func_t ztest_dmu_read_write_zcopy; ztest_func_t ztest_dmu_objset_create_destroy; ztest_func_t ztest_dmu_prealloc; @@ -272,6 +275,7 @@ ztest_info_t ztest_info[] = { { ztest_zap_parallel, 100, &zopt_always }, { ztest_split_pool, 1, &zopt_always }, { ztest_zil_commit, 1, &zopt_incessant }, + { ztest_zil_remount, 1, &zopt_sometimes }, { ztest_dmu_read_write_zcopy, 1, &zopt_often }, { ztest_dmu_objset_create_destroy, 1, &zopt_often }, { ztest_dsl_prop_get_set, 1, &zopt_often }, @@ -985,6 +989,7 @@ ztest_zd_init(ztest_ds_t *zd, objset_t * zd->zd_seq = 0; dmu_objset_name(os, zd->zd_name); + VERIFY(rwlock_init(&zd->zd_zilog_lock, USYNC_THREAD, NULL) == 0); VERIFY(_mutex_init(&zd->zd_dirobj_lock, USYNC_THREAD, NULL) == 0); for (int l = 0; l < ZTEST_OBJECT_LOCKS; l++) @@ -1964,6 +1969,8 @@ ztest_io(ztest_ds_t *zd, uint64_t object if (ztest_random(2) == 0) io_type = ZTEST_IO_WRITE_TAG; + (void) rw_rdlock(&zd->zd_zilog_lock); + switch (io_type) { case ZTEST_IO_WRITE_TAG: @@ -1999,6 +2006,8 @@ ztest_io(ztest_ds_t *zd, uint64_t object break; } + (void) rw_unlock(&zd->zd_zilog_lock); + umem_free(data, blocksize); } @@ -2053,6 +2062,8 @@ ztest_zil_commit(ztest_ds_t *zd, uint64_ { zilog_t *zilog = zd->zd_zilog; + (void) rw_rdlock(&zd->zd_zilog_lock); + zil_commit(zilog, ztest_random(ZTEST_OBJECTS)); /* @@ -2064,6 +2075,31 @@ ztest_zil_commit(ztest_ds_t *zd, uint64_ ASSERT(zd->zd_seq <= zilog->zl_commit_lr_seq); zd->zd_seq = zilog->zl_commit_lr_seq; mutex_exit(&zilog->zl_lock); + + (void) rw_unlock(&zd->zd_zilog_lock); +} + +/* + * This function is designed to simulate the operations that occur during a + * mount/unmount operation. We hold the dataset across these operations in an + * attempt to expose any implicit assumptions about ZIL management. + */ +/* ARGSUSED */ +void +ztest_zil_remount(ztest_ds_t *zd, uint64_t id) +{ + objset_t *os = zd->zd_os; + + (void) rw_wrlock(&zd->zd_zilog_lock); + + /* zfsvfs_teardown() */ + zil_close(zd->zd_zilog); + + /* zfsvfs_setup() */ + VERIFY(zil_open(os, ztest_get_data) == zd->zd_zilog); + zil_replay(os, zd, ztest_replay_vector); + + (void) rw_unlock(&zd->zd_zilog_lock); } /* @@ -5137,6 +5173,7 @@ ztest_run(ztest_shared_t *zs) */ kernel_init(FREAD | FWRITE); VERIFY(spa_open(zs->zs_pool, &spa, FTAG) == 0); + spa->spa_debug = B_TRUE; zs->zs_spa = spa; spa->spa_dedup_ditto = 2 * ZIO_DEDUPDITTO_MIN; Modified: projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Mon Aug 15 20:31:27 2011 (r224899) @@ -4289,7 +4289,8 @@ zfs_jail(zfs_handle_t *zhp, int jailid, libzfs_handle_t *hdl = zhp->zfs_hdl; zfs_cmd_t zc = { 0 }; char errbuf[1024]; - int cmd, ret; + unsigned long cmd; + int ret; if (attach) { (void) snprintf(errbuf, sizeof (errbuf), Modified: projects/zfsd/head/contrib/bsnmp/snmp_usm/snmp_usm.3 ============================================================================== --- projects/zfsd/head/contrib/bsnmp/snmp_usm/snmp_usm.3 Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/contrib/bsnmp/snmp_usm/snmp_usm.3 Mon Aug 15 20:31:27 2011 (r224899) @@ -115,7 +115,7 @@ allowed. This column is used to create new USM user entries or delete existing ones from the table. .El -.EL +.El .Sh FILES .Bl -tag -width "XXXXXXXXX" .It Pa /usr/share/snmp/defs/usm_tree.def Modified: projects/zfsd/head/contrib/gcc/cp/ChangeLog ============================================================================== --- projects/zfsd/head/contrib/gcc/cp/ChangeLog Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/contrib/gcc/cp/ChangeLog Mon Aug 15 20:31:27 2011 (r224899) @@ -1,3 +1,9 @@ +2007-09-29 Jason Merrill <jason@redhat.com> + + PR c++/33094 + * decl.c (make_rtl_for_nonlocal_decl): It's ok for a member + constant to not have DECL_EXTERNAL if it's file-local. + 2007-08-24 Jakub Jelinek <jakub@redhat.com> PR c++/31941 Modified: projects/zfsd/head/contrib/gcc/cp/decl.c ============================================================================== --- projects/zfsd/head/contrib/gcc/cp/decl.c Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/contrib/gcc/cp/decl.c Mon Aug 15 20:31:27 2011 (r224899) @@ -4968,7 +4968,7 @@ make_rtl_for_nonlocal_decl (tree decl, t /* An in-class declaration of a static data member should be external; it is only a declaration, and not a definition. */ if (init == NULL_TREE) - gcc_assert (DECL_EXTERNAL (decl)); + gcc_assert (DECL_EXTERNAL (decl) || !TREE_PUBLIC (decl)); } /* We don't create any RTL for local variables. */ Modified: projects/zfsd/head/contrib/gdb/FREEBSD-diffs ============================================================================== --- projects/zfsd/head/contrib/gdb/FREEBSD-diffs Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/contrib/gdb/FREEBSD-diffs Mon Aug 15 20:31:27 2011 (r224899) @@ -927,3 +927,39 @@ diff -N gdb/config/ia64/tm-fbsd.h +#include "ia64/tm-ia64.h" + +#endif /* TM_FBSD_H */ +Index: gdb/sparc64fbsd-tdep.c +=================================================================== +--- gdb/sparc64fbsd-tdep.c (revision 223862) ++++ gdb/sparc64fbsd-tdep.c (working copy) +@@ -64,6 +64,31 @@ sparc64fbsd_supply_fpregset (const struct regset * + { + sparc64_supply_fpregset (regcache, regnum, fpregs); + } ++ ++void ++supply_gregset (const void *gregs) ++{ ++ sparc64_supply_gregset (&sparc64fbsd_gregset, current_regcache, -1, gregs); ++} ++ ++void ++supply_fpregset (const void *fpregs) ++{ ++ sparc64_supply_fpregset (current_regcache, -1, fpregs); ++} ++ ++void ++fill_gregset (void *gregs, int regnum) ++{ ++ sparc64_collect_gregset (&sparc64fbsd_gregset, current_regcache, regnum, ++ gregs); ++} ++ ++void ++fill_fpregset (void *fpregs, int regnum) ++{ ++ sparc64_collect_fpregset (current_regcache, regnum, fpregs); ++} + + + /* Signal trampolines. */ Modified: projects/zfsd/head/contrib/gdb/gdb/sparc64fbsd-tdep.c ============================================================================== --- projects/zfsd/head/contrib/gdb/gdb/sparc64fbsd-tdep.c Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/contrib/gdb/gdb/sparc64fbsd-tdep.c Mon Aug 15 20:31:27 2011 (r224899) @@ -64,6 +64,31 @@ sparc64fbsd_supply_fpregset (const struc { sparc64_supply_fpregset (regcache, regnum, fpregs); } + +void +supply_gregset (const void *gregs) +{ + sparc64_supply_gregset (&sparc64fbsd_gregset, current_regcache, -1, gregs); +} + +void +supply_fpregset (const void *fpregs) +{ + sparc64_supply_fpregset (current_regcache, -1, fpregs); +} + +void +fill_gregset (void *gregs, int regnum) +{ + sparc64_collect_gregset (&sparc64fbsd_gregset, current_regcache, regnum, + gregs); +} + +void +fill_fpregset (void *fpregs, int regnum) +{ + sparc64_collect_fpregset (current_regcache, regnum, fpregs); +} /* Signal trampolines. */ Modified: projects/zfsd/head/contrib/one-true-awk/FIXES ============================================================================== --- projects/zfsd/head/contrib/one-true-awk/FIXES Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/contrib/one-true-awk/FIXES Mon Aug 15 20:31:27 2011 (r224899) @@ -25,6 +25,28 @@ THIS SOFTWARE. This file lists all bug fixes, changes, etc., made since the AWK book was sent to the printers in August, 1987. +Aug 10, 2011: + another fix to avoid core dump with delete(ARGV); again, many thanks + to ruslan ermilov. + +Aug 7, 2011: + split(s, a, //) now behaves the same as split(s, a, "") + +Jun 12, 2011: + /pat/, \n /pat/ {...} is now legal, though bad style to use. + + added checks to new -v code that permits -vnospace; thanks to + ruslan ermilov for spotting this and providing the patch. + + removed fixed limit on number of open files; thanks to aleksey + cheusov and christos zoulos. + + fixed day 1 bug that resurrected deleted elements of ARGV when + used as filenames (in lib.c). + + minor type fiddles to make gcc -Wall -pedantic happier (but not + totally so); turned on -fno-strict-aliasing in makefile. + May 6, 2011: added #ifdef for isblank. now allows -ffoo as well as -f foo arguments. Modified: projects/zfsd/head/contrib/one-true-awk/awkgram.y ============================================================================== --- projects/zfsd/head/contrib/one-true-awk/awkgram.y Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/contrib/one-true-awk/awkgram.y Mon Aug 15 20:31:27 2011 (r224899) @@ -174,8 +174,8 @@ pa_pat: pa_stat: pa_pat { $$ = stat2(PASTAT, $1, stat2(PRINT, rectonode(), NIL)); } | pa_pat lbrace stmtlist '}' { $$ = stat2(PASTAT, $1, $3); } - | pa_pat ',' pa_pat { $$ = pa2stat($1, $3, stat2(PRINT, rectonode(), NIL)); } - | pa_pat ',' pa_pat lbrace stmtlist '}' { $$ = pa2stat($1, $3, $5); } + | pa_pat ',' opt_nl pa_pat { $$ = pa2stat($1, $4, stat2(PRINT, rectonode(), NIL)); } + | pa_pat ',' opt_nl pa_pat lbrace stmtlist '}' { $$ = pa2stat($1, $4, $6); } | lbrace stmtlist '}' { $$ = stat2(PASTAT, NIL, $2); } | XBEGIN lbrace stmtlist '}' { beginloc = linkum(beginloc, $3); $$ = 0; } Modified: projects/zfsd/head/contrib/one-true-awk/b.c ============================================================================== --- projects/zfsd/head/contrib/one-true-awk/b.c Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/contrib/one-true-awk/b.c Mon Aug 15 20:31:27 2011 (r224899) @@ -234,7 +234,7 @@ void freetr(Node *p) /* free parse tree /* in the parsing of regular expressions, metacharacters like . have */ /* to be seen literally; \056 is not a metacharacter. */ -int hexstr(char **pp) /* find and eval hex string at pp, return new p */ +int hexstr(uschar **pp) /* find and eval hex string at pp, return new p */ { /* only pick up one 8-bit byte (2 chars) */ uschar *p; int n = 0; @@ -248,16 +248,16 @@ int hexstr(char **pp) /* find and eval h else if (*p >= 'A' && *p <= 'F') n = 16 * n + *p - 'A' + 10; } - *pp = (char *) p; + *pp = (uschar *) p; return n; } #define isoctdigit(c) ((c) >= '0' && (c) <= '7') /* multiple use of arg */ -int quoted(char **pp) /* pick up next thing after a \\ */ +int quoted(uschar **pp) /* pick up next thing after a \\ */ /* and increment *pp */ { - char *p = *pp; + uschar *p = *pp; int c; if ((c = *p++) == 't') @@ -314,13 +314,13 @@ char *cclenter(const char *argp) /* add bp = buf; for (i = 0; (c = *p++) != 0; ) { if (c == '\\') { - c = quoted((char **) &p); + c = quoted(&p); } else if (c == '-' && i > 0 && bp[-1] != 0) { if (*p != 0) { c = bp[-1]; c2 = *p++; if (c2 == '\\') - c2 = quoted((char **) &p); + c2 = quoted(&p); if (collate_range_cmp(c, c2) > 0) { bp--; i--; @@ -807,7 +807,7 @@ int relex(void) /* lexical analyzer for case ')': return c; case '\\': - rlxval = quoted((char **) &prestr); + rlxval = quoted(&prestr); return CHAR; default: rlxval = c; Modified: projects/zfsd/head/contrib/one-true-awk/lex.c ============================================================================== --- projects/zfsd/head/contrib/one-true-awk/lex.c Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/contrib/one-true-awk/lex.c Mon Aug 15 20:31:27 2011 (r224899) @@ -411,7 +411,7 @@ int string(void) } *px = 0; unput(c); - sscanf(xbuf, "%x", &n); + sscanf(xbuf, "%x", (unsigned int *) &n); *bp++ = n; break; } Modified: projects/zfsd/head/contrib/one-true-awk/lib.c ============================================================================== --- projects/zfsd/head/contrib/one-true-awk/lib.c Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/contrib/one-true-awk/lib.c Mon Aug 15 20:31:27 2011 (r224899) @@ -89,8 +89,13 @@ void initgetrec(void) char *p; for (i = 1; i < *ARGC; i++) { - if (!isclvar(p = getargv(i))) { /* find 1st real filename */ - setsval(lookup("FILENAME", symtab), getargv(i)); + p = getargv(i); /* find 1st real filename */ + if (p == NULL || *p == '\0') { /* deleted or zapped */ + argno++; + continue; + } + if (!isclvar(p)) { + setsval(lookup("FILENAME", symtab), p); return; } setclvar(p); /* a commandline assignment before filename */ @@ -124,7 +129,7 @@ int getrec(char **pbuf, int *pbufsize, i dprintf( ("argno=%d, file=|%s|\n", argno, file) ); if (infile == NULL) { /* have to open a new file */ file = getargv(argno); - if (*file == '\0') { /* it's been zapped */ + if (file == NULL || *file == '\0') { /* deleted or zapped */ argno++; continue; } @@ -187,6 +192,7 @@ int readrec(char **pbuf, int *pbufsize, if (strlen(*FS) >= sizeof(inputFS)) FATAL("field separator %.10s... is too long", *FS); + /*fflush(stdout); avoids some buffering problem but makes it 25% slower*/ strcpy(inputFS, *FS); /* for subsequent field splitting */ if ((sep = **RS) == 0) { sep = '\n'; @@ -227,6 +233,8 @@ char *getargv(int n) /* get ARGV[n] */ extern Array *ARGVtab; sprintf(temp, "%d", n); + if (lookup(temp, ARGVtab) == NULL) + return NULL; x = setsymtab(temp, "", 0.0, STR, ARGVtab); s = getsval(x); dprintf( ("getargv(%d) returns |%s|\n", n, s) ); @@ -477,14 +485,14 @@ void recbld(void) /* create $0 from $1.. if (!adjbuf(&record, &recsize, 2+r-record, recsize, &r, "recbld 3")) FATAL("built giant record `%.30s...'", record); *r = '\0'; - dprintf( ("in recbld inputFS=%s, fldtab[0]=%p\n", inputFS, fldtab[0]) ); + dprintf( ("in recbld inputFS=%s, fldtab[0]=%p\n", inputFS, (void*)fldtab[0]) ); if (freeable(fldtab[0])) xfree(fldtab[0]->sval); fldtab[0]->tval = REC | STR | DONTFREE; fldtab[0]->sval = record; - dprintf( ("in recbld inputFS=%s, fldtab[0]=%p\n", inputFS, fldtab[0]) ); + dprintf( ("in recbld inputFS=%s, fldtab[0]=%p\n", inputFS, (void*)fldtab[0]) ); dprintf( ("recbld = |%s|\n", record) ); donerec = 1; } Modified: projects/zfsd/head/contrib/one-true-awk/main.c ============================================================================== --- projects/zfsd/head/contrib/one-true-awk/main.c Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/contrib/one-true-awk/main.c Mon Aug 15 20:31:27 2011 (r224899) @@ -25,7 +25,7 @@ THIS SOFTWARE. #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -const char *version = "version 20110506 (FreeBSD)"; +const char *version = "version 20110810 (FreeBSD)"; #define DEBUG #include <stdio.h> @@ -125,10 +125,20 @@ int main(int argc, char *argv[]) WARNING("field separator FS is empty"); break; case 'v': /* -v a=1 to be done NOW. one -v for each */ - if (argv[1][2] == '\0' && --argc > 1 && isclvar((++argv)[1])) - setclvar(argv[1]); - else if (argv[1][2] != '\0') - setclvar(&argv[1][2]); + if (argv[1][2] != 0) { /* arg is -vsomething */ + if (isclvar(&argv[1][2])) + setclvar(&argv[1][2]); + else + FATAL("invalid -v option argument: %s", &argv[1][2]); + } else { /* arg is -v something */ + argc--; argv++; + if (argc <= 1) + FATAL("no variable name"); + if (isclvar(argv[1])) + setclvar(argv[1]); + else + FATAL("invalid -v option argument: %s", argv[1]); + } break; case 'd': dbg = atoi(&argv[1][2]); Modified: projects/zfsd/head/contrib/one-true-awk/makefile ============================================================================== --- projects/zfsd/head/contrib/one-true-awk/makefile Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/contrib/one-true-awk/makefile Mon Aug 15 20:31:27 2011 (r224899) @@ -30,7 +30,7 @@ CC = gcc -Wall -g CC = cc CC = gcc -Wall -g -Wwrite-strings CC = gcc -fprofile-arcs -ftest-coverage # then gcov f1.c; cat f1.c.gcov -CC = gcc -O4 +CC = gcc -O4 -Wall -pedantic -fno-strict-aliasing YACC = bison -y YACC = yacc Modified: projects/zfsd/head/contrib/one-true-awk/proto.h ============================================================================== --- projects/zfsd/head/contrib/one-true-awk/proto.h Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/contrib/one-true-awk/proto.h Mon Aug 15 20:31:27 2011 (r224899) @@ -43,8 +43,8 @@ extern fa *mkdfa(const char *, int); extern int makeinit(fa *, int); extern void penter(Node *); extern void freetr(Node *); -extern int hexstr(char **); -extern int quoted(char **); +extern int hexstr(uschar **); +extern int quoted(uschar **); extern char *cclenter(const char *); extern void overflo(const char *); extern void cfoll(fa *, Node *); Modified: projects/zfsd/head/contrib/one-true-awk/run.c ============================================================================== --- projects/zfsd/head/contrib/one-true-awk/run.c Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/contrib/one-true-awk/run.c Mon Aug 15 20:31:27 2011 (r224899) @@ -1239,6 +1239,12 @@ Cell *split(Node **a, int nnn) /* split( ap->sval = (char *) makesymtab(NSYMTAB); n = 0; + if (arg3type == REGEXPR && strlen((char*)((fa*)a[2])->restr) == 0) { + /* split(s, a, //); have to arrange that it looks like empty sep */ + arg3type = 0; + fs = ""; + sep = 0; + } if (*s != '\0' && (strlen(fs) > 1 || arg3type == REGEXPR)) { /* reg expr */ fa *pfa; if (arg3type == REGEXPR) { /* it's ready already */ @@ -1621,17 +1627,25 @@ struct files { FILE *fp; const char *fname; int mode; /* '|', 'a', 'w' => LE/LT, GT */ -} files[FOPEN_MAX] ={ - { NULL, "/dev/stdin", LT }, /* watch out: don't free this! */ - { NULL, "/dev/stdout", GT }, - { NULL, "/dev/stderr", GT } -}; +} *files; + +int nfiles; void stdinit(void) /* in case stdin, etc., are not constants */ { - files[0].fp = stdin; - files[1].fp = stdout; - files[2].fp = stderr; + nfiles = FOPEN_MAX; + files = calloc(nfiles, sizeof(*files)); + if (files == NULL) + FATAL("can't allocate file memory for %u files", nfiles); + files[0].fp = stdin; + files[0].fname = "/dev/stdin"; + files[0].mode = LT; + files[1].fp = stdout; + files[1].fname = "/dev/stdout"; + files[1].mode = GT; + files[2].fp = stderr; + files[2].fname = "/dev/stderr"; + files[2].mode = GT; } FILE *openfile(int a, const char *us) @@ -1642,7 +1656,7 @@ FILE *openfile(int a, const char *us) if (*s == '\0') FATAL("null file name in print or getline"); - for (i=0; i < FOPEN_MAX; i++) + for (i=0; i < nfiles; i++) if (files[i].fname && strcmp(s, files[i].fname) == 0) { if (a == files[i].mode || (a==APPEND && files[i].mode==GT)) return files[i].fp; @@ -1652,11 +1666,19 @@ FILE *openfile(int a, const char *us) if (a == FFLUSH) /* didn't find it, so don't create it! */ return NULL; - for (i=0; i < FOPEN_MAX; i++) + for (i=0; i < nfiles; i++) if (files[i].fp == 0) break; - if (i >= FOPEN_MAX) - FATAL("%s makes too many open files", s); + if (i >= nfiles) { + struct files *nf; + int nnf = nfiles + FOPEN_MAX; + nf = realloc(files, nnf * sizeof(*nf)); + if (nf == NULL) + FATAL("cannot grow files for %s and %d files", s, nnf); + memset(&nf[nfiles], 0, FOPEN_MAX * sizeof(*nf)); + nfiles = nnf; + files = nf; + } fflush(stdout); /* force a semblance of order */ m = a; if (a == GT) { @@ -1684,7 +1706,7 @@ const char *filename(FILE *fp) { int i; - for (i = 0; i < FOPEN_MAX; i++) + for (i = 0; i < nfiles; i++) if (fp == files[i].fp) return files[i].fname; return "???"; @@ -1699,7 +1721,7 @@ Cell *closefile(Node **a, int n) x = execute(a[0]); getsval(x); stat = -1; - for (i = 0; i < FOPEN_MAX; i++) { + for (i = 0; i < nfiles; i++) { if (files[i].fname && strcmp(x->sval, files[i].fname) == 0) { if (ferror(files[i].fp)) WARNING( "i/o error occurred on %s", files[i].fname ); @@ -1743,7 +1765,7 @@ void flush_all(void) { int i; - for (i = 0; i < FOPEN_MAX; i++) + for (i = 0; i < nfiles; i++) if (files[i].fp) fflush(files[i].fp); } Modified: projects/zfsd/head/contrib/one-true-awk/tran.c ============================================================================== --- projects/zfsd/head/contrib/one-true-awk/tran.c Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/contrib/one-true-awk/tran.c Mon Aug 15 20:31:27 2011 (r224899) @@ -212,7 +212,7 @@ Cell *setsymtab(const char *n, const cha if (n != NULL && (p = lookup(n, tp)) != NULL) { dprintf( ("setsymtab found %p: n=%s s=\"%s\" f=%g t=%o\n", - p, NN(p->nval), NN(p->sval), p->fval, p->tval) ); + (void*)p, NN(p->nval), NN(p->sval), p->fval, p->tval) ); return(p); } p = (Cell *) malloc(sizeof(Cell)); @@ -231,7 +231,7 @@ Cell *setsymtab(const char *n, const cha p->cnext = tp->tab[h]; tp->tab[h] = p; dprintf( ("setsymtab set %p: n=%s s=\"%s\" f=%g t=%o\n", - p, p->nval, p->sval, p->fval, p->tval) ); + (void*)p, p->nval, p->sval, p->fval, p->tval) ); return(p); } @@ -298,7 +298,7 @@ Awkfloat setfval(Cell *vp, Awkfloat f) / xfree(vp->sval); /* free any previous string */ vp->tval &= ~STR; /* mark string invalid */ vp->tval |= NUM; /* mark number ok */ - dprintf( ("setfval %p: %s = %g, t=%o\n", vp, NN(vp->nval), f, vp->tval) ); + dprintf( ("setfval %p: %s = %g, t=%o\n", (void*)vp, NN(vp->nval), f, vp->tval) ); return vp->fval = f; } @@ -318,7 +318,7 @@ char *setsval(Cell *vp, const char *s) / int fldno; dprintf( ("starting setsval %p: %s = \"%s\", t=%o, r,f=%d,%d\n", - vp, NN(vp->nval), s, vp->tval, donerec, donefld) ); + (void*)vp, NN(vp->nval), s, vp->tval, donerec, donefld) ); if ((vp->tval & (NUM | STR)) == 0) funnyvar(vp, "assign to"); if (isfld(vp)) { @@ -338,7 +338,7 @@ char *setsval(Cell *vp, const char *s) / vp->tval |= STR; vp->tval &= ~DONTFREE; dprintf( ("setsval %p: %s = \"%s (%p) \", t=%o r,f=%d,%d\n", - vp, NN(vp->nval), t,t, vp->tval, donerec, donefld) ); + (void*)vp, NN(vp->nval), t,t, vp->tval, donerec, donefld) ); return(vp->sval = t); } @@ -355,7 +355,8 @@ Awkfloat getfval(Cell *vp) /* get float if (is_number(vp->sval) && !(vp->tval&CON)) vp->tval |= NUM; /* make NUM only sparingly */ } - dprintf( ("getfval %p: %s = %g, t=%o\n", vp, NN(vp->nval), vp->fval, vp->tval) ); + dprintf( ("getfval %p: %s = %g, t=%o\n", + (void*)vp, NN(vp->nval), vp->fval, vp->tval) ); return(vp->fval); } @@ -381,7 +382,8 @@ static char *get_str_val(Cell *vp, char vp->tval &= ~DONTFREE; vp->tval |= STR; } - dprintf( ("getsval %p: %s = \"%s (%p)\", t=%o\n", vp, NN(vp->nval), vp->sval, vp->sval, vp->tval) ); + dprintf( ("getsval %p: %s = \"%s (%p)\", t=%o\n", + (void*)vp, NN(vp->nval), vp->sval, vp->sval, vp->tval) ); return(vp->sval); } Modified: projects/zfsd/head/contrib/top/display.c ============================================================================== --- projects/zfsd/head/contrib/top/display.c Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/contrib/top/display.c Mon Aug 15 20:31:27 2011 (r224899) @@ -156,18 +156,30 @@ int display_updatecpus(statics) struct statics *statics; { + register int *lp; register int lines; register int i; /* call resize to do the dirty work */ lines = display_resize(); - num_cpus = statics->ncpus; + if (pcpu_stats) + num_cpus = statics->ncpus; + else + num_cpus = 1; cpustates_column = 5; /* CPU: */ if (num_cpus != 1) cpustates_column += 2; /* CPU 0: */ for (i = num_cpus; i > 9; i /= 10) cpustates_column++; + /* fill the "last" array with all -1s, to insure correct updating */ + lp = lcpustates; + i = num_cpustates * num_cpus; + while (--i >= 0) + { + *lp++ = -1; + } + return(lines); } @@ -197,7 +209,7 @@ struct statics *statics; num_swap = string_count(swap_names); lswap = (int *)malloc(num_swap * sizeof(int)); num_cpustates = string_count(cpustate_names); - lcpustates = (int *)malloc(num_cpustates * sizeof(int) * num_cpus); + lcpustates = (int *)malloc(num_cpustates * sizeof(int) * statics->ncpus); cpustate_columns = (int *)malloc(num_cpustates * sizeof(int)); memory_names = statics->memory_names; Modified: projects/zfsd/head/contrib/top/top.c ============================================================================== --- projects/zfsd/head/contrib/top/top.c Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/contrib/top/top.c Mon Aug 15 20:31:27 2011 (r224899) @@ -1029,8 +1029,8 @@ restart: case CMD_wcputog: ps.wcpu = !ps.wcpu; new_message(MT_standout | MT_delayed, - " Displaying %sCPU", - ps.wcpu ? "W" : ""); + " Displaying %s CPU", + ps.wcpu ? "weighted" : "raw"); header_text = format_header(uname_field); reset_display(); putchar('\r'); @@ -1094,7 +1094,7 @@ restart: new_message(MT_standout | MT_delayed, " Displaying %sCPU statistics.", pcpu_stats ? "per-" : "global "); - toggle_pcpustats(&statics); + toggle_pcpustats(); max_topn = display_updatecpus(&statics); reset_display(); putchar('\r'); Copied: projects/zfsd/head/crypto/openssh/README.hpn (from r224870, head/crypto/openssh/README.hpn) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/zfsd/head/crypto/openssh/README.hpn Mon Aug 15 20:31:27 2011 (r224899, copy of r224870, head/crypto/openssh/README.hpn) @@ -0,0 +1,120 @@ +Notes: + +NONE CIPHER: + To use the NONE option you must have the NoneEnabled switch set on the server + and you MUST have *both* NoneEnabled and NoneSwitch set to yes on the client. + The NONE feature works with ALL ssh subsystems (as far as we can tell) + as long as there is no tty allocated. + If a user uses the -T switch to prevent a tty being created the NONE cipher + will be disabled. + + +PERFORMANCE: + The performance increase will only be as good as the network and TCP stack + tuning on the reciever side of the connection allows. As a rule of thumb a + user will need at least 10Mb/s connection with a 100ms RTT to see a doubling + of performance. + The HPN-SSH home page http://www.psc.edu/networking/projects/hpn-ssh + describes this in greater detail. + + +BUFFER SIZES: +- if HPN is disabled the receive buffer size will be set to the OpenSSH default + of 64K. + +- if a HPN system connects to a non-HPN system the receive buffer will + be set to the HPNBufferSize value. The default is 2MB but user adjustable. + +- If a HPN to HPN connection is established a number of different things might + happen based on the user options and conditions. + + Conditions: HPNBufferSize NOT Set, TCPRcvBufPoll enabled, TCPRcvBuf NOT Set + Result: HPN Buffer Size = up to 64MB + This is the default state. The HPN buffer size will grow to a maximum of + 64MB as the TCP receive buffer grows. The maximum HPN Buffer size of 64MB + is geared towards 10GigE transcontinental connections. + + Conditions: HPNBufferSize NOT Set, TCPRcvBufPoll disabled, TCPRcvBuf NOT Set + Result: HPN Buffer Size = TCP receive buffer value. + Users on non-autotuning systesm should disable TCPRcvBufPoll in the + ssh_cofig and sshd_config + + Conditions: HPNBufferSize SET, TCPRcvBufPoll disabled, TCPRcvBuf NOT Set + Result: HPN Buffer Size = minmum of TCP receive buffer and HPNBufferSize. + This would be the system defined TCP receive buffer (RWIN). + + Conditions: HPNBufferSize SET, TCPRcvBufPoll disabled, TCPRcvBuf SET + Result: HPN Buffer Size = minmum of TCPRcvBuf and HPNBufferSize. + Generally there is no need to set both. + + Conditions: HPNBufferSize SET, TCPRcvBufPoll enabled, TCPRcvBuf NOT Set + Result: HPN Buffer Size = grows to HPNBufferSize + The buffer will grow up to the maximum size specified here. + + Conditions: HPNBufferSize SET, TCPRcvBufPoll enabled, TCPRcvBuf SET + Result: HPN Buffer Size = minmum of TCPRcvBuf and HPNBufferSize. + Generally there is no need to set both of these, especially on autotuning + systems. However, if the users wishes to override the autotuning this would + be one way to do it. + + Conditions: HPNBufferSize NOT Set, TCPRcvBufPoll enabled, TCPRcvBuf SET + Result: HPN Buffer Size = TCPRcvBuf. + This will override autotuning and set the TCP recieve buffer to the user + defined value. + + +HPN SPECIFIC CONFIGURATION OPTIONS: + +- HPNDisabled=[yes/no] client/server + In some situations, such as transfers on a local area network, the impact + of the HPN code produces a net decrease in performance. In these cases it is + helpful to disable the HPN functionality. By default HPNDisabled is set to no. + +- HPNBufferSize=[int]KB client/server + This is the default buffer size the HPN functionality uses when interacting + with non-HPN SSH installations. Conceptually this is similar to the TcpRcvBuf + option as applied to the internal SSH flow control. This value can range from + 1KB to 64MB (1-65536). Use of oversized or undersized buffers can cause + performance problems depending on the roud trip time of the network path. + The default size of this buffer is 2MB. + +- TcpRcvBufPoll=[yes/no] client/server + Enable or disable the polling of the TCP receive buffer through the life + of the connection. You would want to make sure that this option is enabled + for systems making use of autotuning kernels (linux 2.4.24+, 2.6, MS Vista, + FreeBSD 7.x and later). Default is yes. + +- TcpRcvBuf=[int]KB client + Set the TCP socket receive buffer to n Kilobytes. It can be set up to the + maximum socket size allowed by the system. This is useful in situations where + the TCP receive window is set low but the maximum buffer size is set higher + (as is typical). This works on a per TCP connection basis. You can also use + this to artifically limit the transfer rate of the connection. In these cases + the throughput will be no more than n/RTT. The minimum buffer size is 1KB. + Default is the current system wide TCP receive buffer size. + +- NoneEnabled=[yes/no] client/server + Enable or disable the use of the None cipher. Care must always be used when + enabling this as it will allow users to send data in the clear. However, it + is important to note that authentication information remains encrypted even + if this option is enabled. Set to no by default. + +- NoneSwitch=[yes/no] client + Switch the encryption cipher being used to the None cipher after + authentication takes place. NoneEnabled must be enabled on both the client + and server side of the connection. When the connection switches to the NONE + cipher a warning is sent to STDERR. The connection attempt will fail with an + error if a client requests a NoneSwitch from the server that does not + explicitly have NoneEnabled set to yes. + Note: The NONE cipher cannot be used in interactive (shell) sessions and it + will fail silently. Set to no by default. + + +CREDITS: + + This patch was conceived, designed, and led by Chris Rapier (rapier@psc.edu) + The majority of the actual coding for versions up to HPN12v1 was performed + by Michael Stevens (mstevens@andrew.cmu.edu). + The MT-AES-CTR cipher was implemented by Ben Bennet (ben@psc.edu). + This work was financed, in part, by Cisco System, Inc., the National Library + of Medicine, and the National Science Foundation. Modified: projects/zfsd/head/crypto/openssh/buffer.c ============================================================================== --- projects/zfsd/head/crypto/openssh/buffer.c Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/crypto/openssh/buffer.c Mon Aug 15 20:31:27 2011 (r224899) @@ -1,4 +1,5 @@ /* $OpenBSD: buffer.c,v 1.32 2010/02/09 03:56:28 djm Exp $ */ +/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -25,7 +26,7 @@ #include "log.h" #define BUFFER_MAX_CHUNK 0x100000 -#define BUFFER_MAX_LEN 0xa00000 +#define BUFFER_MAX_LEN 0x4000000 /* 64MB */ #define BUFFER_ALLOCSZ 0x008000 /* Initializes the buffer structure. */ @@ -165,6 +166,13 @@ buffer_len(const Buffer *buffer) return buffer->end - buffer->offset; } +/* Returns the maximum number of bytes of data that may be in the buffer. */ +u_int +buffer_get_max_len(void) +{ + return (BUFFER_MAX_LEN); +} + /* Gets data from the beginning of the buffer. */ int Modified: projects/zfsd/head/crypto/openssh/buffer.h ============================================================================== --- projects/zfsd/head/crypto/openssh/buffer.h Mon Aug 15 19:29:25 2011 (r224898) +++ projects/zfsd/head/crypto/openssh/buffer.h Mon Aug 15 20:31:27 2011 (r224899) @@ -1,4 +1,5 @@ /* $OpenBSD: buffer.h,v 1.21 2010/08/31 11:54:45 djm Exp $ */ +/* $FreeBSD$ */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108152031.p7FKVSCV026318>