Date: Fri, 22 Mar 2013 22:55:37 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248630 - in user/attilio/vmcontention: . bin/chflags bin/mv cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zhack cddl/contrib/opensolari... Message-ID: <201303222255.r2MMtbU1068309@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Fri Mar 22 22:55:37 2013 New Revision: 248630 URL: http://svnweb.freebsd.org/changeset/base/248630 Log: MFC Added: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c - copied unchanged from r248629, head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.h - copied unchanged from r248629, head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.h user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs_core/ - copied from r248629, head/cddl/contrib/opensolaris/lib/libzfs_core/ user/attilio/vmcontention/cddl/lib/libzfs_core/ - copied from r248629, head/cddl/lib/libzfs_core/ user/attilio/vmcontention/contrib/libarchive/cpio/test/test_extract.cpio.Z.uu - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_extract.cpio.Z.uu user/attilio/vmcontention/contrib/libarchive/cpio/test/test_extract.cpio.bz2.uu - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_extract.cpio.bz2.uu user/attilio/vmcontention/contrib/libarchive/cpio/test/test_extract.cpio.grz.uu - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_extract.cpio.grz.uu user/attilio/vmcontention/contrib/libarchive/cpio/test/test_extract.cpio.gz.uu - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_extract.cpio.gz.uu user/attilio/vmcontention/contrib/libarchive/cpio/test/test_extract.cpio.lrz.uu - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_extract.cpio.lrz.uu user/attilio/vmcontention/contrib/libarchive/cpio/test/test_extract.cpio.lz.uu - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_extract.cpio.lz.uu user/attilio/vmcontention/contrib/libarchive/cpio/test/test_extract.cpio.lzma.uu - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_extract.cpio.lzma.uu user/attilio/vmcontention/contrib/libarchive/cpio/test/test_extract.cpio.lzo.uu - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_extract.cpio.lzo.uu user/attilio/vmcontention/contrib/libarchive/cpio/test/test_extract.cpio.xz.uu - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_extract.cpio.xz.uu user/attilio/vmcontention/contrib/libarchive/cpio/test/test_extract_cpio_Z.c - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_extract_cpio_Z.c user/attilio/vmcontention/contrib/libarchive/cpio/test/test_extract_cpio_bz2.c - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_extract_cpio_bz2.c user/attilio/vmcontention/contrib/libarchive/cpio/test/test_extract_cpio_grz.c - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_extract_cpio_grz.c user/attilio/vmcontention/contrib/libarchive/cpio/test/test_extract_cpio_gz.c - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_extract_cpio_gz.c user/attilio/vmcontention/contrib/libarchive/cpio/test/test_extract_cpio_lrz.c - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_extract_cpio_lrz.c user/attilio/vmcontention/contrib/libarchive/cpio/test/test_extract_cpio_lz.c - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_extract_cpio_lz.c user/attilio/vmcontention/contrib/libarchive/cpio/test/test_extract_cpio_lzma.c - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_extract_cpio_lzma.c user/attilio/vmcontention/contrib/libarchive/cpio/test/test_extract_cpio_lzo.c - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_extract_cpio_lzo.c user/attilio/vmcontention/contrib/libarchive/cpio/test/test_extract_cpio_xz.c - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_extract_cpio_xz.c user/attilio/vmcontention/contrib/libarchive/cpio/test/test_option_b64encode.c - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_option_b64encode.c user/attilio/vmcontention/contrib/libarchive/cpio/test/test_option_grzip.c - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_option_grzip.c user/attilio/vmcontention/contrib/libarchive/cpio/test/test_option_lrzip.c - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_option_lrzip.c user/attilio/vmcontention/contrib/libarchive/cpio/test/test_option_lzop.c - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_option_lzop.c user/attilio/vmcontention/contrib/libarchive/cpio/test/test_option_uuencode.c - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_option_uuencode.c user/attilio/vmcontention/contrib/libarchive/cpio/test/test_option_xz.c - copied unchanged from r248629, head/contrib/libarchive/cpio/test/test_option_xz.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_cmdline.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/archive_cmdline.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_cmdline_private.h - copied unchanged from r248629, head/contrib/libarchive/libarchive/archive_cmdline_private.h user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_append_filter.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/archive_read_append_filter.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_set_format.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/archive_read_set_format.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_filter_grzip.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/archive_read_support_filter_grzip.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_filter_lrzip.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/archive_read_support_filter_lrzip.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_filter_lzop.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/archive_read_support_filter_lzop.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_add_filter_b64encode.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/archive_write_add_filter_b64encode.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_add_filter_by_name.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/archive_write_add_filter_by_name.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_add_filter_grzip.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/archive_write_add_filter_grzip.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_add_filter_lrzip.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/archive_write_add_filter_lrzip.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_add_filter_lzop.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/archive_write_add_filter_lzop.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_add_filter_uuencode.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/archive_write_add_filter_uuencode.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_set_format_v7tar.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/archive_write_set_format_v7tar.c user/attilio/vmcontention/contrib/libarchive/libarchive/filter_fork_posix.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/filter_fork_posix.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_archive_cmdline.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_archive_cmdline.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_archive_read_multiple_data_objects.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_archive_read_multiple_data_objects.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_archive_write_add_filter_by_name.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_archive_write_add_filter_by_name.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_archive_write_set_format_by_name.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_archive_write_set_format_by_name.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_compat_lzop.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_compat_lzop.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_compat_lzop_1.tar.lzo.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_compat_lzop_1.tar.lzo.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_compat_lzop_2.tar.lzo.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_compat_lzop_2.tar.lzo.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_compat_lzop_3.tar.lzo.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_compat_lzop_3.tar.lzo.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_compat_uudecode.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_compat_uudecode.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part1.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part1.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part2.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part2.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part3.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part3.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part4.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part4.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part5.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part5.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part6.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part6.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_rar_multivolume_single_file.part1.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_rar_multivolume_single_file.part1.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_rar_multivolume_single_file.part2.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_rar_multivolume_single_file.part2.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_rar_multivolume_single_file.part3.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_rar_multivolume_single_file.part3.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_filter_grzip.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_filter_grzip.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_filter_grzip.tar.grz.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_filter_grzip.tar.grz.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_filter_lrzip.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_filter_lrzip.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_filter_lrzip.tar.lrz.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_filter_lrzip.tar.lrz.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_filter_lzop.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_filter_lzop.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_filter_lzop.tar.lzo.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_filter_lzop.tar.lzo.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_filter_lzop_multiple_parts.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_filter_lzop_multiple_parts.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_filter_lzop_multiple_parts.tar.lzo.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_filter_lzop_multiple_parts.tar.lzo.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_filter_program.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_filter_program.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_filter_program_signature.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_filter_program_signature.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_filter_uudecode.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_filter_uudecode.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_mtree_nomagic2.mtree.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_format_mtree_nomagic2.mtree.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_mtree_nomagic3.mtree.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_format_mtree_nomagic3.mtree.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored_1.zip.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored_1.zip.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored_2.zip.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored_2.zip.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_zip_mac_metadata.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_format_zip_mac_metadata.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_zip_mac_metadata.zip.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_format_zip_mac_metadata.zip.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_zip_sfx.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_format_zip_sfx.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_zip_sfx.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_format_zip_sfx.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_aa.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_aa.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ab.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ab.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ac.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ac.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ad.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ad.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ae.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ae.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_set_format.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_set_format.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_splitted_rar_aa.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_splitted_rar_aa.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_splitted_rar_ab.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_splitted_rar_ab.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_splitted_rar_ac.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_splitted_rar_ac.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_splitted_rar_ad.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_read_splitted_rar_ad.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_splitted_rar_seek_support_aa.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_splitted_rar_seek_support_aa.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_splitted_rar_seek_support_ab.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_splitted_rar_seek_support_ab.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_splitted_rar_seek_support_ac.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_splitted_rar_seek_support_ac.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_disk_appledouble.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_disk_appledouble.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_disk_appledouble.cpio.gz.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_disk_appledouble.cpio.gz.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_disk_hfs_compression.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_disk_hfs_compression.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_disk_hfs_compression.tgz.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_disk_hfs_compression.tgz.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_disk_mac_metadata.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_disk_mac_metadata.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_disk_mac_metadata.tar.gz.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_disk_mac_metadata.tar.gz.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_disk_no_hfs_compression.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_disk_no_hfs_compression.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_disk_no_hfs_compression.tgz.uu - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_disk_no_hfs_compression.tgz.uu user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_filter_b64encode.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_filter_b64encode.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_filter_bzip2.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_filter_bzip2.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_filter_compress.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_filter_compress.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_filter_gzip.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_filter_gzip.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_filter_gzip_timestamp.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_filter_gzip_timestamp.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_filter_lrzip.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_filter_lrzip.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_filter_lzip.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_filter_lzip.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_filter_lzma.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_filter_lzma.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_filter_lzop.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_filter_lzop.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_filter_program.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_filter_program.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_filter_uuencode.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_filter_uuencode.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_filter_xz.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_filter_xz.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_7zip_empty.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_format_7zip_empty.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_7zip_large.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_format_7zip_large.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_mtree_absolute_path.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_format_mtree_absolute_path.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_mtree_classic.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_format_mtree_classic.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_mtree_classic_indent.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_format_mtree_classic_indent.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_mtree_no_separator.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_format_mtree_no_separator.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_mtree_quoted_filename.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_format_mtree_quoted_filename.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_tar_v7tar.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_format_tar_v7tar.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_zip_set_compression_store.c - copied unchanged from r248629, head/contrib/libarchive/libarchive/test/test_write_zip_set_compression_store.c user/attilio/vmcontention/contrib/libarchive/tar/creation_set.c - copied unchanged from r248629, head/contrib/libarchive/tar/creation_set.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_extract.tar.Z.uu - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_extract.tar.Z.uu user/attilio/vmcontention/contrib/libarchive/tar/test/test_extract.tar.bz2.uu - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_extract.tar.bz2.uu user/attilio/vmcontention/contrib/libarchive/tar/test/test_extract.tar.grz.uu - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_extract.tar.grz.uu user/attilio/vmcontention/contrib/libarchive/tar/test/test_extract.tar.gz.uu - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_extract.tar.gz.uu user/attilio/vmcontention/contrib/libarchive/tar/test/test_extract.tar.lrz.uu - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_extract.tar.lrz.uu user/attilio/vmcontention/contrib/libarchive/tar/test/test_extract.tar.lz.uu - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_extract.tar.lz.uu user/attilio/vmcontention/contrib/libarchive/tar/test/test_extract.tar.lzma.uu - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_extract.tar.lzma.uu user/attilio/vmcontention/contrib/libarchive/tar/test/test_extract.tar.lzo.uu - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_extract.tar.lzo.uu user/attilio/vmcontention/contrib/libarchive/tar/test/test_extract.tar.xz.uu - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_extract.tar.xz.uu user/attilio/vmcontention/contrib/libarchive/tar/test/test_extract_tar_Z.c - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_extract_tar_Z.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_extract_tar_bz2.c - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_extract_tar_bz2.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_extract_tar_grz.c - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_extract_tar_grz.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_extract_tar_gz.c - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_extract_tar_gz.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_extract_tar_lrz.c - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_extract_tar_lrz.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_extract_tar_lz.c - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_extract_tar_lz.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_extract_tar_lzma.c - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_extract_tar_lzma.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_extract_tar_lzo.c - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_extract_tar_lzo.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_extract_tar_xz.c - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_extract_tar_xz.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_option_a.c - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_option_a.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_option_b64encode.c - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_option_b64encode.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_option_grzip.c - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_option_grzip.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_option_j.c - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_option_j.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_option_lrzip.c - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_option_lrzip.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_option_lzma.c - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_option_lzma.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_option_lzop.c - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_option_lzop.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_option_older_than.c - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_option_older_than.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_option_uuencode.c - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_option_uuencode.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_option_xz.c - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_option_xz.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_option_z.c - copied unchanged from r248629, head/contrib/libarchive/tar/test/test_option_z.c user/attilio/vmcontention/contrib/libarchive/test_utils/ - copied from r248629, head/contrib/libarchive/test_utils/ user/attilio/vmcontention/crypto/openssh/PROTOCOL.krl - copied unchanged from r248629, head/crypto/openssh/PROTOCOL.krl user/attilio/vmcontention/crypto/openssh/krl.c - copied unchanged from r248629, head/crypto/openssh/krl.c user/attilio/vmcontention/crypto/openssh/krl.h - copied unchanged from r248629, head/crypto/openssh/krl.h user/attilio/vmcontention/crypto/openssh/openbsd-compat/bsd-setres_id.c - copied unchanged from r248629, head/crypto/openssh/openbsd-compat/bsd-setres_id.c user/attilio/vmcontention/crypto/openssh/openbsd-compat/bsd-setres_id.h - copied unchanged from r248629, head/crypto/openssh/openbsd-compat/bsd-setres_id.h user/attilio/vmcontention/crypto/openssh/openbsd-compat/strtoull.c - copied unchanged from r248629, head/crypto/openssh/openbsd-compat/strtoull.c user/attilio/vmcontention/crypto/openssh/scard/ - copied from r248629, head/crypto/openssh/scard/ user/attilio/vmcontention/crypto/openssh/umac128.c - copied unchanged from r248629, head/crypto/openssh/umac128.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c - copied unchanged from r248629, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c - copied unchanged from r248629, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h - copied unchanged from r248629, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_destroy.h - copied unchanged from r248629, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_destroy.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_userhold.h - copied unchanged from r248629, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_userhold.h Deleted: user/attilio/vmcontention/contrib/libarchive/libarchive/filter_fork.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_acl_freebsd.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_compress_program.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_uu.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_compress.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_compress_bzip2.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_compress_gzip.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_compress_lzip.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_compress_lzma.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_compress_program.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_compress_xz.c user/attilio/vmcontention/crypto/openssh/acss.c user/attilio/vmcontention/crypto/openssh/acss.h user/attilio/vmcontention/crypto/openssh/cipher-acss.c Modified: user/attilio/vmcontention/Makefile.inc1 user/attilio/vmcontention/bin/chflags/chflags.c user/attilio/vmcontention/bin/mv/mv.c user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.c user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs.8 user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zhack/zhack.c user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/ztest/ztest.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h user/attilio/vmcontention/cddl/lib/Makefile user/attilio/vmcontention/cddl/lib/libzfs/Makefile user/attilio/vmcontention/cddl/sbin/zfs/Makefile user/attilio/vmcontention/cddl/sbin/zpool/Makefile user/attilio/vmcontention/cddl/usr.bin/zinject/Makefile user/attilio/vmcontention/cddl/usr.bin/ztest/Makefile user/attilio/vmcontention/cddl/usr.sbin/zdb/Makefile user/attilio/vmcontention/cddl/usr.sbin/zhack/Makefile user/attilio/vmcontention/contrib/libarchive/NEWS user/attilio/vmcontention/contrib/libarchive/README user/attilio/vmcontention/contrib/libarchive/cpio/bsdcpio.1 user/attilio/vmcontention/contrib/libarchive/cpio/cmdline.c user/attilio/vmcontention/contrib/libarchive/cpio/cpio.c user/attilio/vmcontention/contrib/libarchive/cpio/cpio.h user/attilio/vmcontention/contrib/libarchive/cpio/test/main.c user/attilio/vmcontention/contrib/libarchive/cpio/test/test.h user/attilio/vmcontention/contrib/libarchive/cpio/test/test_basic.c user/attilio/vmcontention/contrib/libarchive/cpio/test/test_format_newc.c user/attilio/vmcontention/contrib/libarchive/cpio/test/test_option_y.c user/attilio/vmcontention/contrib/libarchive/cpio/test/test_option_z.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive.h user/attilio/vmcontention/contrib/libarchive/libarchive/archive_crypto.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_entry.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_entry.h user/attilio/vmcontention/contrib/libarchive/libarchive/archive_entry_link_resolver.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_match.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_options.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_ppmd7.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_private.h user/attilio/vmcontention/contrib/libarchive/libarchive/archive_rb.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_disk_posix.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_extract.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_open_fd.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_open_file.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_open_filename.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_private.h user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_filter_all.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_filter_bzip2.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_filter_compress.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_filter_gzip.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_filter_program.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_filter_rpm.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_filter_uu.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_filter_xz.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_format_7zip.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_format_ar.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_format_cab.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_format_cpio.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_format_empty.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_format_lha.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_format_mtree.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_format_rar.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_format_raw.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_format_tar.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_format_xar.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_read_support_format_zip.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_string.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_util.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_virtual.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_add_filter.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_add_filter_bzip2.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_add_filter_compress.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_add_filter_gzip.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_add_filter_program.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_add_filter_xz.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_disk_acl.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_disk_posix.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_free.3 user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_open_filename.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_private.h user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_set_format_7zip.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_set_format_ar.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_set_format_by_name.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_set_format_mtree.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_set_format_pax.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_set_format_xar.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_set_format_zip.c user/attilio/vmcontention/contrib/libarchive/libarchive/archive_write_set_options.c user/attilio/vmcontention/contrib/libarchive/libarchive/filter_fork.h user/attilio/vmcontention/contrib/libarchive/libarchive/libarchive-formats.5 user/attilio/vmcontention/contrib/libarchive/libarchive/test/main.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test.h user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_acl_freebsd_nfs4.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_acl_nfs4.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_acl_pax.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_acl_posix1e.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_archive_clear_error.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_archive_read_close_twice.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_archive_read_close_twice_open_fd.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_archive_read_close_twice_open_filename.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_archive_read_set_filter_option.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_archive_read_set_format_option.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_archive_read_set_option.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_archive_read_set_options.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_archive_set_error.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_archive_write_set_filter_option.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_archive_write_set_format_option.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_archive_write_set_option.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_archive_write_set_options.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_compat_bzip2.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_compat_cpio.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_compat_gtar.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_compat_gzip.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_compat_lzip.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_compat_lzma.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_compat_mac.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_compat_tar_hardlink.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_compat_xz.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_compat_zip.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_empty_write.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_entry.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_filter_count.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_fuzz.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_open_failure.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_open_fd.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_open_file.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_open_filename.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_pax_filename_encoding.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_data_large.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_disk.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_extract.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_7zip.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_ar.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_cab.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_cab_filename.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_cpio_afio.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_cpio_bin.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_Z.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_be.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_bz2.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_gz.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_lzip.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_lzma.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_xz.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_cpio_filename.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_cpio_odc.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4c_Z.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_empty.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_gtar_gz.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_gtar_lzma.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_iso_Z.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_iso_multi_extent.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_iso_xorriso.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_isojoliet_bz2.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_isojoliet_long.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_isojoliet_rr.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_isojoliet_versioned.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_isorr_bz2.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_isorr_ce.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_isorr_new_bz2.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_isorr_rr_moved.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_isozisofs_bz2.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_lha.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_lha_filename.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_mtree.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_pax_bz2.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_rar.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_tar.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_tar_empty_filename.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_tbz.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_tgz.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_tlz.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_txz.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_tz.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_xar.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_zip.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_format_zip_filename.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_pax_truncated.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_truncated.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_read_truncated_filter.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_sparse_basic.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_tar_filenames.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_ustar_filenames.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_disk_sparse.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_7zip.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_ar.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_cpio.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_cpio_empty.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_cpio_newc.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_cpio_odc.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_gnutar.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_iso9660.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_iso9660_boot.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_iso9660_empty.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_iso9660_filename.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_iso9660_zisofs.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_mtree.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_mtree_fflags.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_pax.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_shar_empty.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_tar.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_tar_empty.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_tar_sparse.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_tar_ustar.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_xar.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_xar_empty.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_zip.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_zip_empty.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_format_zip_no_compression.c user/attilio/vmcontention/contrib/libarchive/libarchive/test/test_write_open_memory.c user/attilio/vmcontention/contrib/libarchive/tar/bsdtar.1 user/attilio/vmcontention/contrib/libarchive/tar/bsdtar.c user/attilio/vmcontention/contrib/libarchive/tar/bsdtar.h user/attilio/vmcontention/contrib/libarchive/tar/cmdline.c user/attilio/vmcontention/contrib/libarchive/tar/read.c user/attilio/vmcontention/contrib/libarchive/tar/subst.c user/attilio/vmcontention/contrib/libarchive/tar/test/main.c user/attilio/vmcontention/contrib/libarchive/tar/test/test.h user/attilio/vmcontention/contrib/libarchive/tar/test/test_copy.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_option_newer_than.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_option_r.c user/attilio/vmcontention/contrib/libarchive/tar/test/test_stdio.c user/attilio/vmcontention/contrib/libarchive/tar/util.c user/attilio/vmcontention/contrib/libarchive/tar/write.c user/attilio/vmcontention/contrib/openbsm/etc/audit_event user/attilio/vmcontention/crypto/openssh/ChangeLog user/attilio/vmcontention/crypto/openssh/INSTALL user/attilio/vmcontention/crypto/openssh/PROTOCOL user/attilio/vmcontention/crypto/openssh/PROTOCOL.agent user/attilio/vmcontention/crypto/openssh/README user/attilio/vmcontention/crypto/openssh/auth-options.c user/attilio/vmcontention/crypto/openssh/auth-rsa.c user/attilio/vmcontention/crypto/openssh/auth.c user/attilio/vmcontention/crypto/openssh/auth.h user/attilio/vmcontention/crypto/openssh/auth1.c user/attilio/vmcontention/crypto/openssh/auth2-chall.c user/attilio/vmcontention/crypto/openssh/auth2-gss.c user/attilio/vmcontention/crypto/openssh/auth2-jpake.c user/attilio/vmcontention/crypto/openssh/auth2-pubkey.c user/attilio/vmcontention/crypto/openssh/auth2.c user/attilio/vmcontention/crypto/openssh/authfile.c user/attilio/vmcontention/crypto/openssh/channels.c user/attilio/vmcontention/crypto/openssh/cipher-aes.c user/attilio/vmcontention/crypto/openssh/cipher-ctr.c user/attilio/vmcontention/crypto/openssh/cipher.c user/attilio/vmcontention/crypto/openssh/cipher.h user/attilio/vmcontention/crypto/openssh/clientloop.c user/attilio/vmcontention/crypto/openssh/clientloop.h user/attilio/vmcontention/crypto/openssh/compat.c user/attilio/vmcontention/crypto/openssh/config.h user/attilio/vmcontention/crypto/openssh/config.h.in user/attilio/vmcontention/crypto/openssh/defines.h user/attilio/vmcontention/crypto/openssh/includes.h user/attilio/vmcontention/crypto/openssh/kex.c user/attilio/vmcontention/crypto/openssh/kex.h user/attilio/vmcontention/crypto/openssh/key.c user/attilio/vmcontention/crypto/openssh/key.h user/attilio/vmcontention/crypto/openssh/log.c user/attilio/vmcontention/crypto/openssh/log.h user/attilio/vmcontention/crypto/openssh/loginrec.c user/attilio/vmcontention/crypto/openssh/mac.c user/attilio/vmcontention/crypto/openssh/moduli user/attilio/vmcontention/crypto/openssh/moduli.5 user/attilio/vmcontention/crypto/openssh/monitor.c user/attilio/vmcontention/crypto/openssh/monitor.h user/attilio/vmcontention/crypto/openssh/monitor_wrap.c user/attilio/vmcontention/crypto/openssh/mux.c user/attilio/vmcontention/crypto/openssh/myproposal.h user/attilio/vmcontention/crypto/openssh/openbsd-compat/bsd-misc.c user/attilio/vmcontention/crypto/openssh/openbsd-compat/bsd-misc.h user/attilio/vmcontention/crypto/openssh/openbsd-compat/openbsd-compat.h user/attilio/vmcontention/crypto/openssh/openbsd-compat/openssl-compat.h user/attilio/vmcontention/crypto/openssh/openbsd-compat/sys-queue.h user/attilio/vmcontention/crypto/openssh/openbsd-compat/sys-tree.h user/attilio/vmcontention/crypto/openssh/openbsd-compat/vis.c user/attilio/vmcontention/crypto/openssh/openbsd-compat/vis.h user/attilio/vmcontention/crypto/openssh/packet.c user/attilio/vmcontention/crypto/openssh/platform.c user/attilio/vmcontention/crypto/openssh/platform.h user/attilio/vmcontention/crypto/openssh/scp.1 user/attilio/vmcontention/crypto/openssh/scp.c user/attilio/vmcontention/crypto/openssh/servconf.c user/attilio/vmcontention/crypto/openssh/servconf.h user/attilio/vmcontention/crypto/openssh/serverloop.c user/attilio/vmcontention/crypto/openssh/session.c user/attilio/vmcontention/crypto/openssh/sftp-server.8 user/attilio/vmcontention/crypto/openssh/sftp-server.c user/attilio/vmcontention/crypto/openssh/sftp.1 user/attilio/vmcontention/crypto/openssh/sftp.c user/attilio/vmcontention/crypto/openssh/ssh-add.1 user/attilio/vmcontention/crypto/openssh/ssh-add.c user/attilio/vmcontention/crypto/openssh/ssh-gss.h user/attilio/vmcontention/crypto/openssh/ssh-keygen.1 user/attilio/vmcontention/crypto/openssh/ssh-keygen.c user/attilio/vmcontention/crypto/openssh/ssh-keyscan.1 user/attilio/vmcontention/crypto/openssh/ssh.1 user/attilio/vmcontention/crypto/openssh/ssh_config user/attilio/vmcontention/crypto/openssh/ssh_config.5 user/attilio/vmcontention/crypto/openssh/ssh_namespace.h user/attilio/vmcontention/crypto/openssh/sshconnect.c user/attilio/vmcontention/crypto/openssh/sshconnect2.c user/attilio/vmcontention/crypto/openssh/sshd.8 user/attilio/vmcontention/crypto/openssh/sshd.c user/attilio/vmcontention/crypto/openssh/sshd_config user/attilio/vmcontention/crypto/openssh/sshd_config.5 user/attilio/vmcontention/crypto/openssh/uidswap.c user/attilio/vmcontention/crypto/openssh/umac.c user/attilio/vmcontention/crypto/openssh/umac.h user/attilio/vmcontention/crypto/openssh/version.h user/attilio/vmcontention/etc/rc.d/sysctl user/attilio/vmcontention/games/fortune/datfiles/freebsd-tips user/attilio/vmcontention/gnu/lib/libsupc++/Makefile user/attilio/vmcontention/lib/libarchive/Makefile user/attilio/vmcontention/lib/libarchive/config_freebsd.h user/attilio/vmcontention/lib/libarchive/test/Makefile user/attilio/vmcontention/lib/libc/sys/Makefile.inc user/attilio/vmcontention/lib/libc/sys/Symbol.map user/attilio/vmcontention/lib/libc/sys/cap_rights_limit.2 user/attilio/vmcontention/lib/libc/sys/chflags.2 user/attilio/vmcontention/lib/libc/sys/posix_openpt.2 user/attilio/vmcontention/rescue/rescue/Makefile user/attilio/vmcontention/sbin/dumpfs/dumpfs.c user/attilio/vmcontention/sbin/fsck_ffs/fsck.h user/attilio/vmcontention/sbin/fsck_ffs/fsutil.c user/attilio/vmcontention/sbin/fsck_ffs/inode.c user/attilio/vmcontention/sbin/fsck_ffs/pass1.c user/attilio/vmcontention/sbin/fsck_ffs/pass5.c user/attilio/vmcontention/sbin/fsck_ffs/setup.c user/attilio/vmcontention/sbin/fsck_ffs/suj.c user/attilio/vmcontention/sbin/ipfw/ipfw.8 user/attilio/vmcontention/sbin/newfs/mkfs.c user/attilio/vmcontention/sbin/newfs/newfs.8 user/attilio/vmcontention/sbin/newfs/newfs.c user/attilio/vmcontention/sbin/newfs/newfs.h user/attilio/vmcontention/sbin/tunefs/tunefs.8 user/attilio/vmcontention/sbin/tunefs/tunefs.c user/attilio/vmcontention/secure/lib/libssh/Makefile user/attilio/vmcontention/secure/libexec/ssh-keysign/Makefile user/attilio/vmcontention/share/examples/etc/make.conf user/attilio/vmcontention/share/man/man4/ng_nat.4 user/attilio/vmcontention/share/man/man5/make.conf.5 user/attilio/vmcontention/share/man/man9/zone.9 user/attilio/vmcontention/share/mk/bsd.libnames.mk user/attilio/vmcontention/sys/arm/broadcom/bcm2835/bcm2835_systimer.c user/attilio/vmcontention/sys/bsm/audit_kevents.h user/attilio/vmcontention/sys/cddl/compat/opensolaris/sys/cred.h user/attilio/vmcontention/sys/cddl/compat/opensolaris/sys/time.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/common/nvpair/fnvpair.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/Makefile.files user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/trim_map.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_proto.h user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_syscall.h user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_syscalls.c user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_sysent.c user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_systrace_args.c user/attilio/vmcontention/sys/compat/freebsd32/syscalls.master user/attilio/vmcontention/sys/dev/mfi/mfi_disk.c user/attilio/vmcontention/sys/dev/twa/tw_osl_cam.c user/attilio/vmcontention/sys/dev/twa/tw_osl_freebsd.c user/attilio/vmcontention/sys/dev/usb/wlan/if_rum.c user/attilio/vmcontention/sys/fs/nfsclient/nfs_clport.c user/attilio/vmcontention/sys/fs/tmpfs/tmpfs.h user/attilio/vmcontention/sys/fs/tmpfs/tmpfs_subr.c user/attilio/vmcontention/sys/fs/tmpfs/tmpfs_vnops.c user/attilio/vmcontention/sys/geom/geom_io.c user/attilio/vmcontention/sys/kern/capabilities.conf user/attilio/vmcontention/sys/kern/init_sysent.c user/attilio/vmcontention/sys/kern/kern_thread.c user/attilio/vmcontention/sys/kern/kern_umtx.c user/attilio/vmcontention/sys/kern/syscalls.c user/attilio/vmcontention/sys/kern/syscalls.master user/attilio/vmcontention/sys/kern/systrace_args.c user/attilio/vmcontention/sys/kern/tty_pts.c user/attilio/vmcontention/sys/kern/vfs_bio.c user/attilio/vmcontention/sys/kern/vfs_cache.c user/attilio/vmcontention/sys/kern/vfs_mount.c user/attilio/vmcontention/sys/kern/vfs_syscalls.c user/attilio/vmcontention/sys/net/if_arcsubr.c user/attilio/vmcontention/sys/net/if_lagg.c user/attilio/vmcontention/sys/net/if_lagg.h user/attilio/vmcontention/sys/netgraph/ng_nat.c user/attilio/vmcontention/sys/netgraph/ng_nat.h user/attilio/vmcontention/sys/netinet6/in6_proto.c user/attilio/vmcontention/sys/netinet6/nd6.c user/attilio/vmcontention/sys/sys/capability.h user/attilio/vmcontention/sys/sys/stat.h user/attilio/vmcontention/sys/sys/syscall.h user/attilio/vmcontention/sys/sys/syscall.mk user/attilio/vmcontention/sys/sys/sysproto.h user/attilio/vmcontention/sys/sys/vnode.h user/attilio/vmcontention/sys/ufs/ffs/ffs_alloc.c user/attilio/vmcontention/sys/ufs/ffs/ffs_balloc.c user/attilio/vmcontention/sys/ufs/ffs/fs.h user/attilio/vmcontention/sys/ufs/ufs/ufs_lookup.c user/attilio/vmcontention/sys/vm/vm_init.c user/attilio/vmcontention/tools/regression/pjdfstest/Makefile user/attilio/vmcontention/tools/regression/pjdfstest/pjdfstest.c user/attilio/vmcontention/tools/regression/security/cap_test/cap_test_capabilities.c user/attilio/vmcontention/tools/tools/netrate/netreceive/Makefile user/attilio/vmcontention/usr.bin/ar/Makefile user/attilio/vmcontention/usr.bin/ar/acpyacc.y user/attilio/vmcontention/usr.bin/ar/read.c user/attilio/vmcontention/usr.bin/ar/write.c user/attilio/vmcontention/usr.bin/cpio/Makefile user/attilio/vmcontention/usr.bin/cpio/test/Makefile user/attilio/vmcontention/usr.bin/tar/Makefile user/attilio/vmcontention/usr.bin/tar/test/Makefile user/attilio/vmcontention/usr.bin/unzip/unzip.c user/attilio/vmcontention/usr.sbin/bsdinstall/distextract/distextract.c Directory Properties: user/attilio/vmcontention/ (props changed) user/attilio/vmcontention/cddl/ (props changed) user/attilio/vmcontention/cddl/contrib/opensolaris/ (props changed) user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/ (props changed) user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/ (props changed) user/attilio/vmcontention/contrib/libarchive/ (props changed) user/attilio/vmcontention/contrib/libarchive/cpio/ (props changed) user/attilio/vmcontention/contrib/libarchive/libarchive/ (props changed) user/attilio/vmcontention/contrib/libarchive/tar/ (props changed) user/attilio/vmcontention/contrib/openbsm/ (props changed) user/attilio/vmcontention/crypto/openssh/ (props changed) user/attilio/vmcontention/gnu/lib/ (props changed) user/attilio/vmcontention/lib/libc/ (props changed) user/attilio/vmcontention/sbin/ (props changed) user/attilio/vmcontention/sbin/ipfw/ (props changed) user/attilio/vmcontention/share/man/man4/ (props changed) user/attilio/vmcontention/sys/ (props changed) user/attilio/vmcontention/sys/cddl/contrib/opensolaris/ (props changed) Modified: user/attilio/vmcontention/Makefile.inc1 ============================================================================== --- user/attilio/vmcontention/Makefile.inc1 Fri Mar 22 22:52:02 2013 (r248629) +++ user/attilio/vmcontention/Makefile.inc1 Fri Mar 22 22:55:37 2013 (r248630) @@ -1389,6 +1389,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 lib/libopie lib/libpam ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus \ ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ + ${_cddl_lib_libzfs_core} \ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} @@ -1417,7 +1418,9 @@ lib/libopie__L lib/libtacplus__L: lib/li .if ${MK_CDDL} != "no" _cddl_lib_libumem= cddl/lib/libumem _cddl_lib_libnvpair= cddl/lib/libnvpair +_cddl_lib_libzfs_core= cddl/lib/libzfs_core _cddl_lib= cddl/lib +cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L .endif .if ${MK_CRYPT} != "no" Modified: user/attilio/vmcontention/bin/chflags/chflags.c ============================================================================== --- user/attilio/vmcontention/bin/chflags/chflags.c Fri Mar 22 22:52:02 2013 (r248629) +++ user/attilio/vmcontention/bin/chflags/chflags.c Fri Mar 22 22:55:37 2013 (r248630) @@ -117,11 +117,7 @@ main(int argc, char *argv[]) } else fts_options = hflag ? FTS_PHYSICAL : FTS_LOGICAL; - /* XXX: Why don't chflags and lchflags have compatible prototypes? */ - if (hflag) - change_flags = (int (*)(const char *, unsigned long))lchflags; - else - change_flags = chflags; + change_flags = hflag ? lchflags : chflags; flags = *argv; if (*flags >= '0' && *flags <= '7') { Modified: user/attilio/vmcontention/bin/mv/mv.c ============================================================================== --- user/attilio/vmcontention/bin/mv/mv.c Fri Mar 22 22:52:02 2013 (r248629) +++ user/attilio/vmcontention/bin/mv/mv.c Fri Mar 22 22:55:37 2013 (r248630) @@ -337,7 +337,7 @@ err: if (unlink(to)) * on a file that we copied, i.e., that we didn't create.) */ errno = 0; - if (fchflags(to_fd, (u_long)sbp->st_flags)) + if (fchflags(to_fd, sbp->st_flags)) if (errno != EOPNOTSUPP || sbp->st_flags != 0) warn("%s: set flags (was: 0%07o)", to, sbp->st_flags); Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.c Fri Mar 22 22:52:02 2013 (r248629) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.c Fri Mar 22 22:55:37 2013 (r248630) @@ -57,6 +57,7 @@ #include <sys/arc.h> #include <sys/ddt.h> #include <sys/zfeature.h> +#include <zfs_comutil.h> #undef ZFS_MAXNAMELEN #undef verify #include <libzfs.h> @@ -206,6 +207,27 @@ dump_packed_nvlist(objset_t *os, uint64_ nvlist_free(nv); } +/* ARGSUSED */ +static void +dump_history_offsets(objset_t *os, uint64_t object, void *data, size_t size) +{ + spa_history_phys_t *shp = data; + + if (shp == NULL) + return; + + (void) printf("\t\tpool_create_len = %llu\n", + (u_longlong_t)shp->sh_pool_create_len); + (void) printf("\t\tphys_max_off = %llu\n", + (u_longlong_t)shp->sh_phys_max_off); + (void) printf("\t\tbof = %llu\n", + (u_longlong_t)shp->sh_bof); + (void) printf("\t\teof = %llu\n", + (u_longlong_t)shp->sh_eof); + (void) printf("\t\trecords_lost = %llu\n", + (u_longlong_t)shp->sh_records_lost); +} + static void zdb_nicenum(uint64_t num, char *buf) { @@ -857,21 +879,22 @@ dump_history(spa_t *spa) for (int i = 0; i < num; i++) { uint64_t time, txg, ievent; char *cmd, *intstr; + boolean_t printed = B_FALSE; if (nvlist_lookup_uint64(events[i], ZPOOL_HIST_TIME, &time) != 0) - continue; + goto next; if (nvlist_lookup_string(events[i], ZPOOL_HIST_CMD, &cmd) != 0) { if (nvlist_lookup_uint64(events[i], ZPOOL_HIST_INT_EVENT, &ievent) != 0) - continue; + goto next; verify(nvlist_lookup_uint64(events[i], ZPOOL_HIST_TXG, &txg) == 0); verify(nvlist_lookup_string(events[i], ZPOOL_HIST_INT_STR, &intstr) == 0); - if (ievent >= LOG_END) - continue; + if (ievent >= ZFS_NUM_LEGACY_HISTORY_EVENTS) + goto next; (void) snprintf(internalstr, sizeof (internalstr), @@ -884,6 +907,14 @@ dump_history(spa_t *spa) (void) localtime_r(&tsec, &t); (void) strftime(tbuf, sizeof (tbuf), "%F.%T", &t); (void) printf("%s %s\n", tbuf, cmd); + printed = B_TRUE; + +next: + if (dump_opt['h'] > 1) { + if (!printed) + (void) printf("unrecognized record:\n"); + dump_nvlist(events[i], 2); + } } } @@ -1496,7 +1527,7 @@ static object_viewer_t *object_viewer[DM dump_zap, /* other ZAP */ dump_zap, /* persistent error log */ dump_uint8, /* SPA history */ - dump_uint64, /* SPA history offsets */ + dump_history_offsets, /* SPA history offsets */ dump_zap, /* Pool properties */ dump_zap, /* DSL permissions */ dump_acl, /* ZFS ACL */ @@ -1661,7 +1692,9 @@ dump_dir(objset_t *os) int print_header = 1; int i, error; + dsl_pool_config_enter(dmu_objset_pool(os), FTAG); dmu_objset_fast_stat(os, &dds); + dsl_pool_config_exit(dmu_objset_pool(os), FTAG); if (dds.dds_type < DMU_OST_NUMTYPES) type = objset_types[dds.dds_type]; @@ -2070,7 +2103,6 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog NULL, NULL, ZIO_PRIORITY_ASYNC_READ, flags, zb)); free(data); - if (ioerr && !(flags & ZIO_FLAG_SPECULATIVE)) { zcb->zcb_haderrors = 1; zcb->zcb_errors[ioerr]++; Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Mar 22 22:52:02 2013 (r248629) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Mar 22 22:55:37 2013 (r248630) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 1, 2013 +.Dd March 21, 2013 .Dt ZFS 8 .Os .Sh NAME @@ -65,6 +65,7 @@ .Op Fl r .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ... .Ar filesystem@snapname Ns | Ns Ar volume@snapname +.Ar filesystem@snapname Ns | Ns Ar volume@snapname Ns ... .Nm .Cm rollback .Op Fl rRf @@ -1617,7 +1618,11 @@ multiple snapshots. Destroy (or mark for deferred deletion) all snapshots with this name in descendent file systems. .It Fl R -Recursively destroy all dependents. +Recursively destroy all clones of these snapshots, including the clones, +snapshots, and children. +If this flag is specified, the +.Op 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 conjunction with the @@ -1645,17 +1650,18 @@ behavior for mounted file systems in use .Op Fl r .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ... .Ar filesystem@snapname Ns | Ns volume@snapname +.Ar filesystem@snapname Ns | Ns volume@snapname Ns ... .Xc .Pp -Creates a snapshot with the given name. All previous modifications by -successful system calls to the file system are part of the snapshot. See the +Creates snapshots with the given names. All previous modifications by +successful system calls to the file system are part of the snapshots. +Snapshots are taken atomically, so that all snapshots correspond to the same +moment in time. See the .Qq Sx Snapshots section for details. .Bl -tag -width indent .It Fl r -Recursively create snapshots of all descendent datasets. Snapshots are taken -atomically, so that all recursive snapshots correspond to the same moment in -time. +Recursively create snapshots of all descendent datasets .It Fl o Ar property Ns = Ns Ar value Sets the specified property; see .Qq Nm Cm create Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Mar 22 22:52:02 2013 (r248629) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Mar 22 22:55:37 2013 (r248630) @@ -58,6 +58,7 @@ #include <time.h> #include <libzfs.h> +#include <libzfs_core.h> #include <zfs_prop.h> #include <zfs_deleg.h> #include <libuutil.h> @@ -74,6 +75,7 @@ libzfs_handle_t *g_zfs; static FILE *mnttab_file; static char history_str[HIS_MAX_RECORD_LEN]; +static boolean_t log_history = B_TRUE; static int zfs_do_clone(int argc, char **argv); static int zfs_do_create(int argc, char **argv); @@ -276,7 +278,7 @@ get_usage(zfs_help_t idx) return (gettext("\tshare <-a | filesystem>\n")); case HELP_SNAPSHOT: return (gettext("\tsnapshot [-r] [-o property=value] ... " - "<filesystem@snapname|volume@snapname>\n")); + "<filesystem@snapname|volume@snapname> ...\n")); case HELP_UNMOUNT: return (gettext("\tunmount [-f] " "<-a | filesystem|mountpoint>\n")); @@ -914,11 +916,12 @@ typedef struct destroy_cbdata { boolean_t cb_parsable; boolean_t cb_dryrun; nvlist_t *cb_nvl; + nvlist_t *cb_batchedsnaps; /* first snap in contiguous run */ - zfs_handle_t *cb_firstsnap; + char *cb_firstsnap; /* previous snap in contiguous run */ - zfs_handle_t *cb_prevsnap; + char *cb_prevsnap; int64_t cb_snapused; char *cb_snapspec; } destroy_cbdata_t; @@ -1010,9 +1013,27 @@ destroy_callback(zfs_handle_t *zhp, void zfs_close(zhp); return (0); } + if (cb->cb_dryrun) { + zfs_close(zhp); + return (0); + } + + /* + * We batch up all contiguous snapshots (even of different + * filesystems) and destroy them with one ioctl. We can't + * simply do all snap deletions and then all fs deletions, + * because we must delete a clone before its origin. + */ + if (zfs_get_type(zhp) == ZFS_TYPE_SNAPSHOT) { + fnvlist_add_boolean(cb->cb_batchedsnaps, name); + } else { + int error = zfs_destroy_snaps_nvl(g_zfs, + cb->cb_batchedsnaps, B_FALSE); + fnvlist_free(cb->cb_batchedsnaps); + cb->cb_batchedsnaps = fnvlist_alloc(); - if (!cb->cb_dryrun) { - if (zfs_unmount(zhp, NULL, cb->cb_force ? MS_FORCE : 0) != 0 || + if (error != 0 || + zfs_unmount(zhp, NULL, cb->cb_force ? MS_FORCE : 0) != 0 || zfs_destroy(zhp, cb->cb_defer_destroy) != 0) { zfs_close(zhp); return (-1); @@ -1032,11 +1053,13 @@ destroy_print_cb(zfs_handle_t *zhp, void if (nvlist_exists(cb->cb_nvl, name)) { if (cb->cb_firstsnap == NULL) - cb->cb_firstsnap = zfs_handle_dup(zhp); + cb->cb_firstsnap = strdup(name); if (cb->cb_prevsnap != NULL) - zfs_close(cb->cb_prevsnap); + free(cb->cb_prevsnap); /* this snap continues the current range */ - cb->cb_prevsnap = zfs_handle_dup(zhp); + cb->cb_prevsnap = strdup(name); + if (cb->cb_firstsnap == NULL || cb->cb_prevsnap == NULL) + nomem(); if (cb->cb_verbose) { if (cb->cb_parsable) { (void) printf("destroy\t%s\n", name); @@ -1051,12 +1074,12 @@ destroy_print_cb(zfs_handle_t *zhp, void } else if (cb->cb_firstsnap != NULL) { /* end of this range */ uint64_t used = 0; - err = zfs_get_snapused_int(cb->cb_firstsnap, + err = lzc_snaprange_space(cb->cb_firstsnap, cb->cb_prevsnap, &used); cb->cb_snapused += used; - zfs_close(cb->cb_firstsnap); + free(cb->cb_firstsnap); cb->cb_firstsnap = NULL; - zfs_close(cb->cb_prevsnap); + free(cb->cb_prevsnap); cb->cb_prevsnap = NULL; } zfs_close(zhp); @@ -1073,13 +1096,13 @@ destroy_print_snapshots(zfs_handle_t *fs if (cb->cb_firstsnap != NULL) { uint64_t used = 0; if (err == 0) { - err = zfs_get_snapused_int(cb->cb_firstsnap, + err = lzc_snaprange_space(cb->cb_firstsnap, cb->cb_prevsnap, &used); } cb->cb_snapused += used; - zfs_close(cb->cb_firstsnap); + free(cb->cb_firstsnap); cb->cb_firstsnap = NULL; - zfs_close(cb->cb_prevsnap); + free(cb->cb_prevsnap); cb->cb_prevsnap = NULL; } return (err); @@ -1166,8 +1189,10 @@ static int zfs_do_destroy(int argc, char **argv) { destroy_cbdata_t cb = { 0 }; + int rv = 0; + int err = 0; int c; - zfs_handle_t *zhp; + zfs_handle_t *zhp = NULL; char *at; zfs_type_t type = ZFS_TYPE_DATASET; @@ -1221,11 +1246,9 @@ zfs_do_destroy(int argc, char **argv) at = strchr(argv[0], '@'); if (at != NULL) { - int err = 0; /* Build the list of snaps to destroy in cb_nvl. */ - if (nvlist_alloc(&cb.cb_nvl, NV_UNIQUE_NAME, 0) != 0) - nomem(); + cb.cb_nvl = fnvlist_alloc(); *at = '\0'; zhp = zfs_open(g_zfs, argv[0], @@ -1236,17 +1259,15 @@ zfs_do_destroy(int argc, char **argv) cb.cb_snapspec = at + 1; if (gather_snapshots(zfs_handle_dup(zhp), &cb) != 0 || cb.cb_error) { - zfs_close(zhp); - nvlist_free(cb.cb_nvl); - return (1); + rv = 1; + goto out; } if (nvlist_empty(cb.cb_nvl)) { (void) fprintf(stderr, gettext("could not find any " "snapshots to destroy; check snapshot names.\n")); - zfs_close(zhp); - nvlist_free(cb.cb_nvl); - return (1); + rv = 1; + goto out; } if (cb.cb_verbose) { @@ -1265,18 +1286,26 @@ zfs_do_destroy(int argc, char **argv) } if (!cb.cb_dryrun) { - if (cb.cb_doclones) + if (cb.cb_doclones) { + cb.cb_batchedsnaps = fnvlist_alloc(); err = destroy_clones(&cb); + if (err == 0) { + err = zfs_destroy_snaps_nvl(g_zfs, + cb.cb_batchedsnaps, B_FALSE); + } + if (err != 0) { + rv = 1; + goto out; + } + } if (err == 0) { - err = zfs_destroy_snaps_nvl(zhp, cb.cb_nvl, + err = zfs_destroy_snaps_nvl(g_zfs, cb.cb_nvl, cb.cb_defer_destroy); } } - zfs_close(zhp); - nvlist_free(cb.cb_nvl); if (err != 0) - return (1); + rv = 1; } else { /* Open the given dataset */ if ((zhp = zfs_open(g_zfs, argv[0], type)) == NULL) @@ -1297,8 +1326,8 @@ zfs_do_destroy(int argc, char **argv) zfs_get_name(zhp)); (void) fprintf(stderr, gettext("use 'zpool destroy %s' " "to destroy the pool itself\n"), zfs_get_name(zhp)); - zfs_close(zhp); - return (1); + rv = 1; + goto out; } /* @@ -1308,30 +1337,42 @@ zfs_do_destroy(int argc, char **argv) if (!cb.cb_doclones && zfs_iter_dependents(zhp, B_TRUE, destroy_check_dependent, &cb) != 0) { - zfs_close(zhp); - return (1); + rv = 1; + goto out; } if (cb.cb_error) { - zfs_close(zhp); - return (1); + rv = 1; + goto out; } + cb.cb_batchedsnaps = fnvlist_alloc(); if (zfs_iter_dependents(zhp, B_FALSE, destroy_callback, &cb) != 0) { - zfs_close(zhp); - return (1); + rv = 1; + goto out; } /* * Do the real thing. The callback will close the * handle regardless of whether it succeeds or not. */ - if (destroy_callback(zhp, &cb) != 0) - return (1); + err = destroy_callback(zhp, &cb); + zhp = NULL; + if (err == 0) { + err = zfs_destroy_snaps_nvl(g_zfs, + cb.cb_batchedsnaps, cb.cb_defer_destroy); + } + if (err != 0) + rv = 1; } - return (0); +out: + fnvlist_free(cb.cb_batchedsnaps); + fnvlist_free(cb.cb_nvl); + if (zhp != NULL) + zfs_close(zhp); + return (rv); } static boolean_t @@ -1932,9 +1973,11 @@ upgrade_set_callback(zfs_handle_t *zhp, /* * If they did "zfs upgrade -a", then we could * be doing ioctls to different pools. We need - * to log this history once to each pool. + * to log this history once to each pool, and bypass + * the normal history logging that happens in main(). */ - verify(zpool_stage_history(g_zfs, history_str) == 0); + (void) zpool_log_history(g_zfs, history_str); + log_history = B_FALSE; } if (zfs_prop_set(zhp, "version", verstr) == 0) cb->cb_numupgraded++; @@ -3472,6 +3515,32 @@ zfs_do_set(int argc, char **argv) return (ret); } +typedef struct snap_cbdata { + nvlist_t *sd_nvl; + boolean_t sd_recursive; + const char *sd_snapname; +} snap_cbdata_t; + +static int +zfs_snapshot_cb(zfs_handle_t *zhp, void *arg) +{ + snap_cbdata_t *sd = arg; + char *name; + int rv = 0; + int error; + + error = asprintf(&name, "%s@%s", zfs_get_name(zhp), sd->sd_snapname); + if (error == -1) + nomem(); + fnvlist_add_boolean(sd->sd_nvl, name); + free(name); + + if (sd->sd_recursive) + rv = zfs_iter_filesystems(zhp, zfs_snapshot_cb, sd); + zfs_close(zhp); + return (rv); +} + /* * zfs snapshot [-r] [-o prop=value] ... <fs@snap> * @@ -3481,13 +3550,16 @@ zfs_do_set(int argc, char **argv) static int zfs_do_snapshot(int argc, char **argv) { - boolean_t recursive = B_FALSE; int ret = 0; char c; nvlist_t *props; + snap_cbdata_t sd = { 0 }; + boolean_t multiple_snaps = B_FALSE; if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0) nomem(); + if (nvlist_alloc(&sd.sd_nvl, NV_UNIQUE_NAME, 0) != 0) + nomem(); /* check options */ while ((c = getopt(argc, argv, "ro:")) != -1) { @@ -3497,7 +3569,8 @@ zfs_do_snapshot(int argc, char **argv) return (1); break; case 'r': - recursive = B_TRUE; + sd.sd_recursive = B_TRUE; + multiple_snaps = B_TRUE; break; case '?': (void) fprintf(stderr, gettext("invalid option '%c'\n"), @@ -3514,18 +3587,35 @@ zfs_do_snapshot(int argc, char **argv) (void) fprintf(stderr, gettext("missing snapshot argument\n")); goto usage; } - if (argc > 1) { - (void) fprintf(stderr, gettext("too many arguments\n")); - goto usage; + + if (argc > 1) + multiple_snaps = B_TRUE; + for (; argc > 0; argc--, argv++) { + char *atp; + zfs_handle_t *zhp; + + atp = strchr(argv[0], '@'); + if (atp == NULL) + goto usage; + *atp = '\0'; + sd.sd_snapname = atp + 1; + zhp = zfs_open(g_zfs, argv[0], + ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME); + if (zhp == NULL) + goto usage; + if (zfs_snapshot_cb(zhp, &sd) != 0) + goto usage; } - ret = zfs_snapshot(g_zfs, argv[0], recursive, props); + ret = zfs_snapshot_nvl(g_zfs, sd.sd_nvl, props); + nvlist_free(sd.sd_nvl); nvlist_free(props); - if (ret && recursive) + if (ret != 0 && multiple_snaps) (void) fprintf(stderr, gettext("no snapshots were created\n")); return (ret != 0); usage: + nvlist_free(sd.sd_nvl); nvlist_free(props); usage(B_FALSE); return (-1); @@ -5068,28 +5158,12 @@ cleanup2: return (error); } -/* - * zfs allow [-r] [-t] <tag> <snap> ... - * - * -r Recursively hold - * -t Temporary hold (hidden option) - * - * Apply a user-hold with the given tag to the list of snapshots. - */ static int zfs_do_allow(int argc, char **argv) { return (zfs_do_allow_unallow_impl(argc, argv, B_FALSE)); } -/* - * zfs unallow [-r] [-t] <tag> <snap> ... - * - * -r Recursively hold - * -t Temporary hold (hidden option) - * - * Apply a user-hold with the given tag to the list of snapshots. - */ static int zfs_do_unallow(int argc, char **argv) { @@ -5103,7 +5177,6 @@ zfs_do_hold_rele_impl(int argc, char **a int i; const char *tag; boolean_t recursive = B_FALSE; - boolean_t temphold = B_FALSE; const char *opts = holding ? "rt" : "r"; int c; @@ -5113,9 +5186,6 @@ zfs_do_hold_rele_impl(int argc, char **a case 'r': recursive = B_TRUE; break; - case 't': - temphold = B_TRUE; - break; case '?': (void) fprintf(stderr, gettext("invalid option '%c'\n"), optopt); @@ -5164,7 +5234,7 @@ zfs_do_hold_rele_impl(int argc, char **a } if (holding) { if (zfs_hold(zhp, delim+1, tag, recursive, - temphold, B_FALSE, -1, 0, 0) != 0) + B_FALSE, -1) != 0) ++errors; } else { if (zfs_release(zhp, delim+1, tag, recursive) != 0) @@ -5180,7 +5250,6 @@ zfs_do_hold_rele_impl(int argc, char **a * zfs hold [-r] [-t] <tag> <snap> ... * * -r Recursively hold - * -t Temporary hold (hidden option) * * Apply a user-hold with the given tag to the list of snapshots. */ @@ -6602,8 +6671,7 @@ main(int argc, char **argv) return (1); } - zpool_set_history_str("zfs", argc, argv, history_str); - verify(zpool_stage_history(g_zfs, history_str) == 0); + zfs_save_arguments(argc, argv, history_str, sizeof (history_str)); libzfs_print_on_error(g_zfs, B_TRUE); @@ -6672,6 +6740,9 @@ main(int argc, char **argv) (void) fclose(mnttab_file); + if (ret == 0 && log_history) + (void) zpool_log_history(g_zfs, history_str); + libzfs_fini(g_zfs); /* Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zhack/zhack.c ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zhack/zhack.c Fri Mar 22 22:52:02 2013 (r248629) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zhack/zhack.c Fri Mar 22 22:55:37 2013 (r248630) @@ -46,6 +46,7 @@ #include <sys/zio_checksum.h> #include <sys/zio_compress.h> #include <sys/zfeature.h> +#include <sys/dmu_tx.h> #undef ZFS_MAXNAMELEN #undef verify #include <libzfs.h> @@ -273,12 +274,15 @@ zhack_do_feature_stat(int argc, char **a } static void -feature_enable_sync(void *arg1, void *arg2, dmu_tx_t *tx) +feature_enable_sync(void *arg, dmu_tx_t *tx) { - spa_t *spa = arg1; - zfeature_info_t *feature = arg2; + spa_t *spa = dmu_tx_pool(tx)->dp_spa; + zfeature_info_t *feature = arg; spa_feature_enable(spa, feature, tx); + spa_history_log_internal(spa, "zhack enable feature", tx, + "name=%s can_readonly=%u", + feature->fi_guid, feature->fi_can_readonly); } static void @@ -341,8 +345,8 @@ zhack_do_feature_enable(int argc, char * if (0 == zap_contains(mos, spa->spa_feat_desc_obj, feature.fi_guid)) fatal("feature already enabled: %s", feature.fi_guid); - VERIFY3U(0, ==, dsl_sync_task_do(spa->spa_dsl_pool, NULL, - feature_enable_sync, spa, &feature, 5)); + VERIFY0(dsl_sync_task(spa_name(spa), NULL, + feature_enable_sync, &feature, 5)); spa_close(spa, FTAG); @@ -350,21 +354,25 @@ zhack_do_feature_enable(int argc, char * } static void -feature_incr_sync(void *arg1, void *arg2, dmu_tx_t *tx) +feature_incr_sync(void *arg, dmu_tx_t *tx) { - spa_t *spa = arg1; - zfeature_info_t *feature = arg2; + spa_t *spa = dmu_tx_pool(tx)->dp_spa; + zfeature_info_t *feature = arg; spa_feature_incr(spa, feature, tx); + spa_history_log_internal(spa, "zhack feature incr", tx, + "name=%s", feature->fi_guid); } static void -feature_decr_sync(void *arg1, void *arg2, dmu_tx_t *tx) +feature_decr_sync(void *arg, dmu_tx_t *tx) { - spa_t *spa = arg1; - zfeature_info_t *feature = arg2; + spa_t *spa = dmu_tx_pool(tx)->dp_spa; + zfeature_info_t *feature = arg; spa_feature_decr(spa, feature, tx); + spa_history_log_internal(spa, "zhack feature decr", tx, + "name=%s", feature->fi_guid); } static void @@ -435,8 +443,8 @@ zhack_do_feature_ref(int argc, char **ar if (decr && !spa_feature_is_active(spa, &feature)) fatal("feature refcount already 0: %s", feature.fi_guid); - VERIFY3U(0, ==, dsl_sync_task_do(spa->spa_dsl_pool, NULL, - decr ? feature_decr_sync : feature_incr_sync, spa, &feature, 5)); + VERIFY0(dsl_sync_task(spa_name(spa), NULL, + decr ? feature_decr_sync : feature_incr_sync, &feature, 5)); spa_close(spa, FTAG); } Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Fri Mar 22 22:52:02 2013 (r248629) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Fri Mar 22 22:55:37 2013 (r248630) @@ -192,9 +192,9 @@ static zpool_command_t command_table[] = #define NCOMMAND (sizeof (command_table) / sizeof (command_table[0])) -zpool_command_t *current_command; +static zpool_command_t *current_command; static char history_str[HIS_MAX_RECORD_LEN]; - +static boolean_t log_history = B_TRUE; static uint_t timestamp_fmt = NODATE; static const char * @@ -1093,7 +1093,10 @@ zpool_do_destroy(int argc, char **argv) return (1); } - ret = (zpool_destroy(zhp) != 0); + /* The history must be logged as part of the export */ + log_history = B_FALSE; + + ret = (zpool_destroy(zhp, history_str) != 0); zpool_close(zhp); @@ -1157,10 +1160,13 @@ zpool_do_export(int argc, char **argv) continue; } + /* The history must be logged as part of the export */ + log_history = B_FALSE; + if (hardforce) { - if (zpool_export_force(zhp) != 0) + if (zpool_export_force(zhp, history_str) != 0) ret = 1; - } else if (zpool_export(zhp, force) != 0) { + } else if (zpool_export(zhp, force, history_str) != 0) { ret = 1; } @@ -4563,6 +4569,14 @@ upgrade_cb(zpool_handle_t *zhp, void *ar if (count > 0) { cbp->cb_first = B_FALSE; printnl = B_TRUE; + /* + * If they did "zpool upgrade -a", then we could + * be doing ioctls to different pools. We need + * to log this history once to each pool, and bypass + * the normal history logging that happens in main(). + */ + (void) zpool_log_history(g_zfs, history_str); + log_history = B_FALSE; } } @@ -4924,8 +4938,8 @@ zpool_do_upgrade(int argc, char **argv) typedef struct hist_cbdata { boolean_t first; - int longfmt; - int internal; + boolean_t longfmt; + boolean_t internal; } hist_cbdata_t; /* @@ -4937,21 +4951,8 @@ get_history_one(zpool_handle_t *zhp, voi nvlist_t *nvhis; nvlist_t **records; uint_t numrecords; - char *cmdstr; - char *pathstr; - uint64_t dst_time; - time_t tsec; - struct tm t; - char tbuf[30]; int ret, i; - uint64_t who; - struct passwd *pwd; - char *hostname; - char *zonename; - char internalstr[MAXPATHLEN]; hist_cbdata_t *cb = (hist_cbdata_t *)data; - uint64_t txg; - uint64_t ievent; cb->first = B_FALSE; @@ -4963,64 +4964,94 @@ get_history_one(zpool_handle_t *zhp, voi verify(nvlist_lookup_nvlist_array(nvhis, ZPOOL_HIST_RECORD, &records, &numrecords) == 0); for (i = 0; i < numrecords; i++) { - if (nvlist_lookup_uint64(records[i], ZPOOL_HIST_TIME, - &dst_time) != 0) - continue; + nvlist_t *rec = records[i]; + char tbuf[30] = ""; - /* is it an internal event or a standard event? */ - if (nvlist_lookup_string(records[i], ZPOOL_HIST_CMD, - &cmdstr) != 0) { - if (cb->internal == 0) + if (nvlist_exists(rec, ZPOOL_HIST_TIME)) { + time_t tsec; + struct tm t; + + tsec = fnvlist_lookup_uint64(records[i], + ZPOOL_HIST_TIME); + (void) localtime_r(&tsec, &t); + (void) strftime(tbuf, sizeof (tbuf), "%F.%T", &t); + } + + if (nvlist_exists(rec, ZPOOL_HIST_CMD)) { + (void) printf("%s %s", tbuf, + fnvlist_lookup_string(rec, ZPOOL_HIST_CMD)); + } else if (nvlist_exists(rec, ZPOOL_HIST_INT_EVENT)) { + int ievent = + fnvlist_lookup_uint64(rec, ZPOOL_HIST_INT_EVENT); + if (!cb->internal) continue; - - if (nvlist_lookup_uint64(records[i], - ZPOOL_HIST_INT_EVENT, &ievent) != 0) + if (ievent >= ZFS_NUM_LEGACY_HISTORY_EVENTS) { + (void) printf("%s unrecognized record:\n", + tbuf); + dump_nvlist(rec, 4); + continue; + } + (void) printf("%s [internal %s txg:%lld] %s", tbuf, + zfs_history_event_names[ievent], + fnvlist_lookup_uint64(rec, ZPOOL_HIST_TXG), + fnvlist_lookup_string(rec, ZPOOL_HIST_INT_STR)); + } else if (nvlist_exists(rec, ZPOOL_HIST_INT_NAME)) { + if (!cb->internal) continue; - verify(nvlist_lookup_uint64(records[i], - ZPOOL_HIST_TXG, &txg) == 0); - verify(nvlist_lookup_string(records[i], - ZPOOL_HIST_INT_STR, &pathstr) == 0); - if (ievent >= LOG_END) + (void) printf("%s [txg:%lld] %s", tbuf, + fnvlist_lookup_uint64(rec, ZPOOL_HIST_TXG), + fnvlist_lookup_string(rec, ZPOOL_HIST_INT_NAME)); + if (nvlist_exists(rec, ZPOOL_HIST_DSNAME)) { + (void) printf(" %s (%llu)", + fnvlist_lookup_string(rec, + ZPOOL_HIST_DSNAME), + fnvlist_lookup_uint64(rec, + ZPOOL_HIST_DSID)); + } + (void) printf(" %s", fnvlist_lookup_string(rec, + ZPOOL_HIST_INT_STR)); + } else if (nvlist_exists(rec, ZPOOL_HIST_IOCTL)) { + if (!cb->internal) continue; - (void) snprintf(internalstr, - sizeof (internalstr), - "[internal %s txg:%lld] %s", - zfs_history_event_names[ievent], txg, - pathstr); - cmdstr = internalstr; - } - tsec = dst_time; - (void) localtime_r(&tsec, &t); - (void) strftime(tbuf, sizeof (tbuf), "%F.%T", &t); - (void) printf("%s %s", tbuf, cmdstr); + (void) printf("%s ioctl %s\n", tbuf, + fnvlist_lookup_string(rec, ZPOOL_HIST_IOCTL)); + if (nvlist_exists(rec, ZPOOL_HIST_INPUT_NVL)) { + (void) printf(" input:\n"); + dump_nvlist(fnvlist_lookup_nvlist(rec, + ZPOOL_HIST_INPUT_NVL), 8); + } + if (nvlist_exists(rec, ZPOOL_HIST_OUTPUT_NVL)) { + (void) printf(" output:\n"); + dump_nvlist(fnvlist_lookup_nvlist(rec, + ZPOOL_HIST_OUTPUT_NVL), 8); + } + } else { + if (!cb->internal) + continue; + (void) printf("%s unrecognized record:\n", tbuf); + dump_nvlist(rec, 4); + } if (!cb->longfmt) { (void) printf("\n"); continue; } (void) printf(" ["); - if (nvlist_lookup_uint64(records[i], - ZPOOL_HIST_WHO, &who) == 0) { - pwd = getpwuid((uid_t)who); - if (pwd) - (void) printf("user %s on", - pwd->pw_name); - else - (void) printf("user %d on", - (int)who); - } else { - (void) printf(gettext("no info]\n")); - continue; + if (nvlist_exists(rec, ZPOOL_HIST_WHO)) { + uid_t who = fnvlist_lookup_uint64(rec, ZPOOL_HIST_WHO); + struct passwd *pwd = getpwuid(who); + (void) printf("user %d ", (int)who); + if (pwd != NULL) + (void) printf("(%s) ", pwd->pw_name); + } + if (nvlist_exists(rec, ZPOOL_HIST_HOST)) { + (void) printf("on %s", + fnvlist_lookup_string(rec, ZPOOL_HIST_HOST)); + } + if (nvlist_exists(rec, ZPOOL_HIST_ZONE)) { + (void) printf(":%s", + fnvlist_lookup_string(rec, ZPOOL_HIST_ZONE)); } - if (nvlist_lookup_string(records[i], - ZPOOL_HIST_HOST, &hostname) == 0) { - (void) printf(" %s", hostname); - } - if (nvlist_lookup_string(records[i], - ZPOOL_HIST_ZONE, &zonename) == 0) { - (void) printf(":%s", zonename); - } - (void) printf("]"); (void) printf("\n"); } @@ -5035,8 +5066,6 @@ get_history_one(zpool_handle_t *zhp, voi * * Displays the history of commands that modified pools. */ - - int zpool_do_history(int argc, char **argv) { @@ -5049,10 +5078,10 @@ zpool_do_history(int argc, char **argv) while ((c = getopt(argc, argv, "li")) != -1) { switch (c) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303222255.r2MMtbU1068309>