From 42f7b73b90d5fd0cc4900edaeb1d1c120d364220 Mon Sep 17 00:00:00 2001 From: Aron Xu Date: Wed, 16 May 2018 21:38:18 +0800 Subject: [PATCH] New upstream version 0.7.9 --- META | 2 +- Makefile.am | 10 +- Makefile.in | 47 +- README.markdown | 12 +- aclocal.m4 | 12 +- cmd/Makefile.in | 25 +- cmd/arc_summary/Makefile.in | 25 +- cmd/arcstat/Makefile.in | 25 +- cmd/arcstat/arcstat.py | 4 +- cmd/dbufstat/Makefile.in | 25 +- cmd/dbufstat/dbufstat.py | 4 +- cmd/fsck_zfs/Makefile.in | 25 +- cmd/mount_zfs/Makefile.in | 29 +- cmd/raidz_test/Makefile.in | 32 +- cmd/vdev_id/Makefile.in | 25 +- cmd/zdb/Makefile.in | 30 +- cmd/zdb/zdb.c | 94 +- cmd/zed/Makefile.am | 6 +- cmd/zed/Makefile.in | 35 +- cmd/zed/zed.d/all-debug.sh | 2 + cmd/zed/zed.d/all-syslog.sh | 2 + cmd/zed/zed.d/resilver_finish-start-scrub.sh | 17 + cmd/zed/zed.d/zed-functions.sh | 20 + cmd/zed/zed.d/zed.rc | 14 + cmd/zed/zed_conf.c | 7 +- cmd/zed/zed_conf.h | 1 + cmd/zed/zed_event.c | 34 +- cmd/zfs/Makefile.in | 29 +- cmd/zfs/zfs_main.c | 2 +- cmd/zgenhostid/Makefile.in | 25 +- cmd/zhack/Makefile.in | 29 +- cmd/zinject/Makefile.in | 29 +- cmd/zpios/Makefile.in | 29 +- cmd/zpios/zpios_main.c | 9 +- cmd/zpool/Makefile.am | 16 +- cmd/zpool/Makefile.in | 45 +- cmd/zpool/zpool.d/ata_err | 149 +- cmd/zpool/zpool.d/cmd_to | 149 +- cmd/zpool/zpool.d/defect | 149 +- cmd/zpool/zpool.d/health | 149 +- cmd/zpool/zpool.d/hours_on | 149 +- cmd/zpool/zpool.d/nonmed | 149 +- cmd/zpool/zpool.d/nvme_err | 242 + cmd/zpool/zpool.d/off_ucor | 149 +- cmd/zpool/zpool.d/pend_sec | 149 +- cmd/zpool/zpool.d/pwr_cyc | 149 +- cmd/zpool/zpool.d/r_proc | 149 +- cmd/zpool/zpool.d/r_ucor | 149 +- cmd/zpool/zpool.d/realloc | 149 +- cmd/zpool/zpool.d/rep_ucor | 149 +- cmd/zpool/zpool.d/serial | 149 +- cmd/zpool/zpool.d/smart | 149 +- cmd/zpool/zpool.d/smart_test | 242 + cmd/zpool/zpool.d/smartx | 149 +- cmd/zpool/zpool.d/temp | 149 +- cmd/zpool/zpool.d/test_ended | 242 + cmd/zpool/zpool.d/test_progress | 242 + cmd/zpool/zpool.d/test_status | 242 + cmd/zpool/zpool.d/test_type | 242 + cmd/zpool/zpool.d/w_proc | 149 +- cmd/zpool/zpool.d/w_ucor | 149 +- cmd/zpool/zpool_main.c | 9 + cmd/zstreamdump/Makefile.in | 29 +- cmd/ztest/Makefile.in | 33 +- cmd/zvol_id/Makefile.in | 30 +- cmd/zvol_id/zvol_id_main.c | 15 +- config/Rules.am | 2 + config/ax_code_coverage.m4 | 264 + config/deb.am | 8 +- config/kernel-acl-refcount.m4 | 20 + config/kernel-acl.m4 | 1 + config/kernel-blk-queue-flags.m4 | 38 + config/kernel-create-nameidata.m4 | 1 + config/kernel-dentry-operations.m4 | 1 + config/kernel-fst-mount.m4 | 28 + config/kernel-get-disk-and-module.m4 | 19 + config/kernel-get-link.m4 | 2 +- config/kernel-global_page_state.m4 | 109 + config/kernel-inode-set-iversion.m4 | 19 + config/kernel-lookup-nameidata.m4 | 1 + config/kernel-mount-nodev.m4 | 20 - config/kernel-userns-capabilities.m4 | 67 + config/kernel-vfs-iterate.m4 | 21 +- config/kernel-vm_node_stat.m4 | 22 - config/kernel.m4 | 12 +- config/tgz.am | 4 +- config/user-libaio.m4 | 14 + config/user-libattr.m4 | 12 - config/user-libblkid.m4 | 2 +- config/user-systemd.m4 | 20 +- config/user.m4 | 2 +- config/zfs-build.m4 | 117 +- configure | 16896 +++++++++------- configure.ac | 5 + contrib/Makefile.in | 25 +- contrib/bash_completion.d/Makefile.in | 25 +- .../dracut/02zfsexpandknowledge/Makefile.in | 25 +- contrib/dracut/90zfs/Makefile.in | 25 +- contrib/dracut/90zfs/mount-zfs.sh.in | 1 + contrib/dracut/Makefile.in | 25 +- contrib/initramfs/Makefile.am | 6 +- contrib/initramfs/Makefile.in | 32 +- contrib/initramfs/conf.d/zfs | 8 + contrib/initramfs/scripts/zfs | 2 +- etc/Makefile.in | 25 +- etc/init.d/Makefile.in | 25 +- etc/init.d/zfs-import.in | 0 etc/init.d/zfs-mount.in | 0 etc/init.d/zfs-share.in | 0 etc/init.d/zfs-zed.in | 0 etc/modules-load.d/Makefile.in | 25 +- etc/sudoers.d/Makefile.in | 25 +- etc/systemd/Makefile.in | 25 +- etc/systemd/system/Makefile.in | 25 +- .../system/zfs-import-cache.service.in | 2 +- etc/systemd/system/zfs-import-scan.service.in | 2 +- etc/zfs/Makefile.in | 25 +- include/Makefile.in | 25 +- include/libzfs.h | 1 + include/linux/Makefile.am | 3 +- include/linux/Makefile.in | 31 +- include/linux/blkdev_compat.h | 34 +- include/linux/page_compat.h | 78 + include/linux/vfs_compat.h | 50 +- include/sys/Makefile.in | 25 +- include/sys/crypto/Makefile.in | 25 +- include/sys/fm/Makefile.in | 25 +- include/sys/fm/fs/Makefile.in | 25 +- include/sys/fs/Makefile.in | 25 +- include/sys/fs/zfs.h | 1 + include/sys/mmp.h | 2 + include/sys/spa.h | 8 +- include/sys/spa_impl.h | 3 +- include/sys/sysevent/Makefile.in | 25 +- include/sys/trace_acl.h | 6 +- include/sys/vdev_impl.h | 3 +- include/sys/zfs_ratelimit.h | 12 +- include/sys/zfs_vnops.h | 2 +- include/sys/zio.h | 19 +- include/sys/zpl.h | 27 +- lib/Makefile.in | 25 +- lib/libavl/Makefile.in | 31 +- lib/libefi/Makefile.in | 31 +- lib/libefi/rdwr_efi.c | 14 + lib/libicp/Makefile.in | 31 +- lib/libnvpair/Makefile.in | 31 +- lib/libshare/Makefile.in | 29 +- lib/libspl/Makefile.in | 31 +- lib/libspl/asm-generic/Makefile.in | 29 +- lib/libspl/asm-i386/Makefile.in | 25 +- lib/libspl/asm-x86_64/Makefile.in | 25 +- lib/libspl/include/Makefile.in | 25 +- lib/libspl/include/ia32/Makefile.in | 25 +- lib/libspl/include/ia32/sys/Makefile.in | 25 +- lib/libspl/include/rpc/Makefile.in | 25 +- lib/libspl/include/sys/Makefile.in | 25 +- lib/libspl/include/sys/dktp/Makefile.in | 25 +- lib/libspl/include/sys/time.h | 6 +- lib/libspl/include/umem.h | 2 +- lib/libspl/include/util/Makefile.in | 25 +- lib/libunicode/Makefile.in | 31 +- lib/libuutil/Makefile.in | 31 +- lib/libzfs/Makefile.in | 29 +- lib/libzfs/libzfs.pc | 2 +- lib/libzfs/libzfs_core.pc | 2 +- lib/libzfs/libzfs_dataset.c | 14 +- lib/libzfs/libzfs_import.c | 15 +- lib/libzfs/libzfs_sendrecv.c | 20 +- lib/libzfs/libzfs_status.c | 8 +- lib/libzfs_core/Makefile.in | 29 +- lib/libzpool/Makefile.in | 31 +- man/Makefile.in | 25 +- man/man1/Makefile.in | 25 +- man/man5/Makefile.in | 25 +- man/man5/zfs-module-parameters.5 | 89 +- man/man8/Makefile.in | 25 +- man/man8/zdb.8 | 4 +- man/man8/zed.8.in | 10 +- man/man8/zinject.8 | 3 + man/man8/zpool.8 | 45 +- module/zcommon/zfs_comutil.c | 4 +- module/zfs/arc.c | 29 +- module/zfs/dmu_send.c | 16 +- module/zfs/dmu_traverse.c | 29 +- module/zfs/mmp.c | 263 +- module/zfs/policy.c | 66 +- module/zfs/qat_compress.c | 4 - module/zfs/spa.c | 25 +- module/zfs/spa_config.c | 34 +- module/zfs/spa_misc.c | 2 +- module/zfs/spa_stats.c | 137 +- module/zfs/vdev.c | 39 +- module/zfs/vdev_label.c | 1 - module/zfs/zfs_acl.c | 2 +- module/zfs/zfs_vnops.c | 6 +- module/zfs/zil.c | 3 +- module/zfs/zio.c | 57 +- module/zfs/zle.c | 4 + module/zfs/zpl_ctldir.c | 37 +- module/zfs/zpl_file.c | 9 +- module/zfs/zpl_super.c | 67 +- module/zfs/zvol.c | 10 +- module/zpios/pios.c | 9 +- rpm/Makefile.in | 25 +- rpm/generic/Makefile.in | 25 +- rpm/generic/zfs-kmod.spec.in | 9 + rpm/generic/zfs.spec.in | 46 +- rpm/redhat/Makefile.in | 25 +- rpm/redhat/zfs.spec.in | 46 +- scripts/Makefile.am | 2 + scripts/Makefile.in | 26 +- scripts/enum-extract.pl | 58 + scripts/zpios-profile/Makefile.in | 25 +- scripts/zpios-test/Makefile.in | 25 +- scripts/zpool-config/Makefile.in | 25 +- tests/Makefile.in | 25 +- tests/runfiles/Makefile.am | 2 +- tests/runfiles/Makefile.in | 109 +- tests/runfiles/linux.run | 18 +- tests/test-runner/Makefile.in | 25 +- tests/test-runner/cmd/Makefile.in | 25 +- tests/test-runner/include/Makefile.am | 3 +- tests/test-runner/include/Makefile.in | 109 +- tests/test-runner/include/logapi.shlib | 1 - tests/test-runner/man/Makefile.in | 25 +- tests/zfs-tests/Makefile.in | 25 +- tests/zfs-tests/callbacks/Makefile.in | 25 +- tests/zfs-tests/cmd/Makefile.am | 2 + tests/zfs-tests/cmd/Makefile.in | 27 +- tests/zfs-tests/cmd/chg_usr_exec/Makefile.in | 29 +- tests/zfs-tests/cmd/devname2devid/Makefile.in | 29 +- .../cmd/devname2devid/devname2devid.c | 3 +- tests/zfs-tests/cmd/dir_rd_update/Makefile.in | 29 +- tests/zfs-tests/cmd/file_check/Makefile.in | 29 +- tests/zfs-tests/cmd/file_trunc/Makefile.in | 29 +- tests/zfs-tests/cmd/file_write/Makefile.in | 29 +- tests/zfs-tests/cmd/largest_file/Makefile.in | 29 +- tests/zfs-tests/cmd/mkbusy/Makefile.in | 29 +- tests/zfs-tests/cmd/mkbusy/mkbusy.c | 16 +- tests/zfs-tests/cmd/mkfile/Makefile.in | 29 +- tests/zfs-tests/cmd/mkfiles/Makefile.in | 29 +- tests/zfs-tests/cmd/mktree/Makefile.in | 29 +- tests/zfs-tests/cmd/mktree/mktree.c | 10 +- tests/zfs-tests/cmd/mmap_exec/Makefile.in | 29 +- tests/zfs-tests/cmd/mmap_libaio/Makefile.am | 9 + tests/zfs-tests/cmd/mmap_libaio/Makefile.in | 758 + tests/zfs-tests/cmd/mmap_libaio/mmap_libaio.c | 88 + tests/zfs-tests/cmd/mmapwrite/Makefile.in | 29 +- tests/zfs-tests/cmd/randfree_file/Makefile.in | 29 +- tests/zfs-tests/cmd/readmmap/Makefile.in | 29 +- tests/zfs-tests/cmd/rename_dir/Makefile.in | 29 +- .../cmd/rm_lnkcnt_zero_file/Makefile.in | 29 +- tests/zfs-tests/cmd/threadsappend/Makefile.in | 29 +- tests/zfs-tests/cmd/user_ns_exec/Makefile.am | 6 + tests/zfs-tests/cmd/user_ns_exec/Makefile.in | 754 + .../zfs-tests/cmd/user_ns_exec/user_ns_exec.c | 179 + tests/zfs-tests/cmd/xattrtest/Makefile.in | 29 +- tests/zfs-tests/cmd/xattrtest/xattrtest.c | 43 +- tests/zfs-tests/include/Makefile.am | 2 +- tests/zfs-tests/include/Makefile.in | 109 +- tests/zfs-tests/include/commands.cfg | 3 + tests/zfs-tests/include/libtest.shlib | 168 +- tests/zfs-tests/include/zpool_script.shlib | 1 - tests/zfs-tests/tests/Makefile.in | 25 +- tests/zfs-tests/tests/functional/Makefile.am | 1 + tests/zfs-tests/tests/functional/Makefile.in | 26 +- .../tests/functional/acl/Makefile.am | 2 +- .../tests/functional/acl/Makefile.in | 123 +- .../tests/functional/acl/posix/Makefile.in | 25 +- .../tests/functional/atime/Makefile.am | 6 +- .../tests/functional/atime/Makefile.in | 84 +- .../tests/functional/bootfs/Makefile.in | 25 +- .../tests/functional/cache/Makefile.am | 6 +- .../tests/functional/cache/Makefile.in | 84 +- .../tests/functional/cachefile/Makefile.am | 6 +- .../tests/functional/cachefile/Makefile.in | 84 +- .../functional/cachefile/cachefile.kshlib | 1 - .../cachefile/cachefile_004_pos.ksh | 6 +- .../tests/functional/casenorm/Makefile.am | 6 +- .../tests/functional/casenorm/Makefile.in | 84 +- .../tests/functional/chattr/Makefile.in | 25 +- .../tests/functional/checksum/Makefile.am | 4 +- .../tests/functional/checksum/Makefile.in | 93 +- .../tests/functional/clean_mirror/Makefile.am | 6 +- .../tests/functional/clean_mirror/Makefile.in | 84 +- .../tests/functional/clean_mirror/cleanup.ksh | 4 +- .../tests/functional/cli_root/Makefile.am | 2 +- .../tests/functional/cli_root/Makefile.in | 123 +- .../tests/functional/cli_root/zdb/Makefile.am | 3 +- .../tests/functional/cli_root/zdb/Makefile.in | 28 +- .../functional/cli_root/zdb/zdb_003_pos.ksh | 5 + .../functional/cli_root/zdb/zdb_004_pos.ksh | 11 +- .../functional/cli_root/zdb/zdb_005_pos.ksh | 4 + .../functional/cli_root/zdb/zdb_006_pos.ksh | 64 + .../tests/functional/cli_root/zfs/Makefile.in | 25 +- .../functional/cli_root/zfs_clone/Makefile.in | 25 +- .../cli_root/zfs_copies/Makefile.am | 6 +- .../cli_root/zfs_copies/Makefile.in | 84 +- .../cli_root/zfs_create/Makefile.am | 8 +- .../cli_root/zfs_create/Makefile.in | 86 +- .../cli_root/zfs_destroy/Makefile.am | 6 +- .../cli_root/zfs_destroy/Makefile.in | 84 +- .../zfs_destroy/zfs_destroy_002_pos.ksh | 5 +- .../functional/cli_root/zfs_get/Makefile.am | 6 +- .../functional/cli_root/zfs_get/Makefile.in | 84 +- .../cli_root/zfs_inherit/Makefile.in | 25 +- .../functional/cli_root/zfs_mount/Makefile.am | 9 +- .../functional/cli_root/zfs_mount/Makefile.in | 87 +- .../cli_root/zfs_mount/zfs_multi_mount.ksh | 104 + .../cli_root/zfs_promote/Makefile.am | 4 +- .../cli_root/zfs_promote/Makefile.in | 82 +- .../zfs_promote/zfs_promote_008_pos.ksh | 2 +- .../cli_root/zfs_property/Makefile.in | 25 +- .../cli_root/zfs_receive/Makefile.in | 25 +- .../cli_root/zfs_rename/Makefile.am | 6 +- .../cli_root/zfs_rename/Makefile.in | 84 +- .../cli_root/zfs_reservation/Makefile.in | 25 +- .../cli_root/zfs_rollback/Makefile.am | 6 +- .../cli_root/zfs_rollback/Makefile.in | 84 +- .../functional/cli_root/zfs_send/Makefile.am | 4 +- .../functional/cli_root/zfs_send/Makefile.in | 82 +- .../functional/cli_root/zfs_set/Makefile.am | 4 +- .../functional/cli_root/zfs_set/Makefile.in | 82 +- .../functional/cli_root/zfs_share/Makefile.am | 4 +- .../functional/cli_root/zfs_share/Makefile.in | 82 +- .../cli_root/zfs_snapshot/Makefile.am | 4 +- .../cli_root/zfs_snapshot/Makefile.in | 82 +- .../cli_root/zfs_unmount/Makefile.am | 6 +- .../cli_root/zfs_unmount/Makefile.in | 84 +- .../cli_root/zfs_unshare/Makefile.in | 25 +- .../cli_root/zfs_upgrade/Makefile.am | 4 +- .../cli_root/zfs_upgrade/Makefile.in | 82 +- .../functional/cli_root/zpool/Makefile.in | 25 +- .../functional/cli_root/zpool_add/Makefile.am | 6 +- .../functional/cli_root/zpool_add/Makefile.in | 84 +- .../cli_root/zpool_attach/Makefile.in | 25 +- .../cli_root/zpool_clear/Makefile.am | 4 +- .../cli_root/zpool_clear/Makefile.in | 82 +- .../cli_root/zpool_create/Makefile.am | 6 +- .../cli_root/zpool_create/Makefile.in | 84 +- .../cli_root/zpool_create/create-o_ashift.ksh | 47 +- .../cli_root/zpool_destroy/Makefile.am | 4 +- .../cli_root/zpool_destroy/Makefile.in | 82 +- .../cli_root/zpool_detach/Makefile.in | 25 +- .../cli_root/zpool_expand/Makefile.am | 4 +- .../cli_root/zpool_expand/Makefile.in | 82 +- .../cli_root/zpool_export/Makefile.am | 4 +- .../cli_root/zpool_export/Makefile.in | 82 +- .../functional/cli_root/zpool_get/Makefile.am | 4 +- .../functional/cli_root/zpool_get/Makefile.in | 82 +- .../cli_root/zpool_history/Makefile.in | 25 +- .../cli_root/zpool_import/Makefile.am | 5 +- .../cli_root/zpool_import/Makefile.in | 30 +- .../cli_root/zpool_labelclear/Makefile.am | 4 +- .../cli_root/zpool_labelclear/Makefile.in | 82 +- .../cli_root/zpool_labelclear/labelclear.cfg | 2 - .../cli_root/zpool_offline/Makefile.in | 25 +- .../cli_root/zpool_online/Makefile.in | 25 +- .../cli_root/zpool_remove/Makefile.am | 4 +- .../cli_root/zpool_remove/Makefile.in | 82 +- .../cli_root/zpool_replace/Makefile.in | 25 +- .../cli_root/zpool_scrub/Makefile.am | 4 +- .../cli_root/zpool_scrub/Makefile.in | 82 +- .../functional/cli_root/zpool_set/Makefile.in | 25 +- .../cli_root/zpool_status/Makefile.in | 25 +- .../cli_root/zpool_sync/Makefile.in | 25 +- .../cli_root/zpool_upgrade/Makefile.am | 7 +- .../cli_root/zpool_upgrade/Makefile.in | 32 +- .../tests/functional/cli_user/Makefile.in | 25 +- .../functional/cli_user/misc/Makefile.am | 4 +- .../functional/cli_user/misc/Makefile.in | 82 +- .../functional/cli_user/zfs_list/Makefile.am | 6 +- .../functional/cli_user/zfs_list/Makefile.in | 84 +- .../cli_user/zpool_iostat/Makefile.in | 25 +- .../cli_user/zpool_list/Makefile.in | 25 +- .../tests/functional/compression/Makefile.am | 4 +- .../tests/functional/compression/Makefile.in | 82 +- .../tests/functional/ctime/Makefile.in | 29 +- .../tests/functional/ctime/ctime_001_pos.ksh | 0 .../tests/functional/delegate/Makefile.am | 6 +- .../tests/functional/delegate/Makefile.in | 84 +- .../delegate/delegate_common.kshlib | 8 +- .../tests/functional/devices/Makefile.am | 6 +- .../tests/functional/devices/Makefile.in | 84 +- .../tests/functional/events/Makefile.am | 9 +- .../tests/functional/events/Makefile.in | 87 +- .../tests/functional/events/cleanup.ksh | 2 +- .../tests/functional/events/setup.ksh | 2 +- .../tests/functional/events/zed_rc_filter.ksh | 104 + .../tests/functional/exec/Makefile.in | 29 +- .../tests/functional/fault/Makefile.am | 7 +- .../tests/functional/fault/Makefile.in | 85 +- .../tests/functional/fault/cleanup.ksh | 2 +- .../tests/functional/fault/fault.cfg | 1 - .../functional/fault/scrub_after_resilver.ksh | 64 + .../tests/functional/fault/setup.ksh | 2 +- .../tests/functional/features/Makefile.in | 25 +- .../features/async_destroy/Makefile.in | 25 +- .../features/large_dnode/Makefile.in | 25 +- .../tests/functional/grow_pool/Makefile.am | 4 +- .../tests/functional/grow_pool/Makefile.in | 82 +- .../functional/grow_replicas/Makefile.am | 4 +- .../functional/grow_replicas/Makefile.in | 82 +- .../tests/functional/history/Makefile.am | 8 +- .../tests/functional/history/Makefile.in | 86 +- .../tests/functional/inheritance/Makefile.am | 6 +- .../tests/functional/inheritance/Makefile.in | 84 +- .../tests/functional/inuse/Makefile.am | 4 +- .../tests/functional/inuse/Makefile.in | 82 +- .../tests/functional/inuse/inuse_005_pos.ksh | 8 +- .../tests/functional/inuse/inuse_008_pos.ksh | 5 +- .../tests/functional/inuse/inuse_009_pos.ksh | 10 +- .../tests/functional/large_files/Makefile.in | 25 +- .../tests/functional/largest_pool/Makefile.am | 4 +- .../tests/functional/largest_pool/Makefile.in | 82 +- .../tests/functional/libzfs/Makefile.in | 29 +- .../tests/functional/link_count/Makefile.in | 25 +- .../tests/functional/migration/Makefile.am | 6 +- .../tests/functional/migration/Makefile.in | 84 +- .../migration/migration_001_pos.ksh | 4 +- .../migration/migration_002_pos.ksh | 4 +- .../migration/migration_003_pos.ksh | 4 +- .../migration/migration_004_pos.ksh | 4 +- .../migration/migration_005_pos.ksh | 4 +- .../migration/migration_006_pos.ksh | 4 +- .../migration/migration_007_pos.ksh | 4 +- .../migration/migration_008_pos.ksh | 4 +- .../migration/migration_009_pos.ksh | 4 +- .../migration/migration_010_pos.ksh | 4 +- .../migration/migration_011_pos.ksh | 4 +- .../migration/migration_012_pos.ksh | 4 +- .../tests/functional/mmap/Makefile.am | 7 +- .../tests/functional/mmap/Makefile.in | 85 +- .../functional/mmap/mmap_libaio_001_pos.ksh | 61 + .../tests/functional/mmp/Makefile.am | 5 +- .../tests/functional/mmp/Makefile.in | 83 +- tests/zfs-tests/tests/functional/mmp/mmp.cfg | 2 - .../zfs-tests/tests/functional/mmp/mmp.kshlib | 55 +- .../functional/mmp/mmp_active_import.ksh | 3 + .../functional/mmp/mmp_on_uberblocks.ksh | 2 +- .../functional/mmp/mmp_reset_interval.ksh | 2 +- .../functional/mmp/mmp_write_uberblocks.ksh | 2 +- .../functional/mmp/multihost_history.ksh | 67 + .../tests/functional/mount/Makefile.in | 25 +- .../tests/functional/mv_files/Makefile.am | 9 +- .../tests/functional/mv_files/Makefile.in | 87 +- .../tests/functional/mv_files/mv_files.cfg | 4 + .../functional/mv_files/random_creation.ksh | 48 + .../tests/functional/nestedfs/Makefile.in | 25 +- .../tests/functional/no_space/Makefile.am | 4 +- .../tests/functional/no_space/Makefile.in | 82 +- .../tests/functional/nopwrite/Makefile.am | 4 +- .../tests/functional/nopwrite/Makefile.in | 82 +- .../functional/online_offline/Makefile.am | 4 +- .../functional/online_offline/Makefile.in | 82 +- .../tests/functional/pool_names/Makefile.in | 25 +- .../tests/functional/poolversion/Makefile.in | 25 +- .../tests/functional/privilege/Makefile.in | 25 +- .../tests/functional/quota/Makefile.am | 6 +- .../tests/functional/quota/Makefile.in | 84 +- .../tests/functional/raidz/Makefile.in | 25 +- .../tests/functional/redundancy/Makefile.am | 6 +- .../tests/functional/redundancy/Makefile.in | 84 +- .../tests/functional/refquota/Makefile.in | 25 +- .../tests/functional/refreserv/Makefile.am | 4 +- .../tests/functional/refreserv/Makefile.in | 82 +- .../tests/functional/rename_dirs/Makefile.in | 25 +- .../tests/functional/replacement/Makefile.am | 4 +- .../tests/functional/replacement/Makefile.in | 82 +- .../tests/functional/reservation/Makefile.am | 6 +- .../tests/functional/reservation/Makefile.in | 84 +- .../tests/functional/rootpool/Makefile.in | 25 +- .../tests/functional/rsend/Makefile.am | 6 +- .../tests/functional/rsend/Makefile.in | 84 +- .../tests/functional/scrub_mirror/Makefile.am | 6 +- .../tests/functional/scrub_mirror/Makefile.in | 84 +- .../tests/functional/slog/Makefile.am | 6 +- .../tests/functional/slog/Makefile.in | 84 +- .../tests/functional/snapshot/Makefile.am | 4 +- .../tests/functional/snapshot/Makefile.in | 82 +- .../tests/functional/snapused/Makefile.am | 4 +- .../tests/functional/snapused/Makefile.in | 82 +- .../tests/functional/sparse/Makefile.am | 4 +- .../tests/functional/sparse/Makefile.in | 82 +- .../functional/threadsappend/Makefile.in | 29 +- .../tests/functional/tmpfile/Makefile.in | 29 +- .../tests/functional/truncate/Makefile.am | 4 +- .../tests/functional/truncate/Makefile.in | 92 +- .../tests/functional/upgrade/Makefile.in | 25 +- .../functional/user_namespace/Makefile.am | 9 + .../functional/user_namespace/Makefile.in | 664 + .../functional/user_namespace/cleanup.ksh | 25 + .../tests/functional/user_namespace/setup.ksh | 32 + .../user_namespace/user_namespace.cfg | 23 + .../user_namespace/user_namespace_001.ksh | 89 + .../user_namespace_common.kshlib | 23 + .../tests/functional/userquota/Makefile.am | 6 +- .../tests/functional/userquota/Makefile.in | 84 +- .../tests/functional/vdev_zaps/Makefile.am | 4 +- .../tests/functional/vdev_zaps/Makefile.in | 82 +- .../tests/functional/write_dirs/Makefile.am | 4 +- .../tests/functional/write_dirs/Makefile.in | 82 +- .../functional/write_dirs/write_dirs.cfg | 1 - .../tests/functional/xattr/Makefile.am | 8 +- .../tests/functional/xattr/Makefile.in | 86 +- .../tests/functional/zvol/Makefile.am | 2 +- .../tests/functional/zvol/Makefile.in | 123 +- .../functional/zvol/zvol_ENOSPC/Makefile.am | 4 +- .../functional/zvol/zvol_ENOSPC/Makefile.in | 82 +- .../zvol/zvol_ENOSPC/zvol_ENOSPC.cfg | 1 - .../functional/zvol/zvol_cli/Makefile.am | 4 +- .../functional/zvol/zvol_cli/Makefile.in | 82 +- .../functional/zvol/zvol_cli/zvol_cli.cfg | 1 - .../functional/zvol/zvol_misc/Makefile.am | 5 +- .../functional/zvol/zvol_misc/Makefile.in | 82 +- .../zvol/zvol_misc/zvol_misc_common.kshlib | 1 - .../functional/zvol/zvol_swap/Makefile.am | 4 +- .../functional/zvol/zvol_swap/Makefile.in | 82 +- tests/zfs-tests/tests/perf/Makefile.am | 2 +- tests/zfs-tests/tests/perf/Makefile.in | 123 +- tests/zfs-tests/tests/perf/fio/Makefile.am | 2 +- tests/zfs-tests/tests/perf/fio/Makefile.in | 109 +- .../tests/perf/regression/Makefile.in | 25 +- .../zfs-tests/tests/perf/scripts/Makefile.in | 25 +- tests/zfs-tests/tests/stress/Makefile.in | 25 +- udev/Makefile.in | 25 +- udev/rules.d/Makefile.in | 25 +- zfs_config.h.in | 63 +- 528 files changed, 28079 insertions(+), 10778 deletions(-) create mode 100755 cmd/zed/zed.d/resilver_finish-start-scrub.sh create mode 100755 cmd/zpool/zpool.d/nvme_err create mode 100755 cmd/zpool/zpool.d/smart_test create mode 100755 cmd/zpool/zpool.d/test_ended create mode 100755 cmd/zpool/zpool.d/test_progress create mode 100755 cmd/zpool/zpool.d/test_status create mode 100755 cmd/zpool/zpool.d/test_type create mode 100644 config/ax_code_coverage.m4 create mode 100644 config/kernel-acl-refcount.m4 create mode 100644 config/kernel-blk-queue-flags.m4 create mode 100644 config/kernel-fst-mount.m4 create mode 100644 config/kernel-get-disk-and-module.m4 create mode 100644 config/kernel-global_page_state.m4 create mode 100644 config/kernel-inode-set-iversion.m4 delete mode 100644 config/kernel-mount-nodev.m4 create mode 100644 config/kernel-userns-capabilities.m4 delete mode 100644 config/kernel-vm_node_stat.m4 create mode 100644 config/user-libaio.m4 delete mode 100644 config/user-libattr.m4 create mode 100644 contrib/initramfs/conf.d/zfs mode change 100755 => 100644 etc/init.d/zfs-import.in mode change 100755 => 100644 etc/init.d/zfs-mount.in mode change 100755 => 100644 etc/init.d/zfs-share.in mode change 100755 => 100644 etc/init.d/zfs-zed.in create mode 100644 include/linux/page_compat.h create mode 100755 scripts/enum-extract.pl create mode 100644 tests/zfs-tests/cmd/mmap_libaio/Makefile.am create mode 100644 tests/zfs-tests/cmd/mmap_libaio/Makefile.in create mode 100644 tests/zfs-tests/cmd/mmap_libaio/mmap_libaio.c create mode 100644 tests/zfs-tests/cmd/user_ns_exec/Makefile.am create mode 100644 tests/zfs-tests/cmd/user_ns_exec/Makefile.in create mode 100644 tests/zfs-tests/cmd/user_ns_exec/user_ns_exec.c create mode 100755 tests/zfs-tests/tests/functional/cli_root/zdb/zdb_006_pos.ksh create mode 100755 tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_multi_mount.ksh mode change 100644 => 100755 tests/zfs-tests/tests/functional/ctime/ctime_001_pos.ksh create mode 100755 tests/zfs-tests/tests/functional/events/zed_rc_filter.ksh create mode 100755 tests/zfs-tests/tests/functional/fault/scrub_after_resilver.ksh create mode 100755 tests/zfs-tests/tests/functional/mmap/mmap_libaio_001_pos.ksh create mode 100755 tests/zfs-tests/tests/functional/mmp/multihost_history.ksh create mode 100755 tests/zfs-tests/tests/functional/mv_files/random_creation.ksh create mode 100644 tests/zfs-tests/tests/functional/user_namespace/Makefile.am create mode 100644 tests/zfs-tests/tests/functional/user_namespace/Makefile.in create mode 100755 tests/zfs-tests/tests/functional/user_namespace/cleanup.ksh create mode 100755 tests/zfs-tests/tests/functional/user_namespace/setup.ksh create mode 100644 tests/zfs-tests/tests/functional/user_namespace/user_namespace.cfg create mode 100755 tests/zfs-tests/tests/functional/user_namespace/user_namespace_001.ksh create mode 100644 tests/zfs-tests/tests/functional/user_namespace/user_namespace_common.kshlib diff --git a/META b/META index 1f4686df..fbada64e 100644 --- a/META +++ b/META @@ -1,7 +1,7 @@ Meta: 1 Name: zfs Branch: 1.0 -Version: 0.7.6 +Version: 0.7.9 Release: 1 Release-Tags: relext License: CDDL diff --git a/Makefile.am b/Makefile.am index 508d3f40..b539ff30 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,16 +23,18 @@ EXTRA_DIST = autogen.sh copy-builtin EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am EXTRA_DIST += META DISCLAIMER COPYRIGHT README.markdown OPENSOLARIS.LICENSE +@CODE_COVERAGE_RULES@ + distclean-local:: -$(RM) -R autom4te*.cache -find . \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \ -o -name .pc -o -name .hg -o -name .git \) -prune -o \ \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ - -o -name '.*.rej' -o -name '.script-config' -o -size 0 \ - -o -name '*%' -o -name '.*.cmd' -o -name 'core' \ - -o -name 'Makefile' -o -name 'Module.symvers' \ - -o -name '*.order' -o -name '*.markers' \) \ + -o -name '.*.rej' -o -size 0 -o -name '*%' -o -name '.*.cmd' \ + -o -name 'core' -o -name 'Makefile' -o -name 'Module.symvers' \ + -o -name '*.order' -o -name '*.markers' -o -name '*.gcda' \ + -o -name '*.gcno' \) \ -type f -print | xargs $(RM) dist-hook: diff --git a/Makefile.in b/Makefile.in index 26172c11..909b5cfe 100644 --- a/Makefile.in +++ b/Makefile.in @@ -65,6 +65,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -80,6 +82,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -108,14 +111,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -127,7 +134,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -143,9 +149,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -156,7 +162,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -282,6 +288,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -293,6 +305,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -308,6 +321,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -321,9 +336,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -342,6 +358,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -1123,16 +1140,16 @@ deb-local: @(if test "${HAVE_DPKGBUILD}" = "no"; then \ echo -e "\n" \ "*** Required util ${DPKGBUILD} missing. Please install the\n" \ - "*** package for your distribution which provides ${DPKGBUILD},\n" \ + "*** package for your distribution which provides ${DPKGBUILD},\n" \ "*** re-run configure, and try again.\n"; \ - exit 1; \ + exit 1; \ fi; \ if test "${HAVE_ALIEN}" = "no"; then \ echo -e "\n" \ "*** Required util ${ALIEN} missing. Please install the\n" \ - "*** package for your distribution which provides ${ALIEN},\n" \ + "*** package for your distribution which provides ${ALIEN},\n" \ "*** re-run configure, and try again.\n"; \ - exit 1; \ + exit 1; \ fi) deb-kmod: deb-local rpm-kmod @@ -1187,9 +1204,9 @@ tgz-local: @(if test "${HAVE_ALIEN}" = "no"; then \ echo -e "\n" \ "*** Required util ${ALIEN} missing. Please install the\n" \ - "*** package for your distribution which provides ${ALIEN},\n" \ + "*** package for your distribution which provides ${ALIEN},\n" \ "*** re-run configure, and try again.\n"; \ - exit 1; \ + exit 1; \ fi) tgz-kmod: tgz-local rpm-kmod @@ -1212,16 +1229,18 @@ tgz-utils: tgz-local rpm-utils tgz: tgz-kmod tgz-utils +@CODE_COVERAGE_RULES@ + distclean-local:: -$(RM) -R autom4te*.cache -find . \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \ -o -name .pc -o -name .hg -o -name .git \) -prune -o \ \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ - -o -name '.*.rej' -o -name '.script-config' -o -size 0 \ - -o -name '*%' -o -name '.*.cmd' -o -name 'core' \ - -o -name 'Makefile' -o -name 'Module.symvers' \ - -o -name '*.order' -o -name '*.markers' \) \ + -o -name '.*.rej' -o -size 0 -o -name '*%' -o -name '.*.cmd' \ + -o -name 'core' -o -name 'Makefile' -o -name 'Module.symvers' \ + -o -name '*.order' -o -name '*.markers' -o -name '*.gcda' \ + -o -name '*.gcno' \) \ -type f -print | xargs $(RM) dist-hook: diff --git a/README.markdown b/README.markdown index fd2ca8c8..1c305b35 100644 --- a/README.markdown +++ b/README.markdown @@ -1,9 +1,9 @@ -

-ZFS is an advanced file system and volume manager which was originally -developed for Solaris and is now maintained by the Illumos community. +![img](http://zfsonlinux.org/images/zfs-linux.png) -ZFS on Linux, which is also known as ZoL, is currently feature complete. It -includes fully functional and stable SPA, DMU, ZVOL, and ZPL layers. And it's native! +ZFS on Linux is an advanced file system and volume manager which was originally +developed for Solaris and is now maintained by the OpenZFS community. + +[![codecov](https://codecov.io/gh/zfsonlinux/zfs/branch/master/graph/badge.svg)](https://codecov.io/gh/zfsonlinux/zfs) # Official Resources * [Site](http://zfsonlinux.org) @@ -16,4 +16,4 @@ Full documentation for installing ZoL on your favorite Linux distribution can be found at [our site](http://zfsonlinux.org/). # Contribute & Develop -We have a separate document with [contribution guidelines](./.github/CONTRIBUTING.md). \ No newline at end of file +We have a separate document with [contribution guidelines](./.github/CONTRIBUTING.md). diff --git a/aclocal.m4 b/aclocal.m4 index 05f62120..e0281981 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1076,6 +1076,8 @@ AC_SUBST([am__untar]) m4_include([config/always-arch.m4]) m4_include([config/always-no-bool-compare.m4]) m4_include([config/always-no-unused-but-set-variable.m4]) +m4_include([config/ax_code_coverage.m4]) +m4_include([config/kernel-acl-refcount.m4]) m4_include([config/kernel-acl.m4]) m4_include([config/kernel-aio-fsync.m4]) m4_include([config/kernel-automount.m4]) @@ -1091,6 +1093,7 @@ m4_include([config/kernel-bio-rw-barrier.m4]) m4_include([config/kernel-bio-rw-discard.m4]) m4_include([config/kernel-bio_set_dev.m4]) m4_include([config/kernel-blk-queue-bdi.m4]) +m4_include([config/kernel-blk-queue-flags.m4]) m4_include([config/kernel-blk-queue-flush.m4]) m4_include([config/kernel-blk-queue-max-hw-sectors.m4]) m4_include([config/kernel-blk-queue-max-segments.m4]) @@ -1119,14 +1122,18 @@ m4_include([config/kernel-file-inode.m4]) m4_include([config/kernel-fmode-t.m4]) m4_include([config/kernel-follow-down-one.m4]) m4_include([config/kernel-fpu.m4]) +m4_include([config/kernel-fst-mount.m4]) m4_include([config/kernel-fsync.m4]) m4_include([config/kernel-generic_io_acct.m4]) m4_include([config/kernel-generic_readlink.m4]) +m4_include([config/kernel-get-disk-and-module.m4]) m4_include([config/kernel-get-disk-ro.m4]) m4_include([config/kernel-get-gendisk.m4]) m4_include([config/kernel-get-link.m4]) +m4_include([config/kernel-global_page_state.m4]) m4_include([config/kernel-inode-getattr.m4]) m4_include([config/kernel-inode-set-flags.m4]) +m4_include([config/kernel-inode-set-iversion.m4]) m4_include([config/kernel-insert-inode-locked.m4]) m4_include([config/kernel-invalidate-bdev-args.m4]) m4_include([config/kernel-is_owner_or_cap.m4]) @@ -1138,7 +1145,6 @@ m4_include([config/kernel-lseek-execute.m4]) m4_include([config/kernel-mk-request-fn.m4]) m4_include([config/kernel-mkdir-umode-t.m4]) m4_include([config/kernel-mod-param.m4]) -m4_include([config/kernel-mount-nodev.m4]) m4_include([config/kernel-objtool.m4]) m4_include([config/kernel-open-bdev-exclusive.m4]) m4_include([config/kernel-put-link.m4]) @@ -1154,9 +1160,9 @@ m4_include([config/kernel-super-userns.m4]) m4_include([config/kernel-tmpfile.m4]) m4_include([config/kernel-truncate-range.m4]) m4_include([config/kernel-truncate-setsize.m4]) +m4_include([config/kernel-userns-capabilities.m4]) m4_include([config/kernel-vfs-iterate.m4]) m4_include([config/kernel-vfs-rw-iterate.m4]) -m4_include([config/kernel-vm_node_stat.m4]) m4_include([config/kernel-xattr-handler.m4]) m4_include([config/kernel.m4]) m4_include([config/libtool.m4]) @@ -1168,7 +1174,7 @@ m4_include([config/mount-helper.m4]) m4_include([config/toolchain-simd.m4]) m4_include([config/user-dracut.m4]) m4_include([config/user-frame-larger-than.m4]) -m4_include([config/user-libattr.m4]) +m4_include([config/user-libaio.m4]) m4_include([config/user-libblkid.m4]) m4_include([config/user-libtirpc.m4]) m4_include([config/user-libudev.m4]) diff --git a/cmd/Makefile.in b/cmd/Makefile.in index 8648d62b..27a94235 100644 --- a/cmd/Makefile.in +++ b/cmd/Makefile.in @@ -40,6 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -55,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -83,14 +86,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -102,7 +109,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -118,9 +124,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -131,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -216,6 +222,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -227,6 +239,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -242,6 +255,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -255,9 +270,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -276,6 +292,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/cmd/arc_summary/Makefile.in b/cmd/arc_summary/Makefile.in index 64fc55a3..b5764e35 100644 --- a/cmd/arc_summary/Makefile.in +++ b/cmd/arc_summary/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/cmd/arcstat/Makefile.in b/cmd/arcstat/Makefile.in index 5c5d6166..54ad7c3a 100644 --- a/cmd/arcstat/Makefile.in +++ b/cmd/arcstat/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/cmd/arcstat/arcstat.py b/cmd/arcstat/arcstat.py index aa54ee87..85c83ccc 100755 --- a/cmd/arcstat/arcstat.py +++ b/cmd/arcstat/arcstat.py @@ -280,7 +280,7 @@ def init(): "outfile", "help", "verbose", - "seperator", + "separator", "columns" ] ) @@ -299,7 +299,7 @@ def init(): hflag = True if opt in ('-v', '--verbose'): vflag = True - if opt in ('-s', '--seperator'): + if opt in ('-s', '--separator'): sep = arg i += 1 if opt in ('-f', '--columns'): diff --git a/cmd/dbufstat/Makefile.in b/cmd/dbufstat/Makefile.in index 7fdf8a9a..4403dcf1 100644 --- a/cmd/dbufstat/Makefile.in +++ b/cmd/dbufstat/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/cmd/dbufstat/dbufstat.py b/cmd/dbufstat/dbufstat.py index dda0a143..42bb0c7c 100755 --- a/cmd/dbufstat/dbufstat.py +++ b/cmd/dbufstat/dbufstat.py @@ -474,7 +474,7 @@ def main(): "help", "infile", "outfile", - "seperator", + "separator", "types", "verbose", "extended" @@ -499,7 +499,7 @@ def main(): ofile = arg if opt in ('-r', '--raw'): raw += 1 - if opt in ('-s', '--seperator'): + if opt in ('-s', '--separator'): sep = arg if opt in ('-t', '--types'): tflag = True diff --git a/cmd/fsck_zfs/Makefile.in b/cmd/fsck_zfs/Makefile.in index e444eec1..61ee106a 100644 --- a/cmd/fsck_zfs/Makefile.in +++ b/cmd/fsck_zfs/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/cmd/mount_zfs/Makefile.in b/cmd/mount_zfs/Makefile.in index 589931bf..acdb9a5a 100644 --- a/cmd/mount_zfs/Makefile.in +++ b/cmd/mount_zfs/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -212,6 +218,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -223,6 +235,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -238,6 +251,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -251,9 +266,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -272,6 +288,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -408,14 +425,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) mount_zfs_SOURCES = \ mount_zfs.c diff --git a/cmd/raidz_test/Makefile.in b/cmd/raidz_test/Makefile.in index dc10948a..7a046e27 100644 --- a/cmd/raidz_test/Makefile.in +++ b/cmd/raidz_test/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -210,6 +216,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -221,6 +233,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -236,6 +249,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -249,9 +264,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -270,6 +286,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -401,15 +418,16 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 $(DEBUG_STACKFLAGS) \ - $(FRAME_LARGER_THAN) + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) \ + $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" -DDEBUG + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) \ + -DDEBUG raidz_test_SOURCES = \ raidz_test.h \ raidz_test.c \ diff --git a/cmd/vdev_id/Makefile.in b/cmd/vdev_id/Makefile.in index 2280a7bc..6ace66d4 100644 --- a/cmd/vdev_id/Makefile.in +++ b/cmd/vdev_id/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/cmd/zdb/Makefile.in b/cmd/zdb/Makefile.in index aded3549..499686ab 100644 --- a/cmd/zdb/Makefile.in +++ b/cmd/zdb/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -212,6 +218,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -223,6 +235,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -238,6 +251,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -251,9 +266,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -272,6 +288,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -403,14 +420,15 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" -DDEBUG + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) \ + -DDEBUG zdb_SOURCES = \ zdb.c \ zdb_il.c diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c index 1097501e..17a0ae25 100644 --- a/cmd/zdb/zdb.c +++ b/cmd/zdb/zdb.c @@ -2716,10 +2716,6 @@ dump_label(const char *dev) exit(1); } - if (ioctl(fd, BLKFLSBUF) != 0) - (void) printf("failed to invalidate cache '%s' : %s\n", path, - strerror(errno)); - if (fstat64_blk(fd, &statbuf) != 0) { (void) printf("failed to stat '%s': %s\n", path, strerror(errno)); @@ -2727,6 +2723,10 @@ dump_label(const char *dev) exit(1); } + if (S_ISBLK(statbuf.st_mode) && ioctl(fd, BLKFLSBUF) != 0) + (void) printf("failed to invalidate cache '%s' : %s\n", path, + strerror(errno)); + avl_create(&config_tree, cksum_record_compare, sizeof (cksum_record_t), offsetof(cksum_record_t, link)); avl_create(&uberblock_tree, cksum_record_compare, @@ -3313,7 +3313,7 @@ dump_block_stats(spa_t *spa) uint64_t norm_alloc, norm_space, total_alloc, total_found; int flags = TRAVERSE_PRE | TRAVERSE_PREFETCH_METADATA | TRAVERSE_HARD; boolean_t leaks = B_FALSE; - int e, c; + int e, c, err; bp_embedded_type_t i; (void) printf("\nTraversing all blocks %s%s%s%s%s...\n\n", @@ -3354,7 +3354,7 @@ dump_block_stats(spa_t *spa) zcb.zcb_totalasize = metaslab_class_get_alloc(spa_normal_class(spa)); zcb.zcb_start = zcb.zcb_lastprint = gethrtime(); - zcb.zcb_haderrors |= traverse_pool(spa, 0, flags, zdb_blkptr_cb, &zcb); + err = traverse_pool(spa, 0, flags, zdb_blkptr_cb, &zcb); /* * If we've traversed the data blocks then we need to wait for those @@ -3370,6 +3370,12 @@ dump_block_stats(spa_t *spa) } } + /* + * Done after zio_wait() since zcb_haderrors is modified in + * zdb_blkptr_done() + */ + zcb.zcb_haderrors |= err; + if (zcb.zcb_haderrors) { (void) printf("\nError counts:\n\n"); (void) printf("\t%5s %s\n", "errno", "count"); @@ -3889,13 +3895,6 @@ name: return (NULL); } -/* ARGSUSED */ -static int -random_get_pseudo_bytes_cb(void *buf, size_t len, void *unused) -{ - return (random_get_pseudo_bytes(buf, len)); -} - /* * Read a block from a pool and print it out. The syntax of the * block descriptor is: @@ -4058,17 +4057,8 @@ zdb_read_block(char *thing, spa_t *spa) * every decompress function at every inflated blocksize. */ enum zio_compress c; - void *pbuf2 = umem_alloc(SPA_MAXBLOCKSIZE, UMEM_NOFAIL); void *lbuf2 = umem_alloc(SPA_MAXBLOCKSIZE, UMEM_NOFAIL); - abd_copy_to_buf(pbuf2, pabd, psize); - - VERIFY0(abd_iterate_func(pabd, psize, SPA_MAXBLOCKSIZE - psize, - random_get_pseudo_bytes_cb, NULL)); - - VERIFY0(random_get_pseudo_bytes((uint8_t *)pbuf2 + psize, - SPA_MAXBLOCKSIZE - psize)); - /* * XXX - On the one hand, with SPA_MAXBLOCKSIZE at 16MB, * this could take a while and we should let the user know @@ -4078,13 +4068,29 @@ zdb_read_block(char *thing, spa_t *spa) for (lsize = psize + SPA_MINBLOCKSIZE; lsize <= SPA_MAXBLOCKSIZE; lsize += SPA_MINBLOCKSIZE) { for (c = 0; c < ZIO_COMPRESS_FUNCTIONS; c++) { + /* + * ZLE can easily decompress non zle stream. + * So have an option to disable it. + */ + if (c == ZIO_COMPRESS_ZLE && + getenv("ZDB_NO_ZLE")) + continue; + (void) fprintf(stderr, "Trying %05llx -> %05llx (%s)\n", (u_longlong_t)psize, (u_longlong_t)lsize, zio_compress_table[c].ci_name); + + /* + * We randomize lbuf2, and decompress to both + * lbuf and lbuf2. This way, we will know if + * decompression fill exactly to lsize. + */ + VERIFY0(random_get_pseudo_bytes(lbuf2, lsize)); + if (zio_decompress_data(c, pabd, lbuf, psize, lsize) == 0 && - zio_decompress_data_buf(c, pbuf2, + zio_decompress_data(c, pabd, lbuf2, psize, lsize) == 0 && bcmp(lbuf, lbuf2, lsize) == 0) break; @@ -4092,11 +4098,9 @@ zdb_read_block(char *thing, spa_t *spa) if (c != ZIO_COMPRESS_FUNCTIONS) break; } - - umem_free(pbuf2, SPA_MAXBLOCKSIZE); umem_free(lbuf2, SPA_MAXBLOCKSIZE); - if (lsize <= psize) { + if (lsize > SPA_MAXBLOCKSIZE) { (void) printf("Decompress of %s failed\n", thing); goto out; } @@ -4135,11 +4139,12 @@ zdb_embedded_block(char *thing) { blkptr_t bp; unsigned long long *words = (void *)&bp; - char buf[SPA_MAXBLOCKSIZE]; + char *buf; int err; - memset(&bp, 0, sizeof (blkptr_t)); + buf = umem_alloc(SPA_MAXBLOCKSIZE, UMEM_NOFAIL); + bzero(&bp, sizeof (bp)); err = sscanf(thing, "%llx:%llx:%llx:%llx:%llx:%llx:%llx:%llx:" "%llx:%llx:%llx:%llx:%llx:%llx:%llx:%llx", words + 0, words + 1, words + 2, words + 3, @@ -4157,6 +4162,7 @@ zdb_embedded_block(char *thing) exit(1); } zdb_dump_block_raw(buf, BPE_GET_LSIZE(&bp), 0); + umem_free(buf, SPA_MAXBLOCKSIZE); } int @@ -4171,7 +4177,7 @@ main(int argc, char **argv) int error = 0; char **searchdirs = NULL; int nsearch = 0; - char *target; + char *target, *target_pool; nvlist_t *policy = NULL; uint64_t max_txg = UINT64_MAX; int flags = ZFS_IMPORT_MISSING_LOG; @@ -4374,6 +4380,20 @@ main(int argc, char **argv) error = 0; target = argv[0]; + if (strpbrk(target, "/@") != NULL) { + size_t targetlen; + + target_pool = strdup(target); + *strpbrk(target_pool, "/@") = '\0'; + + target_is_spa = B_FALSE; + targetlen = strlen(target); + if (targetlen && target[targetlen - 1] == '/') + target[targetlen - 1] = '\0'; + } else { + target_pool = target; + } + if (dump_opt['e']) { importargs_t args = { 0 }; nvlist_t *cfg = NULL; @@ -4382,8 +4402,10 @@ main(int argc, char **argv) args.path = searchdirs; args.can_be_active = B_TRUE; - error = zpool_tryimport(g_zfs, target, &cfg, &args); + error = zpool_tryimport(g_zfs, target_pool, &cfg, &args); + if (error == 0) { + if (nvlist_add_nvlist(cfg, ZPOOL_REWIND_POLICY, policy) != 0) { fatal("can't open '%s': %s", @@ -4398,19 +4420,13 @@ main(int argc, char **argv) (void) printf("\nConfiguration for import:\n"); dump_nvlist(cfg, 8); } - error = spa_import(target, cfg, NULL, + error = spa_import(target_pool, cfg, NULL, flags | ZFS_IMPORT_SKIP_MMP); } } - if (strpbrk(target, "/@") != NULL) { - size_t targetlen; - - target_is_spa = B_FALSE; - targetlen = strlen(target); - if (targetlen && target[targetlen - 1] == '/') - target[targetlen - 1] = '\0'; - } + if (target_pool != target) + free(target_pool); if (error == 0) { if (target_is_spa || dump_opt['R']) { diff --git a/cmd/zed/Makefile.am b/cmd/zed/Makefile.am index 97733a51..ee44898c 100644 --- a/cmd/zed/Makefile.am +++ b/cmd/zed/Makefile.am @@ -69,7 +69,8 @@ dist_zedexec_SCRIPTS = \ zed.d/statechange-notify.sh \ zed.d/vdev_clear-led.sh \ zed.d/vdev_attach-led.sh \ - zed.d/pool_import-led.sh + zed.d/pool_import-led.sh \ + zed.d/resilver_finish-start-scrub.sh zedconfdefaults = \ all-syslog.sh \ @@ -80,7 +81,8 @@ zedconfdefaults = \ statechange-notify.sh \ vdev_clear-led.sh \ vdev_attach-led.sh \ - pool_import-led.sh + pool_import-led.sh \ + resilver_finish-start-scrub.sh install-data-hook: $(MKDIR_P) "$(DESTDIR)$(zedconfdir)" diff --git a/cmd/zed/Makefile.in b/cmd/zed/Makefile.in index 4d1f6632..8f8756f4 100644 --- a/cmd/zed/Makefile.in +++ b/cmd/zed/Makefile.in @@ -46,6 +46,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -61,6 +63,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -89,14 +92,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -108,7 +115,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -124,9 +130,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -137,7 +143,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -253,6 +259,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -264,6 +276,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -279,6 +292,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -292,9 +307,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -313,6 +329,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -444,14 +461,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) EXTRA_DIST = zed.d/README ZED_SRC = \ zed.c \ @@ -510,7 +527,8 @@ dist_zedexec_SCRIPTS = \ zed.d/statechange-notify.sh \ zed.d/vdev_clear-led.sh \ zed.d/vdev_attach-led.sh \ - zed.d/pool_import-led.sh + zed.d/pool_import-led.sh \ + zed.d/resilver_finish-start-scrub.sh zedconfdefaults = \ all-syslog.sh \ @@ -521,7 +539,8 @@ zedconfdefaults = \ statechange-notify.sh \ vdev_clear-led.sh \ vdev_attach-led.sh \ - pool_import-led.sh + pool_import-led.sh \ + resilver_finish-start-scrub.sh all: all-am diff --git a/cmd/zed/zed.d/all-debug.sh b/cmd/zed/zed.d/all-debug.sh index 057e39b5..14b39caa 100755 --- a/cmd/zed/zed.d/all-debug.sh +++ b/cmd/zed/zed.d/all-debug.sh @@ -10,6 +10,8 @@ : "${ZED_DEBUG_LOG:="${TMPDIR:="/tmp"}/zed.debug.log"}" +zed_exit_if_ignoring_this_event + lockfile="$(basename -- "${ZED_DEBUG_LOG}").lock" umask 077 diff --git a/cmd/zed/zed.d/all-syslog.sh b/cmd/zed/zed.d/all-syslog.sh index 68d3cf36..cb928650 100755 --- a/cmd/zed/zed.d/all-syslog.sh +++ b/cmd/zed/zed.d/all-syslog.sh @@ -5,6 +5,8 @@ [ -f "${ZED_ZEDLET_DIR}/zed.rc" ] && . "${ZED_ZEDLET_DIR}/zed.rc" . "${ZED_ZEDLET_DIR}/zed-functions.sh" +zed_exit_if_ignoring_this_event + zed_log_msg "eid=${ZEVENT_EID}" "class=${ZEVENT_SUBCLASS}" \ "${ZEVENT_POOL_GUID:+"pool_guid=${ZEVENT_POOL_GUID}"}" \ "${ZEVENT_VDEV_PATH:+"vdev_path=${ZEVENT_VDEV_PATH}"}" \ diff --git a/cmd/zed/zed.d/resilver_finish-start-scrub.sh b/cmd/zed/zed.d/resilver_finish-start-scrub.sh new file mode 100755 index 00000000..6f9c0b30 --- /dev/null +++ b/cmd/zed/zed.d/resilver_finish-start-scrub.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# resilver_finish-start-scrub.sh +# Run a scrub after a resilver +# +# Exit codes: +# 1: Internal error +# 2: Script wasn't enabled in zed.rc +[ -f "${ZED_ZEDLET_DIR}/zed.rc" ] && . "${ZED_ZEDLET_DIR}/zed.rc" +. "${ZED_ZEDLET_DIR}/zed-functions.sh" + +[ "${ZED_SCRUB_AFTER_RESILVER}" = "1" ] || exit 2 +[ -n "${ZEVENT_POOL}" ] || exit 1 +[ -n "${ZEVENT_SUBCLASS}" ] || exit 1 +zed_check_cmd "${ZPOOL}" || exit 1 + +zed_log_msg "Starting scrub after resilver on ${ZEVENT_POOL}" +"${ZPOOL}" scrub "${ZEVENT_POOL}" diff --git a/cmd/zed/zed.d/zed-functions.sh b/cmd/zed/zed.d/zed-functions.sh index ed6a9591..fb16e9d3 100644 --- a/cmd/zed/zed.d/zed-functions.sh +++ b/cmd/zed/zed.d/zed-functions.sh @@ -438,3 +438,23 @@ zed_guid_to_pool() $ZPOOL get -H -ovalue,name guid | awk '$1=='"$guid"' {print $2}' fi } + +# zed_exit_if_ignoring_this_event +# +# Exit the script if we should ignore this event, as determined by +# $ZED_SYSLOG_SUBCLASS_INCLUDE and $ZED_SYSLOG_SUBCLASS_EXCLUDE in zed.rc. +# This function assumes you've imported the normal zed variables. +zed_exit_if_ignoring_this_event() +{ + if [ -n "${ZED_SYSLOG_SUBCLASS_INCLUDE}" ]; then + eval "case ${ZEVENT_SUBCLASS} in + ${ZED_SYSLOG_SUBCLASS_INCLUDE});; + *) exit 0;; + esac" + elif [ -n "${ZED_SYSLOG_SUBCLASS_EXCLUDE}" ]; then + eval "case ${ZEVENT_SUBCLASS} in + ${ZED_SYSLOG_SUBCLASS_EXCLUDE}) exit 0;; + *);; + esac" + fi +} diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc index a1dd3370..35a4d127 100644 --- a/cmd/zed/zed.d/zed.rc +++ b/cmd/zed/zed.d/zed.rc @@ -86,6 +86,9 @@ # ZED_USE_ENCLOSURE_LEDS=1 +## +# Run a scrub after every resilver +#ZED_SCRUB_AFTER_RESILVER=1 ## # The syslog priority (e.g., specified as a "facility.level" pair). @@ -97,3 +100,14 @@ ZED_USE_ENCLOSURE_LEDS=1 # #ZED_SYSLOG_TAG="zed" +## +# Which set of event subclasses to log +# By default, events from all subclasses are logged. +# If ZED_SYSLOG_SUBCLASS_INCLUDE is set, only subclasses +# matching the pattern are logged. Use the pipe symbol (|) +# or shell wildcards (*, ?) to match multiple subclasses. +# Otherwise, if ZED_SYSLOG_SUBCLASS_EXCLUDE is set, the +# matching subclasses are excluded from logging. +#ZED_SYSLOG_SUBCLASS_INCLUDE="checksum|scrub_*|vdev.*" +#ZED_SYSLOG_SUBCLASS_EXCLUDE="statechange|config_*|history_event" + diff --git a/cmd/zed/zed_conf.c b/cmd/zed/zed_conf.c index 5b27f1e4..86671369 100644 --- a/cmd/zed/zed_conf.c +++ b/cmd/zed/zed_conf.c @@ -155,6 +155,8 @@ _zed_conf_display_help(const char *prog, int got_err) "Run daemon in the foreground."); fprintf(fp, "%*c%*s %s\n", w1, 0x20, -w2, "-M", "Lock all pages in memory."); + fprintf(fp, "%*c%*s %s\n", w1, 0x20, -w2, "-P", + "$PATH for ZED to use (only used by ZTS)."); fprintf(fp, "%*c%*s %s\n", w1, 0x20, -w2, "-Z", "Zero state file."); fprintf(fp, "\n"); @@ -247,7 +249,7 @@ _zed_conf_parse_path(char **resultp, const char *path) void zed_conf_parse_opts(struct zed_conf *zcp, int argc, char **argv) { - const char * const opts = ":hLVc:d:p:s:vfFMZ"; + const char * const opts = ":hLVc:d:p:P:s:vfFMZ"; int opt; if (!zcp || !argv || !argv[0]) @@ -275,6 +277,9 @@ zed_conf_parse_opts(struct zed_conf *zcp, int argc, char **argv) case 'p': _zed_conf_parse_path(&zcp->pid_file, optarg); break; + case 'P': + _zed_conf_parse_path(&zcp->path, optarg); + break; case 's': _zed_conf_parse_path(&zcp->state_file, optarg); break; diff --git a/cmd/zed/zed_conf.h b/cmd/zed/zed_conf.h index 2bc63413..7d6b63b1 100644 --- a/cmd/zed/zed_conf.h +++ b/cmd/zed/zed_conf.h @@ -37,6 +37,7 @@ struct zed_conf { int state_fd; /* fd to state file */ libzfs_handle_t *zfs_hdl; /* handle to libzfs */ int zevent_fd; /* fd for access to zevents */ + char *path; /* custom $PATH for zedlets to use */ }; struct zed_conf *zed_conf_create(void); diff --git a/cmd/zed/zed_event.c b/cmd/zed/zed_event.c index 39023501..2a7ff16f 100644 --- a/cmd/zed/zed_event.c +++ b/cmd/zed/zed_event.c @@ -733,12 +733,14 @@ _zed_event_add_nvpair(uint64_t eid, zed_strings_t *zsp, nvpair_t *nvp) /* * Restrict various environment variables to safe and sane values - * when constructing the environment for the child process. + * when constructing the environment for the child process, unless + * we're running with a custom $PATH (like under the ZFS test suite). * * Reference: Secure Programming Cookbook by Viega & Messier, Section 1.1. */ static void -_zed_event_add_env_restrict(uint64_t eid, zed_strings_t *zsp) +_zed_event_add_env_restrict(uint64_t eid, zed_strings_t *zsp, + const char *path) { const char *env_restrict[][2] = { { "IFS", " \t\n" }, @@ -753,11 +755,35 @@ _zed_event_add_env_restrict(uint64_t eid, zed_strings_t *zsp) { "ZFS_RELEASE", ZFS_META_RELEASE }, { NULL, NULL } }; + + /* + * If we have a custom $PATH, use the default ZFS binary locations + * instead of the hard-coded ones. + */ + const char *env_path[][2] = { + { "IFS", " \t\n" }, + { "PATH", NULL }, /* $PATH copied in later on */ + { "ZDB", "zdb" }, + { "ZED", "zed" }, + { "ZFS", "zfs" }, + { "ZINJECT", "zinject" }, + { "ZPOOL", "zpool" }, + { "ZFS_ALIAS", ZFS_META_ALIAS }, + { "ZFS_VERSION", ZFS_META_VERSION }, + { "ZFS_RELEASE", ZFS_META_RELEASE }, + { NULL, NULL } + }; const char *(*pa)[2]; assert(zsp != NULL); - for (pa = env_restrict; *(*pa); pa++) { + pa = path != NULL ? env_path : env_restrict; + + for (; *(*pa); pa++) { + /* Use our custom $PATH if we have one */ + if (path != NULL && strcmp((*pa)[0], "PATH") == 0) + (*pa)[1] = path; + _zed_event_add_var(eid, zsp, NULL, (*pa)[0], "%s", (*pa)[1]); } } @@ -902,7 +928,7 @@ zed_event_service(struct zed_conf *zcp) while ((nvp = nvlist_next_nvpair(nvl, nvp))) _zed_event_add_nvpair(eid, zsp, nvp); - _zed_event_add_env_restrict(eid, zsp); + _zed_event_add_env_restrict(eid, zsp, zcp->path); _zed_event_add_env_preserve(eid, zsp); _zed_event_add_var(eid, zsp, ZED_VAR_PREFIX, "PID", diff --git a/cmd/zfs/Makefile.in b/cmd/zfs/Makefile.in index b784312a..454bd7f3 100644 --- a/cmd/zfs/Makefile.in +++ b/cmd/zfs/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -215,6 +221,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -226,6 +238,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -241,6 +254,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -254,9 +269,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -275,6 +291,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -406,14 +423,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) zfs_SOURCES = \ zfs_iter.c \ zfs_iter.h \ diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c index e8fe6a9f..f57df858 100644 --- a/cmd/zfs/zfs_main.c +++ b/cmd/zfs/zfs_main.c @@ -6072,7 +6072,7 @@ share_mount_one(zfs_handle_t *zhp, int op, int flags, char *protocol, (void) fprintf(stderr, gettext("cannot %s '%s': " "Contains partially-completed state from " - "\"zfs receive -r\", which can be resumed with " + "\"zfs receive -s\", which can be resumed with " "\"zfs send -t\"\n"), cmdname, zfs_get_name(zhp)); return (1); diff --git a/cmd/zgenhostid/Makefile.in b/cmd/zgenhostid/Makefile.in index 7e6b0832..f2843e1b 100644 --- a/cmd/zgenhostid/Makefile.in +++ b/cmd/zgenhostid/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/cmd/zhack/Makefile.in b/cmd/zhack/Makefile.in index 965bc2f5..13a4d592 100644 --- a/cmd/zhack/Makefile.in +++ b/cmd/zhack/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -212,6 +218,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -223,6 +235,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -238,6 +251,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -251,9 +266,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -272,6 +288,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -403,14 +420,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) zhack_SOURCES = \ zhack.c diff --git a/cmd/zinject/Makefile.in b/cmd/zinject/Makefile.in index 4eaa5120..23290f34 100644 --- a/cmd/zinject/Makefile.in +++ b/cmd/zinject/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -212,6 +218,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -223,6 +235,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -238,6 +251,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -251,9 +266,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -272,6 +288,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -403,14 +420,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) zinject_SOURCES = \ translate.c \ zinject.c \ diff --git a/cmd/zpios/Makefile.in b/cmd/zpios/Makefile.in index bcbb8021..ebbf2ccc 100644 --- a/cmd/zpios/Makefile.in +++ b/cmd/zpios/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -399,14 +416,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) zpios_SOURCES = \ zpios_main.c \ zpios_util.c \ diff --git a/cmd/zpios/zpios_main.c b/cmd/zpios/zpios_main.c index 01f2ce19..4be26d64 100644 --- a/cmd/zpios/zpios_main.c +++ b/cmd/zpios/zpios_main.c @@ -525,10 +525,11 @@ run_one(cmd_args_t *args, uint32_t id, uint32_t T, uint32_t N, memset(cmd, 0, cmd_size); cmd->cmd_magic = ZPIOS_CMD_MAGIC; - strncpy(cmd->cmd_pool, args->pool, ZPIOS_NAME_SIZE - 1); - strncpy(cmd->cmd_pre, args->pre, ZPIOS_PATH_SIZE - 1); - strncpy(cmd->cmd_post, args->post, ZPIOS_PATH_SIZE - 1); - strncpy(cmd->cmd_log, args->log, ZPIOS_PATH_SIZE - 1); + snprintf(cmd->cmd_pool, sizeof (cmd->cmd_pool), "%s", args->pool); + snprintf(cmd->cmd_pre, sizeof (cmd->cmd_pre), "%s", args->pre); + snprintf(cmd->cmd_post, sizeof (cmd->cmd_post), "%s", args->post); + snprintf(cmd->cmd_log, sizeof (cmd->cmd_log), "%s", args->log); + cmd->cmd_id = id; cmd->cmd_chunk_size = C; cmd->cmd_thread_count = T; diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am index 6eff1d14..d07f8d61 100644 --- a/cmd/zpool/Makefile.am +++ b/cmd/zpool/Makefile.am @@ -60,9 +60,15 @@ dist_zpoolexec_SCRIPTS = \ zpool.d/pend_sec \ zpool.d/off_ucor \ zpool.d/ata_err \ + zpool.d/nvme_err \ zpool.d/pwr_cyc \ zpool.d/upath \ - zpool.d/vendor + zpool.d/vendor \ + zpool.d/smart_test \ + zpool.d/test_type \ + zpool.d/test_status \ + zpool.d/test_progress \ + zpool.d/test_ended zpoolconfdefaults = \ enc \ @@ -98,9 +104,15 @@ zpoolconfdefaults = \ pend_sec \ off_ucor \ ata_err \ + nvme_err \ pwr_cyc \ upath \ - vendor + vendor \ + smart_test \ + test_type \ + test_status \ + test_progress \ + test_ended install-data-hook: $(MKDIR_P) "$(DESTDIR)$(zpoolconfdir)" diff --git a/cmd/zpool/Makefile.in b/cmd/zpool/Makefile.in index 505e0dbe..5887a8be 100644 --- a/cmd/zpool/Makefile.in +++ b/cmd/zpool/Makefile.in @@ -44,6 +44,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -59,6 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -87,14 +90,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -106,7 +113,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -122,9 +128,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -135,7 +141,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -238,6 +244,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -249,6 +261,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -264,6 +277,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -277,9 +292,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -298,6 +314,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -429,14 +446,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) zpool_SOURCES = \ zpool_iter.c \ zpool_main.c \ @@ -489,9 +506,15 @@ dist_zpoolexec_SCRIPTS = \ zpool.d/pend_sec \ zpool.d/off_ucor \ zpool.d/ata_err \ + zpool.d/nvme_err \ zpool.d/pwr_cyc \ zpool.d/upath \ - zpool.d/vendor + zpool.d/vendor \ + zpool.d/smart_test \ + zpool.d/test_type \ + zpool.d/test_status \ + zpool.d/test_progress \ + zpool.d/test_ended zpoolconfdefaults = \ enc \ @@ -527,9 +550,15 @@ zpoolconfdefaults = \ pend_sec \ off_ucor \ ata_err \ + nvme_err \ pwr_cyc \ upath \ - vendor + vendor \ + smart_test \ + test_type \ + test_status \ + test_progress \ + test_ended all: all-am diff --git a/cmd/zpool/zpool.d/ata_err b/cmd/zpool/zpool.d/ata_err index 3721f30e..64b5f6e4 100755 --- a/cmd/zpool/zpool.d/ata_err +++ b/cmd/zpool/zpool.d/ata_err @@ -23,8 +23,45 @@ off_ucor: Show SMART offline uncorrectable errors (ATA). ata_err: Show SMART ATA errors (ATA). pwr_cyc: Show SMART power cycle count (ATA). serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). " +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + script=$(basename "$0") if [ "$1" = "-h" ] ; then @@ -34,10 +71,18 @@ fi smartctl_path=$(which smartctl) -if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then - raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi - # Are we a SAS or ATA drive? Look for the right line in smartctl: + # What kind of drive are we? Look for the right line in smartctl: # # SAS: # Transport protocol: SAS @@ -45,7 +90,9 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then # SATA: # ATA Version is: 8 # - type=$(echo "$raw_out" | grep -m 1 -Eo '^ATA|SAS$') + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # out=$(echo "$raw_out" | awk ' # SAS specific /read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} @@ -54,10 +101,11 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Elements in grown defect list/{print "defect="$6} # SAS common +/SAS/{type="sas"} /Drive Temperature:/{print "temp="$4} # Status can be a long string, substitute spaces for '_' /SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} -/number of hours powered up/{print "hours_on="$7} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} /Serial number:/{print "serial="$3} # SATA specific @@ -70,40 +118,111 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Power_Cycle_Count/{print "pwr_cyc="$10} # SATA common +/SATA/{type="sata"} /Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} /SMART overall-health self-assessment test result:/{print "health="$6} -/Power_On_Hours/{print "hours_on="$10} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} /Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; -END {ORS="\n"; print ""} + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} '); fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) -# if type is not set by now, either we don't have a block device -# or smartctl failed. Either way, default to ATA and set out to -# nothing +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. if [ -z "$type" ]; then - type="ATA" + type="sata" out= fi case $script in smart) # Print temperature plus common predictors of drive failure - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="temp|health|r_ucor|w_ucor" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" fi ;; smartx) # Print some other interesting stats - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="hours_on|defect|nonmed|r_proc|w_proc" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then scripts="hours_on|pwr_cyc" fi ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; *) scripts="$script" esac diff --git a/cmd/zpool/zpool.d/cmd_to b/cmd/zpool/zpool.d/cmd_to index 3721f30e..64b5f6e4 100755 --- a/cmd/zpool/zpool.d/cmd_to +++ b/cmd/zpool/zpool.d/cmd_to @@ -23,8 +23,45 @@ off_ucor: Show SMART offline uncorrectable errors (ATA). ata_err: Show SMART ATA errors (ATA). pwr_cyc: Show SMART power cycle count (ATA). serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). " +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + script=$(basename "$0") if [ "$1" = "-h" ] ; then @@ -34,10 +71,18 @@ fi smartctl_path=$(which smartctl) -if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then - raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi - # Are we a SAS or ATA drive? Look for the right line in smartctl: + # What kind of drive are we? Look for the right line in smartctl: # # SAS: # Transport protocol: SAS @@ -45,7 +90,9 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then # SATA: # ATA Version is: 8 # - type=$(echo "$raw_out" | grep -m 1 -Eo '^ATA|SAS$') + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # out=$(echo "$raw_out" | awk ' # SAS specific /read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} @@ -54,10 +101,11 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Elements in grown defect list/{print "defect="$6} # SAS common +/SAS/{type="sas"} /Drive Temperature:/{print "temp="$4} # Status can be a long string, substitute spaces for '_' /SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} -/number of hours powered up/{print "hours_on="$7} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} /Serial number:/{print "serial="$3} # SATA specific @@ -70,40 +118,111 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Power_Cycle_Count/{print "pwr_cyc="$10} # SATA common +/SATA/{type="sata"} /Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} /SMART overall-health self-assessment test result:/{print "health="$6} -/Power_On_Hours/{print "hours_on="$10} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} /Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; -END {ORS="\n"; print ""} + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} '); fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) -# if type is not set by now, either we don't have a block device -# or smartctl failed. Either way, default to ATA and set out to -# nothing +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. if [ -z "$type" ]; then - type="ATA" + type="sata" out= fi case $script in smart) # Print temperature plus common predictors of drive failure - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="temp|health|r_ucor|w_ucor" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" fi ;; smartx) # Print some other interesting stats - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="hours_on|defect|nonmed|r_proc|w_proc" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then scripts="hours_on|pwr_cyc" fi ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; *) scripts="$script" esac diff --git a/cmd/zpool/zpool.d/defect b/cmd/zpool/zpool.d/defect index 3721f30e..64b5f6e4 100755 --- a/cmd/zpool/zpool.d/defect +++ b/cmd/zpool/zpool.d/defect @@ -23,8 +23,45 @@ off_ucor: Show SMART offline uncorrectable errors (ATA). ata_err: Show SMART ATA errors (ATA). pwr_cyc: Show SMART power cycle count (ATA). serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). " +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + script=$(basename "$0") if [ "$1" = "-h" ] ; then @@ -34,10 +71,18 @@ fi smartctl_path=$(which smartctl) -if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then - raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi - # Are we a SAS or ATA drive? Look for the right line in smartctl: + # What kind of drive are we? Look for the right line in smartctl: # # SAS: # Transport protocol: SAS @@ -45,7 +90,9 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then # SATA: # ATA Version is: 8 # - type=$(echo "$raw_out" | grep -m 1 -Eo '^ATA|SAS$') + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # out=$(echo "$raw_out" | awk ' # SAS specific /read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} @@ -54,10 +101,11 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Elements in grown defect list/{print "defect="$6} # SAS common +/SAS/{type="sas"} /Drive Temperature:/{print "temp="$4} # Status can be a long string, substitute spaces for '_' /SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} -/number of hours powered up/{print "hours_on="$7} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} /Serial number:/{print "serial="$3} # SATA specific @@ -70,40 +118,111 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Power_Cycle_Count/{print "pwr_cyc="$10} # SATA common +/SATA/{type="sata"} /Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} /SMART overall-health self-assessment test result:/{print "health="$6} -/Power_On_Hours/{print "hours_on="$10} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} /Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; -END {ORS="\n"; print ""} + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} '); fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) -# if type is not set by now, either we don't have a block device -# or smartctl failed. Either way, default to ATA and set out to -# nothing +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. if [ -z "$type" ]; then - type="ATA" + type="sata" out= fi case $script in smart) # Print temperature plus common predictors of drive failure - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="temp|health|r_ucor|w_ucor" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" fi ;; smartx) # Print some other interesting stats - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="hours_on|defect|nonmed|r_proc|w_proc" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then scripts="hours_on|pwr_cyc" fi ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; *) scripts="$script" esac diff --git a/cmd/zpool/zpool.d/health b/cmd/zpool/zpool.d/health index 3721f30e..64b5f6e4 100755 --- a/cmd/zpool/zpool.d/health +++ b/cmd/zpool/zpool.d/health @@ -23,8 +23,45 @@ off_ucor: Show SMART offline uncorrectable errors (ATA). ata_err: Show SMART ATA errors (ATA). pwr_cyc: Show SMART power cycle count (ATA). serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). " +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + script=$(basename "$0") if [ "$1" = "-h" ] ; then @@ -34,10 +71,18 @@ fi smartctl_path=$(which smartctl) -if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then - raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi - # Are we a SAS or ATA drive? Look for the right line in smartctl: + # What kind of drive are we? Look for the right line in smartctl: # # SAS: # Transport protocol: SAS @@ -45,7 +90,9 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then # SATA: # ATA Version is: 8 # - type=$(echo "$raw_out" | grep -m 1 -Eo '^ATA|SAS$') + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # out=$(echo "$raw_out" | awk ' # SAS specific /read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} @@ -54,10 +101,11 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Elements in grown defect list/{print "defect="$6} # SAS common +/SAS/{type="sas"} /Drive Temperature:/{print "temp="$4} # Status can be a long string, substitute spaces for '_' /SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} -/number of hours powered up/{print "hours_on="$7} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} /Serial number:/{print "serial="$3} # SATA specific @@ -70,40 +118,111 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Power_Cycle_Count/{print "pwr_cyc="$10} # SATA common +/SATA/{type="sata"} /Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} /SMART overall-health self-assessment test result:/{print "health="$6} -/Power_On_Hours/{print "hours_on="$10} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} /Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; -END {ORS="\n"; print ""} + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} '); fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) -# if type is not set by now, either we don't have a block device -# or smartctl failed. Either way, default to ATA and set out to -# nothing +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. if [ -z "$type" ]; then - type="ATA" + type="sata" out= fi case $script in smart) # Print temperature plus common predictors of drive failure - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="temp|health|r_ucor|w_ucor" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" fi ;; smartx) # Print some other interesting stats - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="hours_on|defect|nonmed|r_proc|w_proc" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then scripts="hours_on|pwr_cyc" fi ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; *) scripts="$script" esac diff --git a/cmd/zpool/zpool.d/hours_on b/cmd/zpool/zpool.d/hours_on index 3721f30e..64b5f6e4 100755 --- a/cmd/zpool/zpool.d/hours_on +++ b/cmd/zpool/zpool.d/hours_on @@ -23,8 +23,45 @@ off_ucor: Show SMART offline uncorrectable errors (ATA). ata_err: Show SMART ATA errors (ATA). pwr_cyc: Show SMART power cycle count (ATA). serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). " +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + script=$(basename "$0") if [ "$1" = "-h" ] ; then @@ -34,10 +71,18 @@ fi smartctl_path=$(which smartctl) -if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then - raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi - # Are we a SAS or ATA drive? Look for the right line in smartctl: + # What kind of drive are we? Look for the right line in smartctl: # # SAS: # Transport protocol: SAS @@ -45,7 +90,9 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then # SATA: # ATA Version is: 8 # - type=$(echo "$raw_out" | grep -m 1 -Eo '^ATA|SAS$') + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # out=$(echo "$raw_out" | awk ' # SAS specific /read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} @@ -54,10 +101,11 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Elements in grown defect list/{print "defect="$6} # SAS common +/SAS/{type="sas"} /Drive Temperature:/{print "temp="$4} # Status can be a long string, substitute spaces for '_' /SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} -/number of hours powered up/{print "hours_on="$7} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} /Serial number:/{print "serial="$3} # SATA specific @@ -70,40 +118,111 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Power_Cycle_Count/{print "pwr_cyc="$10} # SATA common +/SATA/{type="sata"} /Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} /SMART overall-health self-assessment test result:/{print "health="$6} -/Power_On_Hours/{print "hours_on="$10} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} /Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; -END {ORS="\n"; print ""} + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} '); fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) -# if type is not set by now, either we don't have a block device -# or smartctl failed. Either way, default to ATA and set out to -# nothing +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. if [ -z "$type" ]; then - type="ATA" + type="sata" out= fi case $script in smart) # Print temperature plus common predictors of drive failure - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="temp|health|r_ucor|w_ucor" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" fi ;; smartx) # Print some other interesting stats - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="hours_on|defect|nonmed|r_proc|w_proc" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then scripts="hours_on|pwr_cyc" fi ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; *) scripts="$script" esac diff --git a/cmd/zpool/zpool.d/nonmed b/cmd/zpool/zpool.d/nonmed index 3721f30e..64b5f6e4 100755 --- a/cmd/zpool/zpool.d/nonmed +++ b/cmd/zpool/zpool.d/nonmed @@ -23,8 +23,45 @@ off_ucor: Show SMART offline uncorrectable errors (ATA). ata_err: Show SMART ATA errors (ATA). pwr_cyc: Show SMART power cycle count (ATA). serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). " +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + script=$(basename "$0") if [ "$1" = "-h" ] ; then @@ -34,10 +71,18 @@ fi smartctl_path=$(which smartctl) -if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then - raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi - # Are we a SAS or ATA drive? Look for the right line in smartctl: + # What kind of drive are we? Look for the right line in smartctl: # # SAS: # Transport protocol: SAS @@ -45,7 +90,9 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then # SATA: # ATA Version is: 8 # - type=$(echo "$raw_out" | grep -m 1 -Eo '^ATA|SAS$') + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # out=$(echo "$raw_out" | awk ' # SAS specific /read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} @@ -54,10 +101,11 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Elements in grown defect list/{print "defect="$6} # SAS common +/SAS/{type="sas"} /Drive Temperature:/{print "temp="$4} # Status can be a long string, substitute spaces for '_' /SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} -/number of hours powered up/{print "hours_on="$7} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} /Serial number:/{print "serial="$3} # SATA specific @@ -70,40 +118,111 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Power_Cycle_Count/{print "pwr_cyc="$10} # SATA common +/SATA/{type="sata"} /Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} /SMART overall-health self-assessment test result:/{print "health="$6} -/Power_On_Hours/{print "hours_on="$10} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} /Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; -END {ORS="\n"; print ""} + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} '); fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) -# if type is not set by now, either we don't have a block device -# or smartctl failed. Either way, default to ATA and set out to -# nothing +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. if [ -z "$type" ]; then - type="ATA" + type="sata" out= fi case $script in smart) # Print temperature plus common predictors of drive failure - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="temp|health|r_ucor|w_ucor" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" fi ;; smartx) # Print some other interesting stats - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="hours_on|defect|nonmed|r_proc|w_proc" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then scripts="hours_on|pwr_cyc" fi ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; *) scripts="$script" esac diff --git a/cmd/zpool/zpool.d/nvme_err b/cmd/zpool/zpool.d/nvme_err new file mode 100755 index 00000000..64b5f6e4 --- /dev/null +++ b/cmd/zpool/zpool.d/nvme_err @@ -0,0 +1,242 @@ +#!/bin/sh +# +# Show SMART stats +# + +helpstr=" +smart: Show SMART temperature and error stats (specific to drive type) +smartx: Show SMART extended drive stats (specific to drive type). +temp: Show SMART drive temperature in celsius (all drives). +health: Show reported SMART status (all drives). +r_proc: Show SMART read GBytes processed over drive lifetime (SAS). +w_proc: Show SMART write GBytes processed over drive lifetime (SAS). +r_ucor: Show SMART read uncorrectable errors (SAS). +w_ucor: Show SMART write uncorrectable errors (SAS). +nonmed: Show SMART non-medium errors (SAS). +defect: Show SMART grown defect list (SAS). +hours_on: Show number of hours drive powered on (all drives). +realloc: Show SMART reallocated sectors count (ATA). +rep_ucor: Show SMART reported uncorrectable count (ATA). +cmd_to: Show SMART command timeout count (ATA). +pend_sec: Show SMART current pending sector count (ATA). +off_ucor: Show SMART offline uncorrectable errors (ATA). +ata_err: Show SMART ATA errors (ATA). +pwr_cyc: Show SMART power cycle count (ATA). +serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). +" + +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + +script=$(basename "$0") + +if [ "$1" = "-h" ] ; then + echo "$helpstr" | grep "$script:" | tr -s '\t' | cut -f 2- + exit +fi + +smartctl_path=$(which smartctl) + +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi + + # What kind of drive are we? Look for the right line in smartctl: + # + # SAS: + # Transport protocol: SAS + # + # SATA: + # ATA Version is: 8 + # + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # + out=$(echo "$raw_out" | awk ' +# SAS specific +/read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} +/write:/{print "rwr="$4"\nw_cor="$5"\nw_proc="$7"\nw_ucor="$8} +/Non-medium error count/{print "nonmed="$4} +/Elements in grown defect list/{print "defect="$6} + +# SAS common +/SAS/{type="sas"} +/Drive Temperature:/{print "temp="$4} +# Status can be a long string, substitute spaces for '_' +/SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} +/Serial number:/{print "serial="$3} + +# SATA specific +/Reallocated_Sector_Ct/{print "realloc="$10} +/Reported_Uncorrect/{print "rep_ucor="$10} +/Command_Timeout/{print "cmd_to="$10} +/Current_Pending_Sector/{print "pend_sec="$10} +/Offline_Uncorrectable/{print "off_ucor="$10} +/ATA Error Count:/{print "ata_err="$4} +/Power_Cycle_Count/{print "pwr_cyc="$10} + +# SATA common +/SATA/{type="sata"} +/Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} +/Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; + + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} +'); +fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) + +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. +if [ -z "$type" ]; then + type="sata" + out= +fi + +case $script in +smart) + # Print temperature plus common predictors of drive failure + if [ "$type" = "sas" ] ; then + scripts="temp|health|r_ucor|w_ucor" + elif [ "$type" = "sata" ] ; then + scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" + fi + ;; +smartx) + # Print some other interesting stats + if [ "$type" = "sas" ] ; then + scripts="hours_on|defect|nonmed|r_proc|w_proc" + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then + scripts="hours_on|pwr_cyc" + fi + ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; +*) + scripts="$script" +esac + +with_vals=$(echo "$out" | grep -E "$scripts") +if [ ! -z "$with_vals" ]; then + echo "$with_vals" + without_vals=$(echo "$scripts" | tr "|" "\n" | + grep -v -E "$(echo "$with_vals" | + awk -F "=" '{print $1}')" | awk '{print $0"="}') +else + without_vals=$(echo "$scripts" | tr "|" "\n" | awk '{print $0"="}') +fi + +if [ ! -z "$without_vals" ]; then + echo "$without_vals" +fi diff --git a/cmd/zpool/zpool.d/off_ucor b/cmd/zpool/zpool.d/off_ucor index 3721f30e..64b5f6e4 100755 --- a/cmd/zpool/zpool.d/off_ucor +++ b/cmd/zpool/zpool.d/off_ucor @@ -23,8 +23,45 @@ off_ucor: Show SMART offline uncorrectable errors (ATA). ata_err: Show SMART ATA errors (ATA). pwr_cyc: Show SMART power cycle count (ATA). serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). " +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + script=$(basename "$0") if [ "$1" = "-h" ] ; then @@ -34,10 +71,18 @@ fi smartctl_path=$(which smartctl) -if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then - raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi - # Are we a SAS or ATA drive? Look for the right line in smartctl: + # What kind of drive are we? Look for the right line in smartctl: # # SAS: # Transport protocol: SAS @@ -45,7 +90,9 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then # SATA: # ATA Version is: 8 # - type=$(echo "$raw_out" | grep -m 1 -Eo '^ATA|SAS$') + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # out=$(echo "$raw_out" | awk ' # SAS specific /read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} @@ -54,10 +101,11 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Elements in grown defect list/{print "defect="$6} # SAS common +/SAS/{type="sas"} /Drive Temperature:/{print "temp="$4} # Status can be a long string, substitute spaces for '_' /SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} -/number of hours powered up/{print "hours_on="$7} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} /Serial number:/{print "serial="$3} # SATA specific @@ -70,40 +118,111 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Power_Cycle_Count/{print "pwr_cyc="$10} # SATA common +/SATA/{type="sata"} /Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} /SMART overall-health self-assessment test result:/{print "health="$6} -/Power_On_Hours/{print "hours_on="$10} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} /Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; -END {ORS="\n"; print ""} + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} '); fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) -# if type is not set by now, either we don't have a block device -# or smartctl failed. Either way, default to ATA and set out to -# nothing +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. if [ -z "$type" ]; then - type="ATA" + type="sata" out= fi case $script in smart) # Print temperature plus common predictors of drive failure - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="temp|health|r_ucor|w_ucor" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" fi ;; smartx) # Print some other interesting stats - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="hours_on|defect|nonmed|r_proc|w_proc" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then scripts="hours_on|pwr_cyc" fi ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; *) scripts="$script" esac diff --git a/cmd/zpool/zpool.d/pend_sec b/cmd/zpool/zpool.d/pend_sec index 3721f30e..64b5f6e4 100755 --- a/cmd/zpool/zpool.d/pend_sec +++ b/cmd/zpool/zpool.d/pend_sec @@ -23,8 +23,45 @@ off_ucor: Show SMART offline uncorrectable errors (ATA). ata_err: Show SMART ATA errors (ATA). pwr_cyc: Show SMART power cycle count (ATA). serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). " +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + script=$(basename "$0") if [ "$1" = "-h" ] ; then @@ -34,10 +71,18 @@ fi smartctl_path=$(which smartctl) -if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then - raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi - # Are we a SAS or ATA drive? Look for the right line in smartctl: + # What kind of drive are we? Look for the right line in smartctl: # # SAS: # Transport protocol: SAS @@ -45,7 +90,9 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then # SATA: # ATA Version is: 8 # - type=$(echo "$raw_out" | grep -m 1 -Eo '^ATA|SAS$') + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # out=$(echo "$raw_out" | awk ' # SAS specific /read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} @@ -54,10 +101,11 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Elements in grown defect list/{print "defect="$6} # SAS common +/SAS/{type="sas"} /Drive Temperature:/{print "temp="$4} # Status can be a long string, substitute spaces for '_' /SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} -/number of hours powered up/{print "hours_on="$7} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} /Serial number:/{print "serial="$3} # SATA specific @@ -70,40 +118,111 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Power_Cycle_Count/{print "pwr_cyc="$10} # SATA common +/SATA/{type="sata"} /Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} /SMART overall-health self-assessment test result:/{print "health="$6} -/Power_On_Hours/{print "hours_on="$10} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} /Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; -END {ORS="\n"; print ""} + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} '); fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) -# if type is not set by now, either we don't have a block device -# or smartctl failed. Either way, default to ATA and set out to -# nothing +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. if [ -z "$type" ]; then - type="ATA" + type="sata" out= fi case $script in smart) # Print temperature plus common predictors of drive failure - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="temp|health|r_ucor|w_ucor" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" fi ;; smartx) # Print some other interesting stats - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="hours_on|defect|nonmed|r_proc|w_proc" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then scripts="hours_on|pwr_cyc" fi ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; *) scripts="$script" esac diff --git a/cmd/zpool/zpool.d/pwr_cyc b/cmd/zpool/zpool.d/pwr_cyc index 3721f30e..64b5f6e4 100755 --- a/cmd/zpool/zpool.d/pwr_cyc +++ b/cmd/zpool/zpool.d/pwr_cyc @@ -23,8 +23,45 @@ off_ucor: Show SMART offline uncorrectable errors (ATA). ata_err: Show SMART ATA errors (ATA). pwr_cyc: Show SMART power cycle count (ATA). serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). " +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + script=$(basename "$0") if [ "$1" = "-h" ] ; then @@ -34,10 +71,18 @@ fi smartctl_path=$(which smartctl) -if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then - raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi - # Are we a SAS or ATA drive? Look for the right line in smartctl: + # What kind of drive are we? Look for the right line in smartctl: # # SAS: # Transport protocol: SAS @@ -45,7 +90,9 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then # SATA: # ATA Version is: 8 # - type=$(echo "$raw_out" | grep -m 1 -Eo '^ATA|SAS$') + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # out=$(echo "$raw_out" | awk ' # SAS specific /read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} @@ -54,10 +101,11 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Elements in grown defect list/{print "defect="$6} # SAS common +/SAS/{type="sas"} /Drive Temperature:/{print "temp="$4} # Status can be a long string, substitute spaces for '_' /SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} -/number of hours powered up/{print "hours_on="$7} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} /Serial number:/{print "serial="$3} # SATA specific @@ -70,40 +118,111 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Power_Cycle_Count/{print "pwr_cyc="$10} # SATA common +/SATA/{type="sata"} /Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} /SMART overall-health self-assessment test result:/{print "health="$6} -/Power_On_Hours/{print "hours_on="$10} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} /Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; -END {ORS="\n"; print ""} + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} '); fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) -# if type is not set by now, either we don't have a block device -# or smartctl failed. Either way, default to ATA and set out to -# nothing +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. if [ -z "$type" ]; then - type="ATA" + type="sata" out= fi case $script in smart) # Print temperature plus common predictors of drive failure - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="temp|health|r_ucor|w_ucor" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" fi ;; smartx) # Print some other interesting stats - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="hours_on|defect|nonmed|r_proc|w_proc" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then scripts="hours_on|pwr_cyc" fi ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; *) scripts="$script" esac diff --git a/cmd/zpool/zpool.d/r_proc b/cmd/zpool/zpool.d/r_proc index 3721f30e..64b5f6e4 100755 --- a/cmd/zpool/zpool.d/r_proc +++ b/cmd/zpool/zpool.d/r_proc @@ -23,8 +23,45 @@ off_ucor: Show SMART offline uncorrectable errors (ATA). ata_err: Show SMART ATA errors (ATA). pwr_cyc: Show SMART power cycle count (ATA). serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). " +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + script=$(basename "$0") if [ "$1" = "-h" ] ; then @@ -34,10 +71,18 @@ fi smartctl_path=$(which smartctl) -if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then - raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi - # Are we a SAS or ATA drive? Look for the right line in smartctl: + # What kind of drive are we? Look for the right line in smartctl: # # SAS: # Transport protocol: SAS @@ -45,7 +90,9 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then # SATA: # ATA Version is: 8 # - type=$(echo "$raw_out" | grep -m 1 -Eo '^ATA|SAS$') + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # out=$(echo "$raw_out" | awk ' # SAS specific /read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} @@ -54,10 +101,11 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Elements in grown defect list/{print "defect="$6} # SAS common +/SAS/{type="sas"} /Drive Temperature:/{print "temp="$4} # Status can be a long string, substitute spaces for '_' /SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} -/number of hours powered up/{print "hours_on="$7} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} /Serial number:/{print "serial="$3} # SATA specific @@ -70,40 +118,111 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Power_Cycle_Count/{print "pwr_cyc="$10} # SATA common +/SATA/{type="sata"} /Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} /SMART overall-health self-assessment test result:/{print "health="$6} -/Power_On_Hours/{print "hours_on="$10} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} /Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; -END {ORS="\n"; print ""} + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} '); fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) -# if type is not set by now, either we don't have a block device -# or smartctl failed. Either way, default to ATA and set out to -# nothing +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. if [ -z "$type" ]; then - type="ATA" + type="sata" out= fi case $script in smart) # Print temperature plus common predictors of drive failure - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="temp|health|r_ucor|w_ucor" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" fi ;; smartx) # Print some other interesting stats - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="hours_on|defect|nonmed|r_proc|w_proc" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then scripts="hours_on|pwr_cyc" fi ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; *) scripts="$script" esac diff --git a/cmd/zpool/zpool.d/r_ucor b/cmd/zpool/zpool.d/r_ucor index 3721f30e..64b5f6e4 100755 --- a/cmd/zpool/zpool.d/r_ucor +++ b/cmd/zpool/zpool.d/r_ucor @@ -23,8 +23,45 @@ off_ucor: Show SMART offline uncorrectable errors (ATA). ata_err: Show SMART ATA errors (ATA). pwr_cyc: Show SMART power cycle count (ATA). serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). " +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + script=$(basename "$0") if [ "$1" = "-h" ] ; then @@ -34,10 +71,18 @@ fi smartctl_path=$(which smartctl) -if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then - raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi - # Are we a SAS or ATA drive? Look for the right line in smartctl: + # What kind of drive are we? Look for the right line in smartctl: # # SAS: # Transport protocol: SAS @@ -45,7 +90,9 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then # SATA: # ATA Version is: 8 # - type=$(echo "$raw_out" | grep -m 1 -Eo '^ATA|SAS$') + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # out=$(echo "$raw_out" | awk ' # SAS specific /read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} @@ -54,10 +101,11 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Elements in grown defect list/{print "defect="$6} # SAS common +/SAS/{type="sas"} /Drive Temperature:/{print "temp="$4} # Status can be a long string, substitute spaces for '_' /SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} -/number of hours powered up/{print "hours_on="$7} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} /Serial number:/{print "serial="$3} # SATA specific @@ -70,40 +118,111 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Power_Cycle_Count/{print "pwr_cyc="$10} # SATA common +/SATA/{type="sata"} /Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} /SMART overall-health self-assessment test result:/{print "health="$6} -/Power_On_Hours/{print "hours_on="$10} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} /Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; -END {ORS="\n"; print ""} + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} '); fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) -# if type is not set by now, either we don't have a block device -# or smartctl failed. Either way, default to ATA and set out to -# nothing +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. if [ -z "$type" ]; then - type="ATA" + type="sata" out= fi case $script in smart) # Print temperature plus common predictors of drive failure - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="temp|health|r_ucor|w_ucor" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" fi ;; smartx) # Print some other interesting stats - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="hours_on|defect|nonmed|r_proc|w_proc" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then scripts="hours_on|pwr_cyc" fi ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; *) scripts="$script" esac diff --git a/cmd/zpool/zpool.d/realloc b/cmd/zpool/zpool.d/realloc index 3721f30e..64b5f6e4 100755 --- a/cmd/zpool/zpool.d/realloc +++ b/cmd/zpool/zpool.d/realloc @@ -23,8 +23,45 @@ off_ucor: Show SMART offline uncorrectable errors (ATA). ata_err: Show SMART ATA errors (ATA). pwr_cyc: Show SMART power cycle count (ATA). serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). " +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + script=$(basename "$0") if [ "$1" = "-h" ] ; then @@ -34,10 +71,18 @@ fi smartctl_path=$(which smartctl) -if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then - raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi - # Are we a SAS or ATA drive? Look for the right line in smartctl: + # What kind of drive are we? Look for the right line in smartctl: # # SAS: # Transport protocol: SAS @@ -45,7 +90,9 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then # SATA: # ATA Version is: 8 # - type=$(echo "$raw_out" | grep -m 1 -Eo '^ATA|SAS$') + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # out=$(echo "$raw_out" | awk ' # SAS specific /read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} @@ -54,10 +101,11 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Elements in grown defect list/{print "defect="$6} # SAS common +/SAS/{type="sas"} /Drive Temperature:/{print "temp="$4} # Status can be a long string, substitute spaces for '_' /SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} -/number of hours powered up/{print "hours_on="$7} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} /Serial number:/{print "serial="$3} # SATA specific @@ -70,40 +118,111 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Power_Cycle_Count/{print "pwr_cyc="$10} # SATA common +/SATA/{type="sata"} /Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} /SMART overall-health self-assessment test result:/{print "health="$6} -/Power_On_Hours/{print "hours_on="$10} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} /Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; -END {ORS="\n"; print ""} + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} '); fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) -# if type is not set by now, either we don't have a block device -# or smartctl failed. Either way, default to ATA and set out to -# nothing +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. if [ -z "$type" ]; then - type="ATA" + type="sata" out= fi case $script in smart) # Print temperature plus common predictors of drive failure - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="temp|health|r_ucor|w_ucor" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" fi ;; smartx) # Print some other interesting stats - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="hours_on|defect|nonmed|r_proc|w_proc" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then scripts="hours_on|pwr_cyc" fi ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; *) scripts="$script" esac diff --git a/cmd/zpool/zpool.d/rep_ucor b/cmd/zpool/zpool.d/rep_ucor index 3721f30e..64b5f6e4 100755 --- a/cmd/zpool/zpool.d/rep_ucor +++ b/cmd/zpool/zpool.d/rep_ucor @@ -23,8 +23,45 @@ off_ucor: Show SMART offline uncorrectable errors (ATA). ata_err: Show SMART ATA errors (ATA). pwr_cyc: Show SMART power cycle count (ATA). serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). " +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + script=$(basename "$0") if [ "$1" = "-h" ] ; then @@ -34,10 +71,18 @@ fi smartctl_path=$(which smartctl) -if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then - raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi - # Are we a SAS or ATA drive? Look for the right line in smartctl: + # What kind of drive are we? Look for the right line in smartctl: # # SAS: # Transport protocol: SAS @@ -45,7 +90,9 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then # SATA: # ATA Version is: 8 # - type=$(echo "$raw_out" | grep -m 1 -Eo '^ATA|SAS$') + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # out=$(echo "$raw_out" | awk ' # SAS specific /read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} @@ -54,10 +101,11 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Elements in grown defect list/{print "defect="$6} # SAS common +/SAS/{type="sas"} /Drive Temperature:/{print "temp="$4} # Status can be a long string, substitute spaces for '_' /SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} -/number of hours powered up/{print "hours_on="$7} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} /Serial number:/{print "serial="$3} # SATA specific @@ -70,40 +118,111 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Power_Cycle_Count/{print "pwr_cyc="$10} # SATA common +/SATA/{type="sata"} /Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} /SMART overall-health self-assessment test result:/{print "health="$6} -/Power_On_Hours/{print "hours_on="$10} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} /Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; -END {ORS="\n"; print ""} + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} '); fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) -# if type is not set by now, either we don't have a block device -# or smartctl failed. Either way, default to ATA and set out to -# nothing +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. if [ -z "$type" ]; then - type="ATA" + type="sata" out= fi case $script in smart) # Print temperature plus common predictors of drive failure - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="temp|health|r_ucor|w_ucor" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" fi ;; smartx) # Print some other interesting stats - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="hours_on|defect|nonmed|r_proc|w_proc" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then scripts="hours_on|pwr_cyc" fi ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; *) scripts="$script" esac diff --git a/cmd/zpool/zpool.d/serial b/cmd/zpool/zpool.d/serial index 3721f30e..64b5f6e4 100755 --- a/cmd/zpool/zpool.d/serial +++ b/cmd/zpool/zpool.d/serial @@ -23,8 +23,45 @@ off_ucor: Show SMART offline uncorrectable errors (ATA). ata_err: Show SMART ATA errors (ATA). pwr_cyc: Show SMART power cycle count (ATA). serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). " +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + script=$(basename "$0") if [ "$1" = "-h" ] ; then @@ -34,10 +71,18 @@ fi smartctl_path=$(which smartctl) -if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then - raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi - # Are we a SAS or ATA drive? Look for the right line in smartctl: + # What kind of drive are we? Look for the right line in smartctl: # # SAS: # Transport protocol: SAS @@ -45,7 +90,9 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then # SATA: # ATA Version is: 8 # - type=$(echo "$raw_out" | grep -m 1 -Eo '^ATA|SAS$') + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # out=$(echo "$raw_out" | awk ' # SAS specific /read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} @@ -54,10 +101,11 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Elements in grown defect list/{print "defect="$6} # SAS common +/SAS/{type="sas"} /Drive Temperature:/{print "temp="$4} # Status can be a long string, substitute spaces for '_' /SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} -/number of hours powered up/{print "hours_on="$7} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} /Serial number:/{print "serial="$3} # SATA specific @@ -70,40 +118,111 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Power_Cycle_Count/{print "pwr_cyc="$10} # SATA common +/SATA/{type="sata"} /Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} /SMART overall-health self-assessment test result:/{print "health="$6} -/Power_On_Hours/{print "hours_on="$10} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} /Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; -END {ORS="\n"; print ""} + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} '); fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) -# if type is not set by now, either we don't have a block device -# or smartctl failed. Either way, default to ATA and set out to -# nothing +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. if [ -z "$type" ]; then - type="ATA" + type="sata" out= fi case $script in smart) # Print temperature plus common predictors of drive failure - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="temp|health|r_ucor|w_ucor" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" fi ;; smartx) # Print some other interesting stats - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="hours_on|defect|nonmed|r_proc|w_proc" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then scripts="hours_on|pwr_cyc" fi ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; *) scripts="$script" esac diff --git a/cmd/zpool/zpool.d/smart b/cmd/zpool/zpool.d/smart index 3721f30e..64b5f6e4 100755 --- a/cmd/zpool/zpool.d/smart +++ b/cmd/zpool/zpool.d/smart @@ -23,8 +23,45 @@ off_ucor: Show SMART offline uncorrectable errors (ATA). ata_err: Show SMART ATA errors (ATA). pwr_cyc: Show SMART power cycle count (ATA). serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). " +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + script=$(basename "$0") if [ "$1" = "-h" ] ; then @@ -34,10 +71,18 @@ fi smartctl_path=$(which smartctl) -if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then - raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi - # Are we a SAS or ATA drive? Look for the right line in smartctl: + # What kind of drive are we? Look for the right line in smartctl: # # SAS: # Transport protocol: SAS @@ -45,7 +90,9 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then # SATA: # ATA Version is: 8 # - type=$(echo "$raw_out" | grep -m 1 -Eo '^ATA|SAS$') + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # out=$(echo "$raw_out" | awk ' # SAS specific /read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} @@ -54,10 +101,11 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Elements in grown defect list/{print "defect="$6} # SAS common +/SAS/{type="sas"} /Drive Temperature:/{print "temp="$4} # Status can be a long string, substitute spaces for '_' /SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} -/number of hours powered up/{print "hours_on="$7} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} /Serial number:/{print "serial="$3} # SATA specific @@ -70,40 +118,111 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Power_Cycle_Count/{print "pwr_cyc="$10} # SATA common +/SATA/{type="sata"} /Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} /SMART overall-health self-assessment test result:/{print "health="$6} -/Power_On_Hours/{print "hours_on="$10} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} /Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; -END {ORS="\n"; print ""} + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} '); fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) -# if type is not set by now, either we don't have a block device -# or smartctl failed. Either way, default to ATA and set out to -# nothing +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. if [ -z "$type" ]; then - type="ATA" + type="sata" out= fi case $script in smart) # Print temperature plus common predictors of drive failure - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="temp|health|r_ucor|w_ucor" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" fi ;; smartx) # Print some other interesting stats - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="hours_on|defect|nonmed|r_proc|w_proc" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then scripts="hours_on|pwr_cyc" fi ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; *) scripts="$script" esac diff --git a/cmd/zpool/zpool.d/smart_test b/cmd/zpool/zpool.d/smart_test new file mode 100755 index 00000000..64b5f6e4 --- /dev/null +++ b/cmd/zpool/zpool.d/smart_test @@ -0,0 +1,242 @@ +#!/bin/sh +# +# Show SMART stats +# + +helpstr=" +smart: Show SMART temperature and error stats (specific to drive type) +smartx: Show SMART extended drive stats (specific to drive type). +temp: Show SMART drive temperature in celsius (all drives). +health: Show reported SMART status (all drives). +r_proc: Show SMART read GBytes processed over drive lifetime (SAS). +w_proc: Show SMART write GBytes processed over drive lifetime (SAS). +r_ucor: Show SMART read uncorrectable errors (SAS). +w_ucor: Show SMART write uncorrectable errors (SAS). +nonmed: Show SMART non-medium errors (SAS). +defect: Show SMART grown defect list (SAS). +hours_on: Show number of hours drive powered on (all drives). +realloc: Show SMART reallocated sectors count (ATA). +rep_ucor: Show SMART reported uncorrectable count (ATA). +cmd_to: Show SMART command timeout count (ATA). +pend_sec: Show SMART current pending sector count (ATA). +off_ucor: Show SMART offline uncorrectable errors (ATA). +ata_err: Show SMART ATA errors (ATA). +pwr_cyc: Show SMART power cycle count (ATA). +serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). +" + +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + +script=$(basename "$0") + +if [ "$1" = "-h" ] ; then + echo "$helpstr" | grep "$script:" | tr -s '\t' | cut -f 2- + exit +fi + +smartctl_path=$(which smartctl) + +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi + + # What kind of drive are we? Look for the right line in smartctl: + # + # SAS: + # Transport protocol: SAS + # + # SATA: + # ATA Version is: 8 + # + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # + out=$(echo "$raw_out" | awk ' +# SAS specific +/read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} +/write:/{print "rwr="$4"\nw_cor="$5"\nw_proc="$7"\nw_ucor="$8} +/Non-medium error count/{print "nonmed="$4} +/Elements in grown defect list/{print "defect="$6} + +# SAS common +/SAS/{type="sas"} +/Drive Temperature:/{print "temp="$4} +# Status can be a long string, substitute spaces for '_' +/SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} +/Serial number:/{print "serial="$3} + +# SATA specific +/Reallocated_Sector_Ct/{print "realloc="$10} +/Reported_Uncorrect/{print "rep_ucor="$10} +/Command_Timeout/{print "cmd_to="$10} +/Current_Pending_Sector/{print "pend_sec="$10} +/Offline_Uncorrectable/{print "off_ucor="$10} +/ATA Error Count:/{print "ata_err="$4} +/Power_Cycle_Count/{print "pwr_cyc="$10} + +# SATA common +/SATA/{type="sata"} +/Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} +/Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; + + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} +'); +fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) + +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. +if [ -z "$type" ]; then + type="sata" + out= +fi + +case $script in +smart) + # Print temperature plus common predictors of drive failure + if [ "$type" = "sas" ] ; then + scripts="temp|health|r_ucor|w_ucor" + elif [ "$type" = "sata" ] ; then + scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" + fi + ;; +smartx) + # Print some other interesting stats + if [ "$type" = "sas" ] ; then + scripts="hours_on|defect|nonmed|r_proc|w_proc" + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then + scripts="hours_on|pwr_cyc" + fi + ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; +*) + scripts="$script" +esac + +with_vals=$(echo "$out" | grep -E "$scripts") +if [ ! -z "$with_vals" ]; then + echo "$with_vals" + without_vals=$(echo "$scripts" | tr "|" "\n" | + grep -v -E "$(echo "$with_vals" | + awk -F "=" '{print $1}')" | awk '{print $0"="}') +else + without_vals=$(echo "$scripts" | tr "|" "\n" | awk '{print $0"="}') +fi + +if [ ! -z "$without_vals" ]; then + echo "$without_vals" +fi diff --git a/cmd/zpool/zpool.d/smartx b/cmd/zpool/zpool.d/smartx index 3721f30e..64b5f6e4 100755 --- a/cmd/zpool/zpool.d/smartx +++ b/cmd/zpool/zpool.d/smartx @@ -23,8 +23,45 @@ off_ucor: Show SMART offline uncorrectable errors (ATA). ata_err: Show SMART ATA errors (ATA). pwr_cyc: Show SMART power cycle count (ATA). serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). " +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + script=$(basename "$0") if [ "$1" = "-h" ] ; then @@ -34,10 +71,18 @@ fi smartctl_path=$(which smartctl) -if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then - raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi - # Are we a SAS or ATA drive? Look for the right line in smartctl: + # What kind of drive are we? Look for the right line in smartctl: # # SAS: # Transport protocol: SAS @@ -45,7 +90,9 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then # SATA: # ATA Version is: 8 # - type=$(echo "$raw_out" | grep -m 1 -Eo '^ATA|SAS$') + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # out=$(echo "$raw_out" | awk ' # SAS specific /read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} @@ -54,10 +101,11 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Elements in grown defect list/{print "defect="$6} # SAS common +/SAS/{type="sas"} /Drive Temperature:/{print "temp="$4} # Status can be a long string, substitute spaces for '_' /SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} -/number of hours powered up/{print "hours_on="$7} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} /Serial number:/{print "serial="$3} # SATA specific @@ -70,40 +118,111 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Power_Cycle_Count/{print "pwr_cyc="$10} # SATA common +/SATA/{type="sata"} /Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} /SMART overall-health self-assessment test result:/{print "health="$6} -/Power_On_Hours/{print "hours_on="$10} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} /Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; -END {ORS="\n"; print ""} + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} '); fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) -# if type is not set by now, either we don't have a block device -# or smartctl failed. Either way, default to ATA and set out to -# nothing +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. if [ -z "$type" ]; then - type="ATA" + type="sata" out= fi case $script in smart) # Print temperature plus common predictors of drive failure - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="temp|health|r_ucor|w_ucor" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" fi ;; smartx) # Print some other interesting stats - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="hours_on|defect|nonmed|r_proc|w_proc" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then scripts="hours_on|pwr_cyc" fi ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; *) scripts="$script" esac diff --git a/cmd/zpool/zpool.d/temp b/cmd/zpool/zpool.d/temp index 3721f30e..64b5f6e4 100755 --- a/cmd/zpool/zpool.d/temp +++ b/cmd/zpool/zpool.d/temp @@ -23,8 +23,45 @@ off_ucor: Show SMART offline uncorrectable errors (ATA). ata_err: Show SMART ATA errors (ATA). pwr_cyc: Show SMART power cycle count (ATA). serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). " +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + script=$(basename "$0") if [ "$1" = "-h" ] ; then @@ -34,10 +71,18 @@ fi smartctl_path=$(which smartctl) -if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then - raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi - # Are we a SAS or ATA drive? Look for the right line in smartctl: + # What kind of drive are we? Look for the right line in smartctl: # # SAS: # Transport protocol: SAS @@ -45,7 +90,9 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then # SATA: # ATA Version is: 8 # - type=$(echo "$raw_out" | grep -m 1 -Eo '^ATA|SAS$') + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # out=$(echo "$raw_out" | awk ' # SAS specific /read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} @@ -54,10 +101,11 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Elements in grown defect list/{print "defect="$6} # SAS common +/SAS/{type="sas"} /Drive Temperature:/{print "temp="$4} # Status can be a long string, substitute spaces for '_' /SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} -/number of hours powered up/{print "hours_on="$7} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} /Serial number:/{print "serial="$3} # SATA specific @@ -70,40 +118,111 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Power_Cycle_Count/{print "pwr_cyc="$10} # SATA common +/SATA/{type="sata"} /Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} /SMART overall-health self-assessment test result:/{print "health="$6} -/Power_On_Hours/{print "hours_on="$10} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} /Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; -END {ORS="\n"; print ""} + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} '); fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) -# if type is not set by now, either we don't have a block device -# or smartctl failed. Either way, default to ATA and set out to -# nothing +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. if [ -z "$type" ]; then - type="ATA" + type="sata" out= fi case $script in smart) # Print temperature plus common predictors of drive failure - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="temp|health|r_ucor|w_ucor" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" fi ;; smartx) # Print some other interesting stats - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="hours_on|defect|nonmed|r_proc|w_proc" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then scripts="hours_on|pwr_cyc" fi ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; *) scripts="$script" esac diff --git a/cmd/zpool/zpool.d/test_ended b/cmd/zpool/zpool.d/test_ended new file mode 100755 index 00000000..64b5f6e4 --- /dev/null +++ b/cmd/zpool/zpool.d/test_ended @@ -0,0 +1,242 @@ +#!/bin/sh +# +# Show SMART stats +# + +helpstr=" +smart: Show SMART temperature and error stats (specific to drive type) +smartx: Show SMART extended drive stats (specific to drive type). +temp: Show SMART drive temperature in celsius (all drives). +health: Show reported SMART status (all drives). +r_proc: Show SMART read GBytes processed over drive lifetime (SAS). +w_proc: Show SMART write GBytes processed over drive lifetime (SAS). +r_ucor: Show SMART read uncorrectable errors (SAS). +w_ucor: Show SMART write uncorrectable errors (SAS). +nonmed: Show SMART non-medium errors (SAS). +defect: Show SMART grown defect list (SAS). +hours_on: Show number of hours drive powered on (all drives). +realloc: Show SMART reallocated sectors count (ATA). +rep_ucor: Show SMART reported uncorrectable count (ATA). +cmd_to: Show SMART command timeout count (ATA). +pend_sec: Show SMART current pending sector count (ATA). +off_ucor: Show SMART offline uncorrectable errors (ATA). +ata_err: Show SMART ATA errors (ATA). +pwr_cyc: Show SMART power cycle count (ATA). +serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). +" + +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + +script=$(basename "$0") + +if [ "$1" = "-h" ] ; then + echo "$helpstr" | grep "$script:" | tr -s '\t' | cut -f 2- + exit +fi + +smartctl_path=$(which smartctl) + +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi + + # What kind of drive are we? Look for the right line in smartctl: + # + # SAS: + # Transport protocol: SAS + # + # SATA: + # ATA Version is: 8 + # + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # + out=$(echo "$raw_out" | awk ' +# SAS specific +/read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} +/write:/{print "rwr="$4"\nw_cor="$5"\nw_proc="$7"\nw_ucor="$8} +/Non-medium error count/{print "nonmed="$4} +/Elements in grown defect list/{print "defect="$6} + +# SAS common +/SAS/{type="sas"} +/Drive Temperature:/{print "temp="$4} +# Status can be a long string, substitute spaces for '_' +/SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} +/Serial number:/{print "serial="$3} + +# SATA specific +/Reallocated_Sector_Ct/{print "realloc="$10} +/Reported_Uncorrect/{print "rep_ucor="$10} +/Command_Timeout/{print "cmd_to="$10} +/Current_Pending_Sector/{print "pend_sec="$10} +/Offline_Uncorrectable/{print "off_ucor="$10} +/ATA Error Count:/{print "ata_err="$4} +/Power_Cycle_Count/{print "pwr_cyc="$10} + +# SATA common +/SATA/{type="sata"} +/Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} +/Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; + + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} +'); +fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) + +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. +if [ -z "$type" ]; then + type="sata" + out= +fi + +case $script in +smart) + # Print temperature plus common predictors of drive failure + if [ "$type" = "sas" ] ; then + scripts="temp|health|r_ucor|w_ucor" + elif [ "$type" = "sata" ] ; then + scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" + fi + ;; +smartx) + # Print some other interesting stats + if [ "$type" = "sas" ] ; then + scripts="hours_on|defect|nonmed|r_proc|w_proc" + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then + scripts="hours_on|pwr_cyc" + fi + ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; +*) + scripts="$script" +esac + +with_vals=$(echo "$out" | grep -E "$scripts") +if [ ! -z "$with_vals" ]; then + echo "$with_vals" + without_vals=$(echo "$scripts" | tr "|" "\n" | + grep -v -E "$(echo "$with_vals" | + awk -F "=" '{print $1}')" | awk '{print $0"="}') +else + without_vals=$(echo "$scripts" | tr "|" "\n" | awk '{print $0"="}') +fi + +if [ ! -z "$without_vals" ]; then + echo "$without_vals" +fi diff --git a/cmd/zpool/zpool.d/test_progress b/cmd/zpool/zpool.d/test_progress new file mode 100755 index 00000000..64b5f6e4 --- /dev/null +++ b/cmd/zpool/zpool.d/test_progress @@ -0,0 +1,242 @@ +#!/bin/sh +# +# Show SMART stats +# + +helpstr=" +smart: Show SMART temperature and error stats (specific to drive type) +smartx: Show SMART extended drive stats (specific to drive type). +temp: Show SMART drive temperature in celsius (all drives). +health: Show reported SMART status (all drives). +r_proc: Show SMART read GBytes processed over drive lifetime (SAS). +w_proc: Show SMART write GBytes processed over drive lifetime (SAS). +r_ucor: Show SMART read uncorrectable errors (SAS). +w_ucor: Show SMART write uncorrectable errors (SAS). +nonmed: Show SMART non-medium errors (SAS). +defect: Show SMART grown defect list (SAS). +hours_on: Show number of hours drive powered on (all drives). +realloc: Show SMART reallocated sectors count (ATA). +rep_ucor: Show SMART reported uncorrectable count (ATA). +cmd_to: Show SMART command timeout count (ATA). +pend_sec: Show SMART current pending sector count (ATA). +off_ucor: Show SMART offline uncorrectable errors (ATA). +ata_err: Show SMART ATA errors (ATA). +pwr_cyc: Show SMART power cycle count (ATA). +serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). +" + +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + +script=$(basename "$0") + +if [ "$1" = "-h" ] ; then + echo "$helpstr" | grep "$script:" | tr -s '\t' | cut -f 2- + exit +fi + +smartctl_path=$(which smartctl) + +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi + + # What kind of drive are we? Look for the right line in smartctl: + # + # SAS: + # Transport protocol: SAS + # + # SATA: + # ATA Version is: 8 + # + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # + out=$(echo "$raw_out" | awk ' +# SAS specific +/read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} +/write:/{print "rwr="$4"\nw_cor="$5"\nw_proc="$7"\nw_ucor="$8} +/Non-medium error count/{print "nonmed="$4} +/Elements in grown defect list/{print "defect="$6} + +# SAS common +/SAS/{type="sas"} +/Drive Temperature:/{print "temp="$4} +# Status can be a long string, substitute spaces for '_' +/SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} +/Serial number:/{print "serial="$3} + +# SATA specific +/Reallocated_Sector_Ct/{print "realloc="$10} +/Reported_Uncorrect/{print "rep_ucor="$10} +/Command_Timeout/{print "cmd_to="$10} +/Current_Pending_Sector/{print "pend_sec="$10} +/Offline_Uncorrectable/{print "off_ucor="$10} +/ATA Error Count:/{print "ata_err="$4} +/Power_Cycle_Count/{print "pwr_cyc="$10} + +# SATA common +/SATA/{type="sata"} +/Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} +/Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; + + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} +'); +fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) + +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. +if [ -z "$type" ]; then + type="sata" + out= +fi + +case $script in +smart) + # Print temperature plus common predictors of drive failure + if [ "$type" = "sas" ] ; then + scripts="temp|health|r_ucor|w_ucor" + elif [ "$type" = "sata" ] ; then + scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" + fi + ;; +smartx) + # Print some other interesting stats + if [ "$type" = "sas" ] ; then + scripts="hours_on|defect|nonmed|r_proc|w_proc" + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then + scripts="hours_on|pwr_cyc" + fi + ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; +*) + scripts="$script" +esac + +with_vals=$(echo "$out" | grep -E "$scripts") +if [ ! -z "$with_vals" ]; then + echo "$with_vals" + without_vals=$(echo "$scripts" | tr "|" "\n" | + grep -v -E "$(echo "$with_vals" | + awk -F "=" '{print $1}')" | awk '{print $0"="}') +else + without_vals=$(echo "$scripts" | tr "|" "\n" | awk '{print $0"="}') +fi + +if [ ! -z "$without_vals" ]; then + echo "$without_vals" +fi diff --git a/cmd/zpool/zpool.d/test_status b/cmd/zpool/zpool.d/test_status new file mode 100755 index 00000000..64b5f6e4 --- /dev/null +++ b/cmd/zpool/zpool.d/test_status @@ -0,0 +1,242 @@ +#!/bin/sh +# +# Show SMART stats +# + +helpstr=" +smart: Show SMART temperature and error stats (specific to drive type) +smartx: Show SMART extended drive stats (specific to drive type). +temp: Show SMART drive temperature in celsius (all drives). +health: Show reported SMART status (all drives). +r_proc: Show SMART read GBytes processed over drive lifetime (SAS). +w_proc: Show SMART write GBytes processed over drive lifetime (SAS). +r_ucor: Show SMART read uncorrectable errors (SAS). +w_ucor: Show SMART write uncorrectable errors (SAS). +nonmed: Show SMART non-medium errors (SAS). +defect: Show SMART grown defect list (SAS). +hours_on: Show number of hours drive powered on (all drives). +realloc: Show SMART reallocated sectors count (ATA). +rep_ucor: Show SMART reported uncorrectable count (ATA). +cmd_to: Show SMART command timeout count (ATA). +pend_sec: Show SMART current pending sector count (ATA). +off_ucor: Show SMART offline uncorrectable errors (ATA). +ata_err: Show SMART ATA errors (ATA). +pwr_cyc: Show SMART power cycle count (ATA). +serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). +" + +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + +script=$(basename "$0") + +if [ "$1" = "-h" ] ; then + echo "$helpstr" | grep "$script:" | tr -s '\t' | cut -f 2- + exit +fi + +smartctl_path=$(which smartctl) + +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi + + # What kind of drive are we? Look for the right line in smartctl: + # + # SAS: + # Transport protocol: SAS + # + # SATA: + # ATA Version is: 8 + # + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # + out=$(echo "$raw_out" | awk ' +# SAS specific +/read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} +/write:/{print "rwr="$4"\nw_cor="$5"\nw_proc="$7"\nw_ucor="$8} +/Non-medium error count/{print "nonmed="$4} +/Elements in grown defect list/{print "defect="$6} + +# SAS common +/SAS/{type="sas"} +/Drive Temperature:/{print "temp="$4} +# Status can be a long string, substitute spaces for '_' +/SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} +/Serial number:/{print "serial="$3} + +# SATA specific +/Reallocated_Sector_Ct/{print "realloc="$10} +/Reported_Uncorrect/{print "rep_ucor="$10} +/Command_Timeout/{print "cmd_to="$10} +/Current_Pending_Sector/{print "pend_sec="$10} +/Offline_Uncorrectable/{print "off_ucor="$10} +/ATA Error Count:/{print "ata_err="$4} +/Power_Cycle_Count/{print "pwr_cyc="$10} + +# SATA common +/SATA/{type="sata"} +/Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} +/Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; + + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} +'); +fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) + +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. +if [ -z "$type" ]; then + type="sata" + out= +fi + +case $script in +smart) + # Print temperature plus common predictors of drive failure + if [ "$type" = "sas" ] ; then + scripts="temp|health|r_ucor|w_ucor" + elif [ "$type" = "sata" ] ; then + scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" + fi + ;; +smartx) + # Print some other interesting stats + if [ "$type" = "sas" ] ; then + scripts="hours_on|defect|nonmed|r_proc|w_proc" + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then + scripts="hours_on|pwr_cyc" + fi + ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; +*) + scripts="$script" +esac + +with_vals=$(echo "$out" | grep -E "$scripts") +if [ ! -z "$with_vals" ]; then + echo "$with_vals" + without_vals=$(echo "$scripts" | tr "|" "\n" | + grep -v -E "$(echo "$with_vals" | + awk -F "=" '{print $1}')" | awk '{print $0"="}') +else + without_vals=$(echo "$scripts" | tr "|" "\n" | awk '{print $0"="}') +fi + +if [ ! -z "$without_vals" ]; then + echo "$without_vals" +fi diff --git a/cmd/zpool/zpool.d/test_type b/cmd/zpool/zpool.d/test_type new file mode 100755 index 00000000..64b5f6e4 --- /dev/null +++ b/cmd/zpool/zpool.d/test_type @@ -0,0 +1,242 @@ +#!/bin/sh +# +# Show SMART stats +# + +helpstr=" +smart: Show SMART temperature and error stats (specific to drive type) +smartx: Show SMART extended drive stats (specific to drive type). +temp: Show SMART drive temperature in celsius (all drives). +health: Show reported SMART status (all drives). +r_proc: Show SMART read GBytes processed over drive lifetime (SAS). +w_proc: Show SMART write GBytes processed over drive lifetime (SAS). +r_ucor: Show SMART read uncorrectable errors (SAS). +w_ucor: Show SMART write uncorrectable errors (SAS). +nonmed: Show SMART non-medium errors (SAS). +defect: Show SMART grown defect list (SAS). +hours_on: Show number of hours drive powered on (all drives). +realloc: Show SMART reallocated sectors count (ATA). +rep_ucor: Show SMART reported uncorrectable count (ATA). +cmd_to: Show SMART command timeout count (ATA). +pend_sec: Show SMART current pending sector count (ATA). +off_ucor: Show SMART offline uncorrectable errors (ATA). +ata_err: Show SMART ATA errors (ATA). +pwr_cyc: Show SMART power cycle count (ATA). +serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). +" + +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + +script=$(basename "$0") + +if [ "$1" = "-h" ] ; then + echo "$helpstr" | grep "$script:" | tr -s '\t' | cut -f 2- + exit +fi + +smartctl_path=$(which smartctl) + +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi + + # What kind of drive are we? Look for the right line in smartctl: + # + # SAS: + # Transport protocol: SAS + # + # SATA: + # ATA Version is: 8 + # + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # + out=$(echo "$raw_out" | awk ' +# SAS specific +/read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} +/write:/{print "rwr="$4"\nw_cor="$5"\nw_proc="$7"\nw_ucor="$8} +/Non-medium error count/{print "nonmed="$4} +/Elements in grown defect list/{print "defect="$6} + +# SAS common +/SAS/{type="sas"} +/Drive Temperature:/{print "temp="$4} +# Status can be a long string, substitute spaces for '_' +/SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} +/Serial number:/{print "serial="$3} + +# SATA specific +/Reallocated_Sector_Ct/{print "realloc="$10} +/Reported_Uncorrect/{print "rep_ucor="$10} +/Command_Timeout/{print "cmd_to="$10} +/Current_Pending_Sector/{print "pend_sec="$10} +/Offline_Uncorrectable/{print "off_ucor="$10} +/ATA Error Count:/{print "ata_err="$4} +/Power_Cycle_Count/{print "pwr_cyc="$10} + +# SATA common +/SATA/{type="sata"} +/Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} +/Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; + + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} +'); +fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) + +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. +if [ -z "$type" ]; then + type="sata" + out= +fi + +case $script in +smart) + # Print temperature plus common predictors of drive failure + if [ "$type" = "sas" ] ; then + scripts="temp|health|r_ucor|w_ucor" + elif [ "$type" = "sata" ] ; then + scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" + fi + ;; +smartx) + # Print some other interesting stats + if [ "$type" = "sas" ] ; then + scripts="hours_on|defect|nonmed|r_proc|w_proc" + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then + scripts="hours_on|pwr_cyc" + fi + ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; +*) + scripts="$script" +esac + +with_vals=$(echo "$out" | grep -E "$scripts") +if [ ! -z "$with_vals" ]; then + echo "$with_vals" + without_vals=$(echo "$scripts" | tr "|" "\n" | + grep -v -E "$(echo "$with_vals" | + awk -F "=" '{print $1}')" | awk '{print $0"="}') +else + without_vals=$(echo "$scripts" | tr "|" "\n" | awk '{print $0"="}') +fi + +if [ ! -z "$without_vals" ]; then + echo "$without_vals" +fi diff --git a/cmd/zpool/zpool.d/w_proc b/cmd/zpool/zpool.d/w_proc index 3721f30e..64b5f6e4 100755 --- a/cmd/zpool/zpool.d/w_proc +++ b/cmd/zpool/zpool.d/w_proc @@ -23,8 +23,45 @@ off_ucor: Show SMART offline uncorrectable errors (ATA). ata_err: Show SMART ATA errors (ATA). pwr_cyc: Show SMART power cycle count (ATA). serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). " +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + script=$(basename "$0") if [ "$1" = "-h" ] ; then @@ -34,10 +71,18 @@ fi smartctl_path=$(which smartctl) -if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then - raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi - # Are we a SAS or ATA drive? Look for the right line in smartctl: + # What kind of drive are we? Look for the right line in smartctl: # # SAS: # Transport protocol: SAS @@ -45,7 +90,9 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then # SATA: # ATA Version is: 8 # - type=$(echo "$raw_out" | grep -m 1 -Eo '^ATA|SAS$') + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # out=$(echo "$raw_out" | awk ' # SAS specific /read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} @@ -54,10 +101,11 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Elements in grown defect list/{print "defect="$6} # SAS common +/SAS/{type="sas"} /Drive Temperature:/{print "temp="$4} # Status can be a long string, substitute spaces for '_' /SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} -/number of hours powered up/{print "hours_on="$7} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} /Serial number:/{print "serial="$3} # SATA specific @@ -70,40 +118,111 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Power_Cycle_Count/{print "pwr_cyc="$10} # SATA common +/SATA/{type="sata"} /Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} /SMART overall-health self-assessment test result:/{print "health="$6} -/Power_On_Hours/{print "hours_on="$10} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} /Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; -END {ORS="\n"; print ""} + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} '); fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) -# if type is not set by now, either we don't have a block device -# or smartctl failed. Either way, default to ATA and set out to -# nothing +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. if [ -z "$type" ]; then - type="ATA" + type="sata" out= fi case $script in smart) # Print temperature plus common predictors of drive failure - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="temp|health|r_ucor|w_ucor" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" fi ;; smartx) # Print some other interesting stats - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="hours_on|defect|nonmed|r_proc|w_proc" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then scripts="hours_on|pwr_cyc" fi ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; *) scripts="$script" esac diff --git a/cmd/zpool/zpool.d/w_ucor b/cmd/zpool/zpool.d/w_ucor index 3721f30e..64b5f6e4 100755 --- a/cmd/zpool/zpool.d/w_ucor +++ b/cmd/zpool/zpool.d/w_ucor @@ -23,8 +23,45 @@ off_ucor: Show SMART offline uncorrectable errors (ATA). ata_err: Show SMART ATA errors (ATA). pwr_cyc: Show SMART power cycle count (ATA). serial: Show disk serial number. +nvme_err: Show SMART NVMe errors (NVMe). +smart_test: Show SMART self-test results summary. +test_type: Show SMART self-test type (short, long... ). +test_status: Show SMART self-test status. +test_progress: Show SMART self-test percentage done. +test_ended: Show when the last SMART self-test ended (if supported). " +# Hack for developer testing +# +# If you set $samples to a directory containing smartctl output text files, +# we will use them instead of running smartctl on the vdevs. This can be +# useful if you want to test a bunch of different smartctl outputs. Also, if +# $samples is set, and additional 'file' column is added to the zpool output +# showing the filename. +samples= + +# get_filename_from_dir DIR +# +# Look in directory DIR and return a filename from it. The filename returned +# is chosen quasi-sequentially (based off our PID). This allows us to return +# a different filename every time this script is invoked (which we do for each +# vdev), without having to maintain state. +get_filename_from_dir() +{ + dir=$1 + pid="$$" + num_files=$(find "$dir" -maxdepth 1 -type f | wc -l) + mod=$((pid % num_files)) + i=0 + find "$dir" -type f -printf "%f\n" | while read -r file ; do + if [ "$mod" = "$i" ] ; then + echo "$file" + break + fi + i=$((i+1)) + done +} + script=$(basename "$0") if [ "$1" = "-h" ] ; then @@ -34,10 +71,18 @@ fi smartctl_path=$(which smartctl) -if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then - raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") +if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then + if [ -n "$samples" ] ; then + # cat a smartctl output text file instead of running smartctl + # on a vdev (only used for developer testing). + file=$(get_filename_from_dir $samples) + echo "file=$file" + raw_out=$(cat "$samples/$file") + else + raw_out=$(eval "sudo $smartctl_path -a $VDEV_UPATH") + fi - # Are we a SAS or ATA drive? Look for the right line in smartctl: + # What kind of drive are we? Look for the right line in smartctl: # # SAS: # Transport protocol: SAS @@ -45,7 +90,9 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then # SATA: # ATA Version is: 8 # - type=$(echo "$raw_out" | grep -m 1 -Eo '^ATA|SAS$') + # NVMe: + # SMART/Health Information (NVMe Log 0xnn, NSID 0xnn) + # out=$(echo "$raw_out" | awk ' # SAS specific /read:/{print "rrd="$4"\nr_cor="$5"\nr_proc="$7"\nr_ucor="$8} @@ -54,10 +101,11 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Elements in grown defect list/{print "defect="$6} # SAS common +/SAS/{type="sas"} /Drive Temperature:/{print "temp="$4} # Status can be a long string, substitute spaces for '_' /SMART Health Status:/{printf "health="; for(i=4;i<=NF-1;i++){printf "%s_", $i}; printf "%s\n", $i} -/number of hours powered up/{print "hours_on="$7} +/number of hours powered up/{print "hours_on="$7; hours_on=int($7)} /Serial number:/{print "serial="$3} # SATA specific @@ -70,40 +118,111 @@ if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ]; then /Power_Cycle_Count/{print "pwr_cyc="$10} # SATA common +/SATA/{type="sata"} /Temperature_Celsius/{print "temp="$10} +/Airflow_Temperature_Cel/{print "temp="$10} +/Current Temperature:/{print "temp="$3} +/SMART overall-health self-assessment test result:/{print "health="$6} +/Power_On_Hours/{print "hours_on="$10; hours_on=int($10)} +/Serial Number:/{print "serial="$3} + +# NVMe common +/NVMe/{type="nvme"} +/Temperature:/{print "temp="$2} /SMART overall-health self-assessment test result:/{print "health="$6} -/Power_On_Hours/{print "hours_on="$10} +/Power On Hours:/{gsub("[^0-9]","",$4); print "hours_on="$4} /Serial Number:/{print "serial="$3} +/Power Cycles:/{print "pwr_cyc="$3} + +# NVMe specific +/Media and Data Integrity Errors:/{print "nvme_err="$6} + +# SMART self-test info +/Self-test execution status:/{progress=tolower($4)} # SAS +/SMART Self-test log/{test_seen=1} # SAS +/SMART Extended Self-test Log/{test_seen=1} # SATA +/# 1/{ + test_type=tolower($3"_"$4); + # Status could be one word ("Completed") or multiple ("Completed: read + # failure"). Look for the ":" to see if we need to grab more words. + + if ($5 ~ ":") + status=tolower($5""$6"_"$7) + else + status=tolower($5) + if (status=="self") + status="running"; -END {ORS="\n"; print ""} + if (type == "sas") { + hours=int($(NF-4)) + } else { + hours=int($(NF-1)) + # SATA reports percent remaining, rather than percent done + # Convert it to percent done. + progress=(100-int($(NF-2)))"%" + } + # When we int()-ify "hours", it converts stuff like "NOW" and "-" into + # 0. In those cases, set it to hours_on, so they will cancel out in + # the "hours_ago" calculation later on. + if (hours == 0) + hours=hours_on + + if (test_seen) { + print "test="hours_on + print "test_type="test_type + print "test_status="status + print "test_progress="progress + } + # Not all drives report hours_on + if (hours_on && hours) { + total_hours_ago=(hours_on-hours) + days_ago=int(total_hours_ago/24) + hours_ago=(total_hours_ago % 24) + if (days_ago != 0) + ago_str=days_ago"d" + if (hours_ago !=0) + ago_str=ago_str""hours_ago"h" + print "test_ended="ago_str + } +} + +END {print "type="type; ORS="\n"; print ""} '); fi +type=$(echo "$out" | grep '^type=' | cut -d '=' -f 2) -# if type is not set by now, either we don't have a block device -# or smartctl failed. Either way, default to ATA and set out to -# nothing +# If type is not set by now, either we don't have a block device +# or smartctl failed. Either way, default to ATA and set $out to +# nothing. if [ -z "$type" ]; then - type="ATA" + type="sata" out= fi case $script in smart) # Print temperature plus common predictors of drive failure - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="temp|health|r_ucor|w_ucor" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then scripts="temp|health|ata_err|realloc|rep_ucor|cmd_to|pend_sec|off_ucor" + elif [ "$type" = "nvme" ] ; then + scripts="temp|health|nvme_err" fi ;; smartx) # Print some other interesting stats - if [ "$type" = "SAS" ] ; then + if [ "$type" = "sas" ] ; then scripts="hours_on|defect|nonmed|r_proc|w_proc" - elif [ "$type" = "ATA" ] ; then + elif [ "$type" = "sata" ] ; then + scripts="hours_on|pwr_cyc" + elif [ "$type" = "nvme" ] ; then scripts="hours_on|pwr_cyc" fi ;; +smart_test) + scripts="test_type|test_status|test_progress|test_ended" + ;; *) scripts="$script" esac diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c index 1cfff3ad..b0756938 100644 --- a/cmd/zpool/zpool_main.c +++ b/cmd/zpool/zpool_main.c @@ -6395,6 +6395,15 @@ status_callback(zpool_handle_t *zhp, void *data) "to be recovered.\n")); break; + case ZPOOL_STATUS_IO_FAILURE_MMP: + (void) printf(gettext("status: The pool is suspended because " + "multihost writes failed or were delayed;\n\tanother " + "system could import the pool undetected.\n")); + (void) printf(gettext("action: Make sure the pool's devices " + "are connected, then reboot your system and\n\timport the " + "pool.\n")); + break; + case ZPOOL_STATUS_IO_FAILURE_WAIT: case ZPOOL_STATUS_IO_FAILURE_CONTINUE: (void) printf(gettext("status: One or more devices are " diff --git a/cmd/zstreamdump/Makefile.in b/cmd/zstreamdump/Makefile.in index 77ac72c5..b9d838dc 100644 --- a/cmd/zstreamdump/Makefile.in +++ b/cmd/zstreamdump/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -212,6 +218,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -223,6 +235,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -238,6 +251,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -251,9 +266,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -272,6 +288,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -403,14 +420,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) zstreamdump_SOURCES = \ zstreamdump.c diff --git a/cmd/ztest/Makefile.in b/cmd/ztest/Makefile.in index d0def1cc..4efe332e 100644 --- a/cmd/ztest/Makefile.in +++ b/cmd/ztest/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -212,6 +218,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -223,6 +235,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -238,6 +251,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -251,9 +266,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -272,6 +288,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -406,15 +423,17 @@ AM_LIBTOOLFLAGS = --silent # truncating snprintfs on gcc 7.1.1. AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 $(DEBUG_STACKFLAGS) \ - $(FRAME_LARGER_THAN) $(NO_FORMAT_TRUNCATION) + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) \ + $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN) \ + $(NO_FORMAT_TRUNCATION) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" -DDEBUG + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) \ + -DDEBUG ztest_SOURCES = \ ztest.c diff --git a/cmd/zvol_id/Makefile.in b/cmd/zvol_id/Makefile.in index 3e6726c0..233ceaf6 100644 --- a/cmd/zvol_id/Makefile.in +++ b/cmd/zvol_id/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -402,14 +419,15 @@ AM_LIBTOOLFLAGS = --silent # removed once https://github.com/zfsonlinux/zfs/issues/569 is resolved. AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 -fno-stack-protector + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) \ + -fno-stack-protector AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) zvol_id_SOURCES = \ zvol_id_main.c diff --git a/cmd/zvol_id/zvol_id_main.c b/cmd/zvol_id/zvol_id_main.c index 6bd5113f..4a2d74cc 100644 --- a/cmd/zvol_id/zvol_id_main.c +++ b/cmd/zvol_id/zvol_id_main.c @@ -55,11 +55,12 @@ main(int argc, char **argv) { int fd, error = 0; char zvol_name[ZFS_MAX_DATASET_NAME_LEN]; - char zvol_name_part[ZFS_MAX_DATASET_NAME_LEN]; + char *zvol_name_part = NULL; char *dev_name; struct stat64 statbuf; int dev_minor, dev_part; int i; + int rc; if (argc < 2) { printf("Usage: %s /dev/zvol_device_node\n", argv[0]); @@ -88,11 +89,13 @@ main(int argc, char **argv) return (errno); } if (dev_part > 0) - snprintf(zvol_name_part, ZFS_MAX_DATASET_NAME_LEN, - "%s-part%d", zvol_name, dev_part); + rc = asprintf(&zvol_name_part, "%s-part%d", zvol_name, + dev_part); else - snprintf(zvol_name_part, ZFS_MAX_DATASET_NAME_LEN, - "%s", zvol_name); + rc = asprintf(&zvol_name_part, "%s", zvol_name); + + if (rc == -1 || zvol_name_part == NULL) + goto error; for (i = 0; i < strlen(zvol_name_part); i++) { if (isblank(zvol_name_part[i])) @@ -100,6 +103,8 @@ main(int argc, char **argv) } printf("%s\n", zvol_name_part); + free(zvol_name_part); +error: close(fd); return (error); } diff --git a/config/Rules.am b/config/Rules.am index 1d39e777..215f09c3 100644 --- a/config/Rules.am +++ b/config/Rules.am @@ -6,6 +6,7 @@ AM_CFLAGS += ${NO_UNUSED_BUT_SET_VARIABLE} AM_CFLAGS += ${NO_BOOL_COMPARE} AM_CFLAGS += -fno-strict-aliasing AM_CFLAGS += -std=gnu99 +AM_CFLAGS += $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT AM_CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 AM_CPPFLAGS += -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 @@ -14,3 +15,4 @@ AM_CPPFLAGS += -DLIBEXECDIR=\"$(libexecdir)\" AM_CPPFLAGS += -DRUNSTATEDIR=\"$(runstatedir)\" AM_CPPFLAGS += -DSBINDIR=\"$(sbindir)\" AM_CPPFLAGS += -DSYSCONFDIR=\"$(sysconfdir)\" +AM_CPPFLAGS += $(CODE_COVERAGE_CPPFLAGS) diff --git a/config/ax_code_coverage.m4 b/config/ax_code_coverage.m4 new file mode 100644 index 00000000..4417d444 --- /dev/null +++ b/config/ax_code_coverage.m4 @@ -0,0 +1,264 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_code_coverage.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CODE_COVERAGE() +# +# DESCRIPTION +# +# Defines CODE_COVERAGE_CPPFLAGS, CODE_COVERAGE_CFLAGS, +# CODE_COVERAGE_CXXFLAGS and CODE_COVERAGE_LIBS which should be included +# in the CPPFLAGS, CFLAGS CXXFLAGS and LIBS/LIBADD variables of every +# build target (program or library) which should be built with code +# coverage support. Also defines CODE_COVERAGE_RULES which should be +# substituted in your Makefile; and $enable_code_coverage which can be +# used in subsequent configure output. CODE_COVERAGE_ENABLED is defined +# and substituted, and corresponds to the value of the +# --enable-code-coverage option, which defaults to being disabled. +# +# Test also for gcov program and create GCOV variable that could be +# substituted. +# +# Note that all optimization flags in CFLAGS must be disabled when code +# coverage is enabled. +# +# Usage example: +# +# configure.ac: +# +# AX_CODE_COVERAGE +# +# Makefile.am: +# +# @CODE_COVERAGE_RULES@ +# my_program_LIBS = ... $(CODE_COVERAGE_LIBS) ... +# my_program_CPPFLAGS = ... $(CODE_COVERAGE_CPPFLAGS) ... +# my_program_CFLAGS = ... $(CODE_COVERAGE_CFLAGS) ... +# my_program_CXXFLAGS = ... $(CODE_COVERAGE_CXXFLAGS) ... +# +# This results in a "check-code-coverage" rule being added to any +# Makefile.am which includes "@CODE_COVERAGE_RULES@" (assuming the module +# has been configured with --enable-code-coverage). Running `make +# check-code-coverage` in that directory will run the module's test suite +# (`make check`) and build a code coverage report detailing the code which +# was touched, then print the URI for the report. +# +# In earlier versions of this macro, CODE_COVERAGE_LDFLAGS was defined +# instead of CODE_COVERAGE_LIBS. They are both still defined, but use of +# CODE_COVERAGE_LIBS is preferred for clarity; CODE_COVERAGE_LDFLAGS is +# deprecated. They have the same value. +# +# This code was derived from Makefile.decl in GLib, originally licenced +# under LGPLv2.1+. +# +# LICENSE +# +# Copyright (c) 2012, 2016 Philip Withnall +# Copyright (c) 2012 Xan Lopez +# Copyright (c) 2012 Christian Persch +# Copyright (c) 2012 Paolo Borelli +# Copyright (c) 2012 Dan Winship +# Copyright (c) 2015 Bastien ROUCARIES +# +# This library is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or (at +# your option) any later version. +# +# This library is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . + +#serial 25 + +AC_DEFUN([AX_CODE_COVERAGE],[ + dnl Check for --enable-code-coverage + AC_REQUIRE([AC_PROG_SED]) + + # allow to override gcov location + AC_ARG_WITH([gcov], + [AS_HELP_STRING([--with-gcov[=GCOV]], [use given GCOV for coverage (GCOV=gcov).])], + [_AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov], + [_AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov]) + + AC_MSG_CHECKING([whether to build with code coverage support]) + AC_ARG_ENABLE([code-coverage], + AS_HELP_STRING([--enable-code-coverage], + [Whether to enable code coverage support]),, + enable_code_coverage=no) + + AM_CONDITIONAL([CODE_COVERAGE_ENABLED], [test x$enable_code_coverage = xyes]) + AC_SUBST([CODE_COVERAGE_ENABLED], [$enable_code_coverage]) + AC_MSG_RESULT($enable_code_coverage) + + AS_IF([ test "$enable_code_coverage" = "yes" ], [ + # check for gcov + AC_CHECK_TOOL([GCOV], + [$_AX_CODE_COVERAGE_GCOV_PROG_WITH], + [:]) + AS_IF([test "X$GCOV" = "X:"], + [AC_MSG_ERROR([gcov is needed to do coverage])]) + AC_SUBST([GCOV]) + + dnl Check if gcc is being used + AS_IF([ test "$GCC" = "no" ], [ + AC_MSG_ERROR([not compiling with gcc, which is required for gcov code coverage]) + ]) + + AC_CHECK_PROG([LCOV], [lcov], [lcov]) + AC_CHECK_PROG([GENHTML], [genhtml], [genhtml]) + + AS_IF([ test -z "$LCOV" ], [ + AC_MSG_ERROR([To enable code coverage reporting you must have lcov installed]) + ]) + + AS_IF([ test -z "$GENHTML" ], [ + AC_MSG_ERROR([Could not find genhtml from the lcov package]) + ]) + + dnl Build the code coverage flags + dnl Define CODE_COVERAGE_LDFLAGS for backwards compatibility + CODE_COVERAGE_CPPFLAGS="" + CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage" + CODE_COVERAGE_CXXFLAGS="-O0 -g -fprofile-arcs -ftest-coverage" + CODE_COVERAGE_LIBS="-lgcov" + CODE_COVERAGE_LDFLAGS="$CODE_COVERAGE_LIBS" + + AC_SUBST([CODE_COVERAGE_CPPFLAGS]) + AC_SUBST([CODE_COVERAGE_CFLAGS]) + AC_SUBST([CODE_COVERAGE_CXXFLAGS]) + AC_SUBST([CODE_COVERAGE_LIBS]) + AC_SUBST([CODE_COVERAGE_LDFLAGS]) + + [CODE_COVERAGE_RULES_CHECK=' + -$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k check + $(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture +'] + [CODE_COVERAGE_RULES_CAPTURE=' + $(code_coverage_v_lcov_cap)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(call code_coverage_sanitize,$(PACKAGE_NAME)-$(PACKAGE_VERSION))" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_OPTIONS) + $(code_coverage_v_lcov_ign)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_RMOPTS) + -@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp + $(code_coverage_v_genhtml)LANG=C $(GENHTML) $(code_coverage_quiet) $(addprefix --prefix ,$(CODE_COVERAGE_DIRECTORY)) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS) + @echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html" +'] + [CODE_COVERAGE_RULES_CLEAN=' +clean: code-coverage-clean +distclean: code-coverage-clean +code-coverage-clean: + -$(LCOV) --directory $(top_builddir) -z + -rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY) + -find . \( -name "*.gcda" -o -name "*.gcno" -o -name "*.gcov" \) -delete +'] + ], [ + [CODE_COVERAGE_RULES_CHECK=' + @echo "Need to reconfigure with --enable-code-coverage" +'] + CODE_COVERAGE_RULES_CAPTURE="$CODE_COVERAGE_RULES_CHECK" + CODE_COVERAGE_RULES_CLEAN='' + ]) + +[CODE_COVERAGE_RULES=' +# Code coverage +# +# Optional: +# - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting. +# Multiple directories may be specified, separated by whitespace. +# (Default: $(top_builddir)) +# - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated +# by lcov for code coverage. (Default: +# $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info) +# - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage +# reports to be created. (Default: +# $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage) +# - CODE_COVERAGE_BRANCH_COVERAGE: Set to 1 to enforce branch coverage, +# set to 0 to disable it and leave empty to stay with the default. +# (Default: empty) +# - CODE_COVERAGE_LCOV_SHOPTS_DEFAULT: Extra options shared between both lcov +# instances. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE) +# - CODE_COVERAGE_LCOV_SHOPTS: Extra options to shared between both lcov +# instances. (Default: $CODE_COVERAGE_LCOV_SHOPTS_DEFAULT) +# - CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH: --gcov-tool pathtogcov +# - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the +# collecting lcov instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) +# - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the collecting lcov +# instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) +# - CODE_COVERAGE_LCOV_RMOPTS_DEFAULT: Extra options to pass to the filtering +# lcov instance. (Default: empty) +# - CODE_COVERAGE_LCOV_RMOPTS: Extra options to pass to the filtering lcov +# instance. (Default: $CODE_COVERAGE_LCOV_RMOPTS_DEFAULT) +# - CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT: Extra options to pass to the +# genhtml instance. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE) +# - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml +# instance. (Default: $CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT) +# - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore +# +# The generated report will be titled using the $(PACKAGE_NAME) and +# $(PACKAGE_VERSION). In order to add the current git hash to the title, +# use the git-version-gen script, available online. + +# Optional variables +CODE_COVERAGE_DIRECTORY ?= $(top_builddir) +CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info +CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage +CODE_COVERAGE_BRANCH_COVERAGE ?= +CODE_COVERAGE_LCOV_SHOPTS_DEFAULT ?= $(if $(CODE_COVERAGE_BRANCH_COVERAGE),\ +--rc lcov_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE)) +CODE_COVERAGE_LCOV_SHOPTS ?= $(CODE_COVERAGE_LCOV_SHOPTS_DEFAULT) +CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH ?= --gcov-tool "$(GCOV)" +CODE_COVERAGE_LCOV_OPTIONS_DEFAULT ?= $(CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) +CODE_COVERAGE_LCOV_OPTIONS ?= $(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) +CODE_COVERAGE_LCOV_RMOPTS_DEFAULT ?= +CODE_COVERAGE_LCOV_RMOPTS ?= $(CODE_COVERAGE_LCOV_RMOPTS_DEFAULT) +CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT ?=\ +$(if $(CODE_COVERAGE_BRANCH_COVERAGE),\ +--rc genhtml_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE)) +CODE_COVERAGE_GENHTML_OPTIONS ?= $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT) +CODE_COVERAGE_IGNORE_PATTERN ?= + +GITIGNOREFILES ?= +GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) + +code_coverage_v_lcov_cap = $(code_coverage_v_lcov_cap_$(V)) +code_coverage_v_lcov_cap_ = $(code_coverage_v_lcov_cap_$(AM_DEFAULT_VERBOSITY)) +code_coverage_v_lcov_cap_0 = @echo " LCOV --capture"\ + $(CODE_COVERAGE_OUTPUT_FILE); +code_coverage_v_lcov_ign = $(code_coverage_v_lcov_ign_$(V)) +code_coverage_v_lcov_ign_ = $(code_coverage_v_lcov_ign_$(AM_DEFAULT_VERBOSITY)) +code_coverage_v_lcov_ign_0 = @echo " LCOV --remove /tmp/*"\ + $(CODE_COVERAGE_IGNORE_PATTERN); +code_coverage_v_genhtml = $(code_coverage_v_genhtml_$(V)) +code_coverage_v_genhtml_ = $(code_coverage_v_genhtml_$(AM_DEFAULT_VERBOSITY)) +code_coverage_v_genhtml_0 = @echo " GEN " $(CODE_COVERAGE_OUTPUT_DIRECTORY); +code_coverage_quiet = $(code_coverage_quiet_$(V)) +code_coverage_quiet_ = $(code_coverage_quiet_$(AM_DEFAULT_VERBOSITY)) +code_coverage_quiet_0 = --quiet + +# sanitizes the test-name: replaces with underscores: dashes and dots +code_coverage_sanitize = $(subst -,_,$(subst .,_,$(1))) + +# Use recursive makes in order to ignore errors during check +check-code-coverage:'"$CODE_COVERAGE_RULES_CHECK"' + +# Capture code coverage data +code-coverage-capture: code-coverage-capture-hook'"$CODE_COVERAGE_RULES_CAPTURE"' + +# Hook rule executed before code-coverage-capture, overridable by the user +code-coverage-capture-hook: + +'"$CODE_COVERAGE_RULES_CLEAN"' + +A''M_DISTCHECK_CONFIGURE_FLAGS ?= +A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage + +.PHONY: check-code-coverage code-coverage-capture code-coverage-capture-hook code-coverage-clean +'] + + AC_SUBST([CODE_COVERAGE_RULES]) + m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([CODE_COVERAGE_RULES])]) +]) diff --git a/config/deb.am b/config/deb.am index 1b51f931..58ab96e1 100644 --- a/config/deb.am +++ b/config/deb.am @@ -2,16 +2,16 @@ deb-local: @(if test "${HAVE_DPKGBUILD}" = "no"; then \ echo -e "\n" \ "*** Required util ${DPKGBUILD} missing. Please install the\n" \ - "*** package for your distribution which provides ${DPKGBUILD},\n" \ + "*** package for your distribution which provides ${DPKGBUILD},\n" \ "*** re-run configure, and try again.\n"; \ - exit 1; \ + exit 1; \ fi; \ if test "${HAVE_ALIEN}" = "no"; then \ echo -e "\n" \ "*** Required util ${ALIEN} missing. Please install the\n" \ - "*** package for your distribution which provides ${ALIEN},\n" \ + "*** package for your distribution which provides ${ALIEN},\n" \ "*** re-run configure, and try again.\n"; \ - exit 1; \ + exit 1; \ fi) deb-kmod: deb-local rpm-kmod diff --git a/config/kernel-acl-refcount.m4 b/config/kernel-acl-refcount.m4 new file mode 100644 index 00000000..43e3c442 --- /dev/null +++ b/config/kernel-acl-refcount.m4 @@ -0,0 +1,20 @@ +dnl # +dnl # 4.16 kernel: check if struct posix_acl acl.a_refcount is a refcount_t. +dnl # It's an atomic_t on older kernels. +dnl # +AC_DEFUN([ZFS_AC_KERNEL_ACL_HAS_REFCOUNT], [ + AC_MSG_CHECKING([whether posix_acl has refcount_t]) + ZFS_LINUX_TRY_COMPILE([ + #include + #include + #include + ],[ + struct posix_acl acl; + refcount_t *r __attribute__ ((unused)) = &acl.a_refcount; + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_ACL_REFCOUNT, 1, [posix_acl has refcount_t]) + ],[ + AC_MSG_RESULT(no) + ]) +]) diff --git a/config/kernel-acl.m4 b/config/kernel-acl.m4 index 31148434..02cc020e 100644 --- a/config/kernel-acl.m4 +++ b/config/kernel-acl.m4 @@ -184,6 +184,7 @@ AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_PERMISSION_WITH_NAMEIDATA], [ AC_MSG_CHECKING([whether iops->permission() wants nameidata]) ZFS_LINUX_TRY_COMPILE([ #include + #include int permission_fn(struct inode *inode, int mask, struct nameidata *nd) { return 0; } diff --git a/config/kernel-blk-queue-flags.m4 b/config/kernel-blk-queue-flags.m4 new file mode 100644 index 00000000..b570245c --- /dev/null +++ b/config/kernel-blk-queue-flags.m4 @@ -0,0 +1,38 @@ +dnl # +dnl # API change +dnl # https://github.com/torvalds/linux/commit/8814ce8 +dnl # Introduction of blk_queue_flag_set and blk_queue_flag_clear +dnl # + +AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_FLAG_SET], [ + AC_MSG_CHECKING([whether blk_queue_flag_set() exists]) + ZFS_LINUX_TRY_COMPILE([ + #include + #include + ],[ + struct request_queue *q = NULL; + blk_queue_flag_set(0, q); + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_BLK_QUEUE_FLAG_SET, 1, [blk_queue_flag_set() exists]) + ],[ + AC_MSG_RESULT(no) + ]) +]) + +AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_FLAG_CLEAR], [ + AC_MSG_CHECKING([whether blk_queue_flag_clear() exists]) + ZFS_LINUX_TRY_COMPILE([ + #include + #include + ],[ + struct request_queue *q = NULL; + blk_queue_flag_clear(0, q); + ],[ + + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_BLK_QUEUE_FLAG_CLEAR, 1, [blk_queue_flag_clear() exists]) + ],[ + AC_MSG_RESULT(no) + ]) +]) diff --git a/config/kernel-create-nameidata.m4 b/config/kernel-create-nameidata.m4 index a71490a0..d4c155c5 100644 --- a/config/kernel-create-nameidata.m4 +++ b/config/kernel-create-nameidata.m4 @@ -5,6 +5,7 @@ AC_DEFUN([ZFS_AC_KERNEL_CREATE_NAMEIDATA], [ AC_MSG_CHECKING([whether iops->create() passes nameidata]) ZFS_LINUX_TRY_COMPILE([ #include + #include #ifdef HAVE_MKDIR_UMODE_T int inode_create(struct inode *inode ,struct dentry *dentry, diff --git a/config/kernel-dentry-operations.m4 b/config/kernel-dentry-operations.m4 index 3182490c..61f5a27a 100644 --- a/config/kernel-dentry-operations.m4 +++ b/config/kernel-dentry-operations.m4 @@ -5,6 +5,7 @@ AC_DEFUN([ZFS_AC_KERNEL_D_REVALIDATE_NAMEIDATA], [ AC_MSG_CHECKING([whether dops->d_revalidate() takes struct nameidata]) ZFS_LINUX_TRY_COMPILE([ #include + #include int revalidate (struct dentry *dentry, struct nameidata *nidata) { return 0; } diff --git a/config/kernel-fst-mount.m4 b/config/kernel-fst-mount.m4 new file mode 100644 index 00000000..a8ac50bd --- /dev/null +++ b/config/kernel-fst-mount.m4 @@ -0,0 +1,28 @@ +dnl # +dnl # 2.6.38 API change +dnl # The .get_sb callback has been replaced by a .mount callback +dnl # in the file_system_type structure. +dnl # +AC_DEFUN([ZFS_AC_KERNEL_FST_MOUNT], [ + AC_MSG_CHECKING([whether fst->mount() exists]) + ZFS_LINUX_TRY_COMPILE([ + #include + + static struct dentry * + mount(struct file_system_type *fs_type, int flags, + const char *osname, void *data) { + struct dentry *d = NULL; + return (d); + } + + static struct file_system_type fst __attribute__ ((unused)) = { + .mount = mount, + }; + ],[ + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_FST_MOUNT, 1, [fst->mount() exists]) + ],[ + AC_MSG_RESULT(no) + ]) +]) diff --git a/config/kernel-get-disk-and-module.m4 b/config/kernel-get-disk-and-module.m4 new file mode 100644 index 00000000..2a51a5af --- /dev/null +++ b/config/kernel-get-disk-and-module.m4 @@ -0,0 +1,19 @@ +dnl # +dnl # 4.16 API change +dnl # Verify if get_disk_and_module() symbol is available. +dnl # +AC_DEFUN([ZFS_AC_KERNEL_GET_DISK_AND_MODULE], + [AC_MSG_CHECKING([whether get_disk_and_module() is available]) + ZFS_LINUX_TRY_COMPILE_SYMBOL([ + #include + ], [ + struct gendisk *disk = NULL; + (void) get_disk_and_module(disk); + ], [get_disk_and_module], [block/genhd.c], [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_GET_DISK_AND_MODULE, + 1, [get_disk_and_module() is available]) + ], [ + AC_MSG_RESULT(no) + ]) +]) diff --git a/config/kernel-get-link.m4 b/config/kernel-get-link.m4 index 022c49c5..3cda08c1 100644 --- a/config/kernel-get-link.m4 +++ b/config/kernel-get-link.m4 @@ -41,7 +41,7 @@ AC_DEFUN([ZFS_AC_KERNEL_FOLLOW_LINK], [ AC_DEFINE(HAVE_FOLLOW_LINK_NAMEIDATA, 1, [iops->follow_link() nameidata]) ],[ - AC_MSG_ERROR(no; please file a bug report) + AC_MSG_ERROR(no; please file a bug report) ]) ]) ]) diff --git a/config/kernel-global_page_state.m4 b/config/kernel-global_page_state.m4 new file mode 100644 index 00000000..f4a40011 --- /dev/null +++ b/config/kernel-global_page_state.m4 @@ -0,0 +1,109 @@ +dnl # +dnl # 4.8 API change +dnl # +dnl # 75ef71840539 mm, vmstat: add infrastructure for per-node vmstats +dnl # 599d0c954f91 mm, vmscan: move LRU lists to node +dnl # +AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_NODE_PAGE_STATE], [ + AC_MSG_CHECKING([whether global_node_page_state() exists]) + ZFS_LINUX_TRY_COMPILE([ + #include + #include + ],[ + (void) global_node_page_state(0); + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(ZFS_GLOBAL_NODE_PAGE_STATE, 1, [global_node_page_state() exists]) + ],[ + AC_MSG_RESULT(no) + ]) +]) + +dnl # +dnl # 4.14 API change +dnl # +dnl # c41f012ade0b mm: rename global_page_state to global_zone_page_state +dnl # +AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_ZONE_PAGE_STATE], [ + AC_MSG_CHECKING([whether global_zone_page_state() exists]) + ZFS_LINUX_TRY_COMPILE([ + #include + #include + ],[ + (void) global_zone_page_state(0); + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(ZFS_GLOBAL_ZONE_PAGE_STATE, 1, [global_zone_page_state() exists]) + ],[ + AC_MSG_RESULT(no) + ]) +]) + +dnl # +dnl # Create a define and autoconf variable for an enum member +dnl # +AC_DEFUN([ZFS_AC_KERNEL_ENUM_MEMBER], [ + AC_MSG_CHECKING([whether enum $2 contains $1]) + AS_IF([AC_TRY_COMMAND("${srcdir}/scripts/enum-extract.pl" "$2" "$3" | egrep -qx $1)],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(m4_join([_], [ZFS_ENUM], m4_toupper($2), $1), 1, [enum $2 contains $1]) + m4_join([_], [ZFS_ENUM], m4_toupper($2), $1)=1 + ],[ + AC_MSG_RESULT([no]) + ]) +]) + +dnl # +dnl # Sanity check helpers +dnl # +AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_ERROR],[ + AC_MSG_RESULT(no) + AC_MSG_RESULT([$1 in either node_stat_item or zone_stat_item: $2]) + AC_MSG_RESULT([configure needs updating, see: config/kernel-global_page_state.m4]) + AC_MSG_FAILURE([SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD!]) +]) + +AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK], [ + enum_check_a="m4_join([_], [$ZFS_ENUM_NODE_STAT_ITEM], $1)" + enum_check_b="m4_join([_], [$ZFS_ENUM_ZONE_STAT_ITEM], $1)" + AS_IF([test -n "$enum_check_a" -a -n "$enum_check_b"],[ + ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_ERROR([$1], [DUPLICATE]) + ]) + AS_IF([test -z "$enum_check_a" -a -z "$enum_check_b"],[ + ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_ERROR([$1], [NOT FOUND]) + ]) +]) + +dnl # +dnl # Ensure the config tests are finding one and only one of each enum of interest +dnl # +AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_ZONE_PAGE_STATE_SANITY], [ + AC_MSG_CHECKING([global_page_state enums are sane]) + + ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK([NR_FILE_PAGES]) + ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK([NR_INACTIVE_ANON]) + ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK([NR_INACTIVE_FILE]) + ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK([NR_SLAB_RECLAIMABLE]) + + AC_MSG_RESULT(yes) +]) + +dnl # +dnl # enum members in which we're interested +dnl # +AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_PAGE_STATE], [ + ZFS_AC_KERNEL_GLOBAL_NODE_PAGE_STATE + ZFS_AC_KERNEL_GLOBAL_ZONE_PAGE_STATE + + ZFS_AC_KERNEL_ENUM_MEMBER([NR_FILE_PAGES], [node_stat_item], [$LINUX/include/linux/mmzone.h]) + ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_ANON], [node_stat_item], [$LINUX/include/linux/mmzone.h]) + ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_FILE], [node_stat_item], [$LINUX/include/linux/mmzone.h]) + ZFS_AC_KERNEL_ENUM_MEMBER([NR_SLAB_RECLAIMABLE], [node_stat_item], [$LINUX/include/linux/mmzone.h]) + + ZFS_AC_KERNEL_ENUM_MEMBER([NR_FILE_PAGES], [zone_stat_item], [$LINUX/include/linux/mmzone.h]) + ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_ANON], [zone_stat_item], [$LINUX/include/linux/mmzone.h]) + ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_FILE], [zone_stat_item], [$LINUX/include/linux/mmzone.h]) + ZFS_AC_KERNEL_ENUM_MEMBER([NR_SLAB_RECLAIMABLE], [zone_stat_item], [$LINUX/include/linux/mmzone.h]) + + ZFS_AC_KERNEL_GLOBAL_ZONE_PAGE_STATE_SANITY +]) diff --git a/config/kernel-inode-set-iversion.m4 b/config/kernel-inode-set-iversion.m4 new file mode 100644 index 00000000..9a7d7890 --- /dev/null +++ b/config/kernel-inode-set-iversion.m4 @@ -0,0 +1,19 @@ +dnl # +dnl # 4.16 API change +dnl # inode_set_iversion introduced to set i_version +dnl # +AC_DEFUN([ZFS_AC_KERNEL_INODE_SET_IVERSION], [ + AC_MSG_CHECKING([whether inode_set_iversion() exists]) + ZFS_LINUX_TRY_COMPILE([ + #include + ],[ + struct inode inode; + inode_set_iversion(&inode, 1); + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_INODE_SET_IVERSION, 1, + [inode_set_iversion() exists]) + ],[ + AC_MSG_RESULT(no) + ]) +]) diff --git a/config/kernel-lookup-nameidata.m4 b/config/kernel-lookup-nameidata.m4 index 43f5fb4c..5453be5e 100644 --- a/config/kernel-lookup-nameidata.m4 +++ b/config/kernel-lookup-nameidata.m4 @@ -5,6 +5,7 @@ AC_DEFUN([ZFS_AC_KERNEL_LOOKUP_NAMEIDATA], [ AC_MSG_CHECKING([whether iops->lookup() passes nameidata]) ZFS_LINUX_TRY_COMPILE([ #include + #include struct dentry *inode_lookup(struct inode *inode, struct dentry *dentry, struct nameidata *nidata) diff --git a/config/kernel-mount-nodev.m4 b/config/kernel-mount-nodev.m4 deleted file mode 100644 index 28a45157..00000000 --- a/config/kernel-mount-nodev.m4 +++ /dev/null @@ -1,20 +0,0 @@ -dnl # -dnl # 2.6.39 API change -dnl # The .get_sb callback has been replaced by a .mount callback -dnl # in the file_system_type structure. When using the new -dnl # interface the caller must now use the mount_nodev() helper. -dnl # This updated callback and helper no longer pass the vfsmount. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_MOUNT_NODEV], - [AC_MSG_CHECKING([whether mount_nodev() is available]) - ZFS_LINUX_TRY_COMPILE_SYMBOL([ - #include - ], [ - mount_nodev(NULL, 0, NULL, NULL); - ], [mount_nodev], [fs/super.c], [ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_MOUNT_NODEV, 1, [mount_nodev() is available]) - ], [ - AC_MSG_RESULT(no) - ]) -]) diff --git a/config/kernel-userns-capabilities.m4 b/config/kernel-userns-capabilities.m4 new file mode 100644 index 00000000..fa338197 --- /dev/null +++ b/config/kernel-userns-capabilities.m4 @@ -0,0 +1,67 @@ +dnl # +dnl # 2.6.38 API change +dnl # ns_capable() was introduced +dnl # +AC_DEFUN([ZFS_AC_KERNEL_NS_CAPABLE], [ + AC_MSG_CHECKING([whether ns_capable exists]) + ZFS_LINUX_TRY_COMPILE([ + #include + ],[ + ns_capable((struct user_namespace *)NULL, CAP_SYS_ADMIN); + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_NS_CAPABLE, 1, + [ns_capable exists]) + ],[ + AC_MSG_RESULT(no) + ]) +]) + +dnl # +dnl # 2.6.39 API change +dnl # struct user_namespace was added to struct cred_t as +dnl # cred->user_ns member +dnl # Note that current_user_ns() was added in 2.6.28. +dnl # +AC_DEFUN([ZFS_AC_KERNEL_CRED_USER_NS], [ + AC_MSG_CHECKING([whether cred_t->user_ns exists]) + ZFS_LINUX_TRY_COMPILE([ + #include + ],[ + struct cred cr; + cr.user_ns = (struct user_namespace *)NULL; + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_CRED_USER_NS, 1, + [cred_t->user_ns exists]) + ],[ + AC_MSG_RESULT(no) + ]) +]) + +dnl # +dnl # 3.4 API change +dnl # kuid_has_mapping() and kgid_has_mapping() were added to distinguish +dnl # between internal kernel uids/gids and user namespace uids/gids. +dnl # +AC_DEFUN([ZFS_AC_KERNEL_KUID_HAS_MAPPING], [ + AC_MSG_CHECKING([whether kuid_has_mapping/kgid_has_mapping exist]) + ZFS_LINUX_TRY_COMPILE([ + #include + ],[ + kuid_has_mapping((struct user_namespace *)NULL, KUIDT_INIT(0)); + kgid_has_mapping((struct user_namespace *)NULL, KGIDT_INIT(0)); + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_KUID_HAS_MAPPING, 1, + [kuid_has_mapping/kgid_has_mapping exist]) + ],[ + AC_MSG_RESULT(no) + ]) +]) + +AC_DEFUN([ZFS_AC_KERNEL_USERNS_CAPABILITIES], [ + ZFS_AC_KERNEL_NS_CAPABLE + ZFS_AC_KERNEL_CRED_USER_NS + ZFS_AC_KERNEL_KUID_HAS_MAPPING +]) diff --git a/config/kernel-vfs-iterate.m4 b/config/kernel-vfs-iterate.m4 index 7b1599e1..5de901d4 100644 --- a/config/kernel-vfs-iterate.m4 +++ b/config/kernel-vfs-iterate.m4 @@ -23,16 +23,27 @@ AC_DEFUN([ZFS_AC_KERNEL_VFS_ITERATE], [ dnl # dnl # 3.11 API change dnl # + dnl # RHEL 7.5 compatibility; the fops.iterate() method was + dnl # added to the file_operations structure but in order to + dnl # maintain KABI compatibility all callers must set + dnl # FMODE_KABI_ITERATE which is checked in iterate_dir(). + dnl # When detected ignore this interface and fallback to + dnl # to using fops.readdir() to retain KABI compatibility. + dnl # AC_MSG_CHECKING([whether fops->iterate() is available]) ZFS_LINUX_TRY_COMPILE([ #include - int iterate(struct file *filp, struct dir_context * context) - { return 0; } + int iterate(struct file *filp, + struct dir_context *context) { return 0; } static const struct file_operations fops __attribute__ ((unused)) = { .iterate = iterate, }; + + #if defined(FMODE_KABI_ITERATE) + #error "RHEL 7.5, FMODE_KABI_ITERATE interface" + #endif ],[ ],[ AC_MSG_RESULT(yes) @@ -44,8 +55,8 @@ AC_DEFUN([ZFS_AC_KERNEL_VFS_ITERATE], [ AC_MSG_CHECKING([whether fops->readdir() is available]) ZFS_LINUX_TRY_COMPILE([ #include - int readdir(struct file *filp, void *entry, filldir_t func) - { return 0; } + int readdir(struct file *filp, void *entry, + filldir_t func) { return 0; } static const struct file_operations fops __attribute__ ((unused)) = { @@ -57,7 +68,7 @@ AC_DEFUN([ZFS_AC_KERNEL_VFS_ITERATE], [ AC_DEFINE(HAVE_VFS_READDIR, 1, [fops->readdir() is available]) ],[ - AC_MSG_ERROR(no; file a bug report with ZFSOnLinux) + AC_MSG_ERROR(no; file a bug report with ZoL) ]) ]) ]) diff --git a/config/kernel-vm_node_stat.m4 b/config/kernel-vm_node_stat.m4 deleted file mode 100644 index e1c42f88..00000000 --- a/config/kernel-vm_node_stat.m4 +++ /dev/null @@ -1,22 +0,0 @@ -dnl # -dnl # 4.8 API change -dnl # kernel vm counters change -dnl # -AC_DEFUN([ZFS_AC_KERNEL_VM_NODE_STAT], [ - AC_MSG_CHECKING([whether to use vm_node_stat based fn's]) - ZFS_LINUX_TRY_COMPILE([ - #include - #include - ],[ - int a __attribute__ ((unused)) = NR_VM_NODE_STAT_ITEMS; - long x __attribute__ ((unused)) = - atomic_long_read(&vm_node_stat[0]); - (void) global_node_page_state(0); - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(ZFS_GLOBAL_NODE_PAGE_STATE, 1, - [using global_node_page_state()]) - ],[ - AC_MSG_RESULT(no) - ]) -]) diff --git a/config/kernel.m4 b/config/kernel.m4 index b759ccd3..375e4b79 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -35,11 +35,14 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ ZFS_AC_KERNEL_BIO_RW_BARRIER ZFS_AC_KERNEL_BIO_RW_DISCARD ZFS_AC_KERNEL_BLK_QUEUE_BDI + ZFS_AC_KERNEL_BLK_QUEUE_FLAG_CLEAR + ZFS_AC_KERNEL_BLK_QUEUE_FLAG_SET ZFS_AC_KERNEL_BLK_QUEUE_FLUSH ZFS_AC_KERNEL_BLK_QUEUE_MAX_HW_SECTORS ZFS_AC_KERNEL_BLK_QUEUE_MAX_SEGMENTS ZFS_AC_KERNEL_BLK_QUEUE_HAVE_BIO_RW_UNPLUG ZFS_AC_KERNEL_BLK_QUEUE_HAVE_BLK_PLUG + ZFS_AC_KERNEL_GET_DISK_AND_MODULE ZFS_AC_KERNEL_GET_DISK_RO ZFS_AC_KERNEL_GET_GENDISK ZFS_AC_KERNEL_HAVE_BIO_SET_OP_ATTRS @@ -65,6 +68,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ ZFS_AC_KERNEL_INODE_OPERATIONS_SET_ACL ZFS_AC_KERNEL_INODE_OPERATIONS_GETATTR ZFS_AC_KERNEL_INODE_SET_FLAGS + ZFS_AC_KERNEL_INODE_SET_IVERSION ZFS_AC_KERNEL_GET_ACL_HANDLE_CACHE ZFS_AC_KERNEL_SHOW_OPTIONS ZFS_AC_KERNEL_FILE_INODE @@ -98,7 +102,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ ZFS_AC_KERNEL_TRUNCATE_SETSIZE ZFS_AC_KERNEL_6ARGS_SECURITY_INODE_INIT_SECURITY ZFS_AC_KERNEL_CALLBACK_SECURITY_INODE_INIT_SECURITY - ZFS_AC_KERNEL_MOUNT_NODEV + ZFS_AC_KERNEL_FST_MOUNT ZFS_AC_KERNEL_SHRINK ZFS_AC_KERNEL_SHRINK_CONTROL_HAS_NID ZFS_AC_KERNEL_S_INSTANCES_LIST_HEAD @@ -122,7 +126,9 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ ZFS_AC_KERNEL_RENAME_WANTS_FLAGS ZFS_AC_KERNEL_HAVE_GENERIC_SETXATTR ZFS_AC_KERNEL_CURRENT_TIME - ZFS_AC_KERNEL_VM_NODE_STAT + ZFS_AC_KERNEL_GLOBAL_PAGE_STATE + ZFS_AC_KERNEL_ACL_HAS_REFCOUNT + ZFS_AC_KERNEL_USERNS_CAPABILITIES AS_IF([test "$LINUX_OBJ" != "$LINUX"], [ KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ" @@ -721,7 +727,7 @@ AC_DEFUN([ZFS_LINUX_COMPILE_IFELSE], [ modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage AS_IF( - [AC_TRY_COMMAND(cp conftest.c conftest.h build && make [$2] -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag) >/dev/null && AC_TRY_COMMAND([$3])], + [AC_TRY_COMMAND(cp conftest.c conftest.h build && make [$2] -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag) >/dev/null && AC_TRY_COMMAND([$3])], [$4], [_AC_MSG_LOG_CONFTEST m4_ifvaln([$5],[$5])] ) diff --git a/config/tgz.am b/config/tgz.am index 2997b1de..0657d045 100644 --- a/config/tgz.am +++ b/config/tgz.am @@ -2,9 +2,9 @@ tgz-local: @(if test "${HAVE_ALIEN}" = "no"; then \ echo -e "\n" \ "*** Required util ${ALIEN} missing. Please install the\n" \ - "*** package for your distribution which provides ${ALIEN},\n" \ + "*** package for your distribution which provides ${ALIEN},\n" \ "*** re-run configure, and try again.\n"; \ - exit 1; \ + exit 1; \ fi) tgz-kmod: tgz-local rpm-kmod diff --git a/config/user-libaio.m4 b/config/user-libaio.m4 new file mode 100644 index 00000000..d7a7cb50 --- /dev/null +++ b/config/user-libaio.m4 @@ -0,0 +1,14 @@ +dnl # +dnl # Check for libaio - only used for libaiot test cases. +dnl # +AC_DEFUN([ZFS_AC_CONFIG_USER_LIBAIO], [ + LIBAIO= + + AC_CHECK_HEADER([libaio.h], [ + user_libaio=yes + AC_SUBST([LIBAIO], ["-laio"]) + AC_DEFINE([HAVE_LIBAIO], 1, [Define if you have libaio]) + ], [ + user_libaio=no + ]) +]) diff --git a/config/user-libattr.m4 b/config/user-libattr.m4 deleted file mode 100644 index 3298fd49..00000000 --- a/config/user-libattr.m4 +++ /dev/null @@ -1,12 +0,0 @@ -dnl # -dnl # Check for libattr -dnl # -AC_DEFUN([ZFS_AC_CONFIG_USER_LIBATTR], [ - LIBATTR= - - AC_CHECK_HEADER([attr/xattr.h], [], [AC_MSG_FAILURE([ - *** attr/xattr.h missing, libattr-devel package required])]) - - AC_SUBST([LIBATTR], ["-lattr"]) - AC_DEFINE([HAVE_LIBATTR], 1, [Define if you have libattr]) -]) diff --git a/config/user-libblkid.m4 b/config/user-libblkid.m4 index 5bc7f466..88e6f990 100644 --- a/config/user-libblkid.m4 +++ b/config/user-libblkid.m4 @@ -6,7 +6,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBBLKID], [ LIBBLKID= AC_CHECK_HEADER([blkid/blkid.h], [], [AC_MSG_FAILURE([ - *** blkid.h missing, libblkid-devel package required])]) + *** blkid.h missing, libblkid-devel package required])]) AC_SUBST([LIBBLKID], ["-lblkid"]) AC_DEFINE([HAVE_LIBBLKID], 1, [Define if you have libblkid]) diff --git a/config/user-systemd.m4 b/config/user-systemd.m4 index c2105abc..de2a44f1 100644 --- a/config/user-systemd.m4 +++ b/config/user-systemd.m4 @@ -2,7 +2,8 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_SYSTEMD], [ AC_ARG_ENABLE(systemd, AC_HELP_STRING([--enable-systemd], [install systemd unit/preset files [[default: yes]]]), - [],enable_systemd=yes) + [enable_systemd=$enableval], + [enable_systemd=check]) AC_ARG_WITH(systemdunitdir, AC_HELP_STRING([--with-systemdunitdir=DIR], @@ -19,16 +20,27 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_SYSTEMD], [ [install systemd module load files into dir [[/usr/lib/modules-load.d]]]), systemdmoduleloaddir=$withval,systemdmodulesloaddir=/usr/lib/modules-load.d) + AS_IF([test "x$enable_systemd" = xcheck], [ + AS_IF([systemctl --version >/dev/null 2>&1], + [enable_systemd=yes], + [enable_systemd=no]) + ]) - AS_IF([test "x$enable_systemd" = xyes], - [ + AC_MSG_CHECKING(for systemd support) + AC_MSG_RESULT([$enable_systemd]) + + AS_IF([test "x$enable_systemd" = xyes], [ ZFS_INIT_SYSTEMD=systemd ZFS_MODULE_LOAD=modules-load.d + DEFINE_SYSTEMD='--with systemd --define "_unitdir $(systemdunitdir)" --define "_presetdir $(systemdpresetdir)"' modulesloaddir=$systemdmodulesloaddir - ]) + ],[ + DEFINE_SYSTEMD='--without systemd' + ]) AC_SUBST(ZFS_INIT_SYSTEMD) AC_SUBST(ZFS_MODULE_LOAD) + AC_SUBST(DEFINE_SYSTEMD) AC_SUBST(systemdunitdir) AC_SUBST(systemdpresetdir) AC_SUBST(modulesloaddir) diff --git a/config/user.m4 b/config/user.m4 index 21ff7143..3f52c3e5 100644 --- a/config/user.m4 +++ b/config/user.m4 @@ -11,9 +11,9 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [ ZFS_AC_CONFIG_USER_LIBUUID ZFS_AC_CONFIG_USER_LIBTIRPC ZFS_AC_CONFIG_USER_LIBBLKID - ZFS_AC_CONFIG_USER_LIBATTR ZFS_AC_CONFIG_USER_LIBUDEV ZFS_AC_CONFIG_USER_FRAME_LARGER_THAN + ZFS_AC_CONFIG_USER_LIBAIO ZFS_AC_CONFIG_USER_RUNSTATEDIR ZFS_AC_CONFIG_USER_MAKEDEV_IN_SYSMACROS ZFS_AC_CONFIG_USER_MAKEDEV_IN_MKDEV diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 index 7651dc2c..5e081c23 100644 --- a/config/zfs-build.m4 +++ b/config/zfs-build.m4 @@ -6,37 +6,75 @@ AC_DEFUN([ZFS_AC_LICENSE], [ AC_MSG_RESULT([$ZFS_META_LICENSE]) ]) +AC_DEFUN([ZFS_AC_DEBUG_ENABLE], [ + KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror" + HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG -Werror" + DEBUG_CFLAGS="-DDEBUG -Werror" + DEBUG_ZFS="_with_debug" + AC_DEFINE(ZFS_DEBUG, 1, [zfs debugging enabled]) +]) + +AC_DEFUN([ZFS_AC_DEBUG_DISABLE], [ + KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG " + HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG " + DEBUG_CFLAGS="-DNDEBUG" + DEBUG_STACKFLAGS="" + DEBUG_ZFS="_without_debug" +]) + AC_DEFUN([ZFS_AC_DEBUG], [ - AC_MSG_CHECKING([whether debugging is enabled]) + AC_MSG_CHECKING([whether assertion support will be enabled]) AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug], - [Enable generic debug support @<:@default=no@:>@])], + [Enable assertion support @<:@default=no@:>@])], [], [enable_debug=no]) - AS_IF([test "x$enable_debug" = xyes], - [ - KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror" - HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG -Werror" - DEBUG_CFLAGS="-DDEBUG -Werror" - DEBUG_STACKFLAGS="-fstack-check" - DEBUG_ZFS="_with_debug" - AC_DEFINE(ZFS_DEBUG, 1, [zfs debugging enabled]) - ], - [ - KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG " - HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG " - DEBUG_CFLAGS="-DNDEBUG" - DEBUG_STACKFLAGS="" - DEBUG_ZFS="_without_debug" - ]) + AS_CASE(["x$enable_debug"], + ["xyes"], + [ZFS_AC_DEBUG_ENABLE], + ["xno"], + [ZFS_AC_DEBUG_DISABLE], + [AC_MSG_ERROR([Unknown option $enable_debug])]) - AC_SUBST(DEBUG_CFLAGS) AC_SUBST(DEBUG_STACKFLAGS) AC_SUBST(DEBUG_ZFS) AC_MSG_RESULT([$enable_debug]) ]) +AC_DEFUN([ZFS_AC_DEBUGINFO_KERNEL], [ + KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS CONFIG_DEBUG_INFO=y" + KERNELCPPFLAGS="${KERNELCPPFLAGS} -fno-inline" +]) + +AC_DEFUN([ZFS_AC_DEBUGINFO_USER], [ + DEBUG_CFLAGS="${DEBUG_CFLAGS} -g -fno-inline" +]) + +AC_DEFUN([ZFS_AC_DEBUGINFO], [ + AC_MSG_CHECKING([whether debuginfo support will be forced]) + AC_ARG_ENABLE([debuginfo], + [AS_HELP_STRING([--enable-debuginfo], + [Force generation of debuginfo @<:@default=no@:>@])], + [], + [enable_debuginfo=no]) + + AS_CASE(["x$enable_debuginfo"], + ["xyes"], + [ZFS_AC_DEBUGINFO_KERNEL + ZFS_AC_DEBUGINFO_USER], + ["xkernel"], + [ZFS_AC_DEBUGINFO_KERNEL], + ["xuser"], + [ZFS_AC_DEBUGINFO_USER], + ["xno"], + [], + [AC_MSG_ERROR([Unknown option $enable_debug])]) + + AC_SUBST(DEBUG_CFLAGS) + AC_MSG_RESULT([$enable_debuginfo]) +]) + AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [ ZFS_AC_CONFIG_ALWAYS_NO_UNUSED_BUT_SET_VARIABLE ZFS_AC_CONFIG_ALWAYS_NO_BOOL_COMPARE @@ -79,11 +117,11 @@ AC_DEFUN([ZFS_AC_CONFIG], [ AM_CONDITIONAL([CONFIG_KERNEL], [test "$ZFS_CONFIG" = kernel -o "$ZFS_CONFIG" = all] && [test "x$enable_linux_builtin" != xyes ]) - AM_CONDITIONAL([WANT_DEVNAME2DEVID], - [test "x$user_libudev" = xyes ]) AM_CONDITIONAL([CONFIG_QAT], [test "$ZFS_CONFIG" = kernel -o "$ZFS_CONFIG" = all] && [test "x$qatsrc" != x ]) + AM_CONDITIONAL([WANT_DEVNAME2DEVID], [test "x$user_libudev" = xyes ]) + AM_CONDITIONAL([WANT_MMAP_LIBAIO], [test "x$user_libaio" = xyes ]) ]) dnl # @@ -121,10 +159,45 @@ AC_DEFUN([ZFS_AC_RPM], [ ]) RPM_DEFINE_COMMON='--define "$(DEBUG_ZFS) 1"' - RPM_DEFINE_UTIL='--define "_dracutdir $(dracutdir)" --define "_udevdir $(udevdir)" --define "_udevruledir $(udevruledir)" --define "_initconfdir $(DEFAULT_INITCONF_DIR)" $(DEFINE_INITRAMFS)' + + + RPM_DEFINE_UTIL=' --define "_initconfdir $(DEFAULT_INITCONF_DIR)"' + + dnl # Make the next three RPM_DEFINE_UTIL additions conditional, since + dnl # their values may not be set when running: + dnl # + dnl # ./configure --with-config=srpm + dnl # + AS_IF([test -n "$dracutdir" ], [ + RPM_DEFINE_UTIL='--define "_dracutdir $(dracutdir)"' + ]) + AS_IF([test -n "$udevdir" ], [ + RPM_DEFINE_UTIL+=' --define "_udevdir $(udevdir)"' + ]) + AS_IF([test -n "$udevruledir" ], [ + RPM_DEFINE_UTIL+=' --define "_udevdir $(udevruledir)"' + ]) + RPM_DEFINE_UTIL+=' $(DEFINE_INITRAMFS)' + RPM_DEFINE_UTIL+=' $(DEFINE_SYSTEMD)' + RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)" --define "require_spldir $(SPL)" --define "require_splobj $(SPL_OBJ)" --define "ksrc $(LINUX)" --define "kobj $(LINUX_OBJ)"' + RPM_DEFINE_KMOD+=' --define "_wrong_version_format_terminate_build 0"' + RPM_DEFINE_DKMS= + dnl # Override default lib directory on Debian/Ubuntu systems. The provided + dnl # /usr/lib/rpm/platform//macros files do not specify the correct + dnl # path for multiarch systems as described by the packaging guidelines. + dnl # + dnl # https://wiki.ubuntu.com/MultiarchSpec + dnl # https://wiki.debian.org/Multiarch/Implementation + dnl # + AS_IF([test "$DEFAULT_PACKAGE" = "deb"], [ + MULTIARCH_LIBDIR="lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)" + RPM_DEFINE_UTIL+=' --define "_lib $(MULTIARCH_LIBDIR)"' + AC_SUBST(MULTIARCH_LIBDIR) + ]) + SRPM_DEFINE_COMMON='--define "build_src_rpm 1"' SRPM_DEFINE_UTIL= SRPM_DEFINE_KMOD= diff --git a/configure b/configure index f0c2f47d..f2e7b2c0 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for zfs 0.7.6. +# Generated by GNU Autoconf 2.63 for zfs 0.7.9. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='zfs' PACKAGE_TARNAME='zfs' -PACKAGE_VERSION='0.7.6' -PACKAGE_STRING='zfs 0.7.6' +PACKAGE_VERSION='0.7.9' +PACKAGE_STRING='zfs 0.7.9' PACKAGE_BUGREPORT='' # Factoring default headers for most tests. @@ -787,13 +787,15 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +DEBUG_CFLAGS DEBUG_ZFS DEBUG_STACKFLAGS -DEBUG_CFLAGS -CONFIG_QAT_FALSE -CONFIG_QAT_TRUE +WANT_MMAP_LIBAIO_FALSE +WANT_MMAP_LIBAIO_TRUE WANT_DEVNAME2DEVID_FALSE WANT_DEVNAME2DEVID_TRUE +CONFIG_QAT_FALSE +CONFIG_QAT_TRUE CONFIG_KERNEL_FALSE CONFIG_KERNEL_TRUE CONFIG_USER_FALSE @@ -802,9 +804,9 @@ RM ZONENAME NO_FORMAT_TRUNCATION runstatedir +LIBAIO FRAME_LARGER_THAN LIBUDEV -LIBATTR LIBBLKID LIBTIRPC_CFLAGS LIBTIRPC @@ -815,6 +817,7 @@ ZFS_INIT_SYSV modulesloaddir systemdpresetdir systemdunitdir +DEFINE_SYSTEMD ZFS_MODULE_LOAD ZFS_INIT_SYSTEMD udevruledir @@ -867,12 +870,25 @@ HAVE_RPMBUILD RPM_VERSION RPM HAVE_RPM +MULTIARCH_LIBDIR DEFINE_INITRAMFS DEFAULT_INITCONF_DIR DEFAULT_INIT_SCRIPT DEFAULT_INIT_DIR DEFAULT_PACKAGE VENDOR +CODE_COVERAGE_RULES +CODE_COVERAGE_LDFLAGS +CODE_COVERAGE_LIBS +CODE_COVERAGE_CXXFLAGS +CODE_COVERAGE_CFLAGS +CODE_COVERAGE_CPPFLAGS +GENHTML +LCOV +GCOV +CODE_COVERAGE_ENABLED +CODE_COVERAGE_ENABLED_FALSE +CODE_COVERAGE_ENABLED_TRUE am__fastdepCCAS_FALSE am__fastdepCCAS_TRUE CCASDEPMODE @@ -1014,6 +1030,8 @@ with_pic enable_fast_install with_gnu_ld enable_libtool_lock +with_gcov +enable_code_coverage with_spec with_config enable_linux_builtin @@ -1035,6 +1053,7 @@ enable_sysvinit with_dracutdir with_tirpc enable_debug +enable_debuginfo ' ac_precious_vars='build_alias host_alias @@ -1599,7 +1618,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures zfs 0.7.6 to adapt to many kinds of systems. +\`configure' configures zfs 0.7.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1670,7 +1689,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of zfs 0.7.6:";; + short | recursive ) echo "Configuration of zfs 0.7.9:";; esac cat <<\_ACEOF @@ -1689,12 +1708,14 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --enable-code-coverage Whether to enable code coverage support --enable-linux-builtin Configure for builtin in-tree kernel modules [default=no] --enable-systemd install systemd unit/preset files [default:], [yes] --enable-sysvinit install SysV init scripts default:, yes - --enable-debug Enable generic debug support [default=no] + --enable-debug Enable assertion support [default=no] + --enable-debuginfo Force generation of debuginfo [default=no] Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1702,6 +1723,7 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-gcov=GCOV use given GCOV for coverage (GCOV=gcov). --with-spec=SPEC Spec files 'generic|redhat' --with-config=CONFIG Config file 'kernel|user|all|srpm' --with-linux=PATH Path to kernel source @@ -1804,7 +1826,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -zfs configure 0.7.6 +zfs configure 0.7.9 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1818,7 +1840,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by zfs $as_me 0.7.6, which was +It was created by zfs $as_me 0.7.9, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2976,7 +2998,7 @@ fi # Define the identity of the package. PACKAGE='zfs' - VERSION='0.7.6' + VERSION='0.7.9' cat >>confdefs.h <<_ACEOF @@ -4853,13 +4875,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4856: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4878: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4859: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4881: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4862: output\"" >&5) + (eval echo "\"\$as_me:4884: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6065,7 +6087,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6068 "configure"' > conftest.$ac_ext + echo '#line 6090 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7922,11 +7944,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7925: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7947: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7929: \$? = $ac_status" >&5 + echo "$as_me:7951: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8261,11 +8283,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8264: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8286: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8268: \$? = $ac_status" >&5 + echo "$as_me:8290: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8366,11 +8388,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8369: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8391: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8373: \$? = $ac_status" >&5 + echo "$as_me:8395: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8421,11 +8443,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8424: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8446: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8428: \$? = $ac_status" >&5 + echo "$as_me:8450: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11224,7 +11246,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11227 "configure" +#line 11249 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11320,7 +11342,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11323 "configure" +#line 11345 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11813,6 +11835,389 @@ fi + + # allow to override gcov location + +# Check whether --with-gcov was given. +if test "${with_gcov+set}" = set; then + withval=$with_gcov; _AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov +else + _AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov +fi + + + { $as_echo "$as_me:$LINENO: checking whether to build with code coverage support" >&5 +$as_echo_n "checking whether to build with code coverage support... " >&6; } + # Check whether --enable-code-coverage was given. +if test "${enable_code_coverage+set}" = set; then + enableval=$enable_code_coverage; +else + enable_code_coverage=no +fi + + + if test x$enable_code_coverage = xyes; then + CODE_COVERAGE_ENABLED_TRUE= + CODE_COVERAGE_ENABLED_FALSE='#' +else + CODE_COVERAGE_ENABLED_TRUE='#' + CODE_COVERAGE_ENABLED_FALSE= +fi + + CODE_COVERAGE_ENABLED=$enable_code_coverage + + { $as_echo "$as_me:$LINENO: result: $enable_code_coverage" >&5 +$as_echo "$enable_code_coverage" >&6; } + + if test "$enable_code_coverage" = "yes" ; then + + # check for gcov + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}$_AX_CODE_COVERAGE_GCOV_PROG_WITH", so it can be a program name with args. +set dummy ${ac_tool_prefix}$_AX_CODE_COVERAGE_GCOV_PROG_WITH; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_GCOV+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$GCOV"; then + ac_cv_prog_GCOV="$GCOV" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_GCOV="${ac_tool_prefix}$_AX_CODE_COVERAGE_GCOV_PROG_WITH" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +GCOV=$ac_cv_prog_GCOV +if test -n "$GCOV"; then + { $as_echo "$as_me:$LINENO: result: $GCOV" >&5 +$as_echo "$GCOV" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_GCOV"; then + ac_ct_GCOV=$GCOV + # Extract the first word of "$_AX_CODE_COVERAGE_GCOV_PROG_WITH", so it can be a program name with args. +set dummy $_AX_CODE_COVERAGE_GCOV_PROG_WITH; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_GCOV+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_GCOV"; then + ac_cv_prog_ac_ct_GCOV="$ac_ct_GCOV" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_GCOV="$_AX_CODE_COVERAGE_GCOV_PROG_WITH" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_GCOV=$ac_cv_prog_ac_ct_GCOV +if test -n "$ac_ct_GCOV"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_GCOV" >&5 +$as_echo "$ac_ct_GCOV" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_GCOV" = x; then + GCOV=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + GCOV=$ac_ct_GCOV + fi +else + GCOV="$ac_cv_prog_GCOV" +fi + + if test "X$GCOV" = "X:"; then + { { $as_echo "$as_me:$LINENO: error: gcov is needed to do coverage" >&5 +$as_echo "$as_me: error: gcov is needed to do coverage" >&2;} + { (exit 1); exit 1; }; } +fi + + + + if test "$GCC" = "no" ; then + + { { $as_echo "$as_me:$LINENO: error: not compiling with gcc, which is required for gcov code coverage" >&5 +$as_echo "$as_me: error: not compiling with gcc, which is required for gcov code coverage" >&2;} + { (exit 1); exit 1; }; } + +fi + + + # Extract the first word of "lcov", so it can be a program name with args. +set dummy lcov; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_LCOV+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$LCOV"; then + ac_cv_prog_LCOV="$LCOV" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LCOV="lcov" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +LCOV=$ac_cv_prog_LCOV +if test -n "$LCOV"; then + { $as_echo "$as_me:$LINENO: result: $LCOV" >&5 +$as_echo "$LCOV" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + # Extract the first word of "genhtml", so it can be a program name with args. +set dummy genhtml; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_GENHTML+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$GENHTML"; then + ac_cv_prog_GENHTML="$GENHTML" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_GENHTML="genhtml" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +GENHTML=$ac_cv_prog_GENHTML +if test -n "$GENHTML"; then + { $as_echo "$as_me:$LINENO: result: $GENHTML" >&5 +$as_echo "$GENHTML" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + if test -z "$LCOV" ; then + + { { $as_echo "$as_me:$LINENO: error: To enable code coverage reporting you must have lcov installed" >&5 +$as_echo "$as_me: error: To enable code coverage reporting you must have lcov installed" >&2;} + { (exit 1); exit 1; }; } + +fi + + + if test -z "$GENHTML" ; then + + { { $as_echo "$as_me:$LINENO: error: Could not find genhtml from the lcov package" >&5 +$as_echo "$as_me: error: Could not find genhtml from the lcov package" >&2;} + { (exit 1); exit 1; }; } + +fi + + + CODE_COVERAGE_CPPFLAGS="" + CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage" + CODE_COVERAGE_CXXFLAGS="-O0 -g -fprofile-arcs -ftest-coverage" + CODE_COVERAGE_LIBS="-lgcov" + CODE_COVERAGE_LDFLAGS="$CODE_COVERAGE_LIBS" + + + + + + + + CODE_COVERAGE_RULES_CHECK=' + -$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k check + $(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture +' + CODE_COVERAGE_RULES_CAPTURE=' + $(code_coverage_v_lcov_cap)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(call code_coverage_sanitize,$(PACKAGE_NAME)-$(PACKAGE_VERSION))" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_OPTIONS) + $(code_coverage_v_lcov_ign)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_RMOPTS) + -@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp + $(code_coverage_v_genhtml)LANG=C $(GENHTML) $(code_coverage_quiet) $(addprefix --prefix ,$(CODE_COVERAGE_DIRECTORY)) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS) + @echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html" +' + CODE_COVERAGE_RULES_CLEAN=' +clean: code-coverage-clean +distclean: code-coverage-clean +code-coverage-clean: + -$(LCOV) --directory $(top_builddir) -z + -rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY) + -find . \( -name "*.gcda" -o -name "*.gcno" -o -name "*.gcov" \) -delete +' + +else + + CODE_COVERAGE_RULES_CHECK=' + @echo "Need to reconfigure with --enable-code-coverage" +' + CODE_COVERAGE_RULES_CAPTURE="$CODE_COVERAGE_RULES_CHECK" + CODE_COVERAGE_RULES_CLEAN='' + +fi + + +CODE_COVERAGE_RULES=' +# Code coverage +# +# Optional: +# - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting. +# Multiple directories may be specified, separated by whitespace. +# (Default: $(top_builddir)) +# - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated +# by lcov for code coverage. (Default: +# $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info) +# - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage +# reports to be created. (Default: +# $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage) +# - CODE_COVERAGE_BRANCH_COVERAGE: Set to 1 to enforce branch coverage, +# set to 0 to disable it and leave empty to stay with the default. +# (Default: empty) +# - CODE_COVERAGE_LCOV_SHOPTS_DEFAULT: Extra options shared between both lcov +# instances. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE) +# - CODE_COVERAGE_LCOV_SHOPTS: Extra options to shared between both lcov +# instances. (Default: $CODE_COVERAGE_LCOV_SHOPTS_DEFAULT) +# - CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH: --gcov-tool pathtogcov +# - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the +# collecting lcov instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) +# - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the collecting lcov +# instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) +# - CODE_COVERAGE_LCOV_RMOPTS_DEFAULT: Extra options to pass to the filtering +# lcov instance. (Default: empty) +# - CODE_COVERAGE_LCOV_RMOPTS: Extra options to pass to the filtering lcov +# instance. (Default: $CODE_COVERAGE_LCOV_RMOPTS_DEFAULT) +# - CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT: Extra options to pass to the +# genhtml instance. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE) +# - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml +# instance. (Default: $CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT) +# - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore +# +# The generated report will be titled using the $(PACKAGE_NAME) and +# $(PACKAGE_VERSION). In order to add the current git hash to the title, +# use the git-version-gen script, available online. + +# Optional variables +CODE_COVERAGE_DIRECTORY ?= $(top_builddir) +CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info +CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage +CODE_COVERAGE_BRANCH_COVERAGE ?= +CODE_COVERAGE_LCOV_SHOPTS_DEFAULT ?= $(if $(CODE_COVERAGE_BRANCH_COVERAGE),\ +--rc lcov_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE)) +CODE_COVERAGE_LCOV_SHOPTS ?= $(CODE_COVERAGE_LCOV_SHOPTS_DEFAULT) +CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH ?= --gcov-tool "$(GCOV)" +CODE_COVERAGE_LCOV_OPTIONS_DEFAULT ?= $(CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) +CODE_COVERAGE_LCOV_OPTIONS ?= $(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) +CODE_COVERAGE_LCOV_RMOPTS_DEFAULT ?= +CODE_COVERAGE_LCOV_RMOPTS ?= $(CODE_COVERAGE_LCOV_RMOPTS_DEFAULT) +CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT ?=\ +$(if $(CODE_COVERAGE_BRANCH_COVERAGE),\ +--rc genhtml_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE)) +CODE_COVERAGE_GENHTML_OPTIONS ?= $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT) +CODE_COVERAGE_IGNORE_PATTERN ?= + +GITIGNOREFILES ?= +GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) + +code_coverage_v_lcov_cap = $(code_coverage_v_lcov_cap_$(V)) +code_coverage_v_lcov_cap_ = $(code_coverage_v_lcov_cap_$(AM_DEFAULT_VERBOSITY)) +code_coverage_v_lcov_cap_0 = @echo " LCOV --capture"\ + $(CODE_COVERAGE_OUTPUT_FILE); +code_coverage_v_lcov_ign = $(code_coverage_v_lcov_ign_$(V)) +code_coverage_v_lcov_ign_ = $(code_coverage_v_lcov_ign_$(AM_DEFAULT_VERBOSITY)) +code_coverage_v_lcov_ign_0 = @echo " LCOV --remove /tmp/*"\ + $(CODE_COVERAGE_IGNORE_PATTERN); +code_coverage_v_genhtml = $(code_coverage_v_genhtml_$(V)) +code_coverage_v_genhtml_ = $(code_coverage_v_genhtml_$(AM_DEFAULT_VERBOSITY)) +code_coverage_v_genhtml_0 = @echo " GEN " $(CODE_COVERAGE_OUTPUT_DIRECTORY); +code_coverage_quiet = $(code_coverage_quiet_$(V)) +code_coverage_quiet_ = $(code_coverage_quiet_$(AM_DEFAULT_VERBOSITY)) +code_coverage_quiet_0 = --quiet + +# sanitizes the test-name: replaces with underscores: dashes and dots +code_coverage_sanitize = $(subst -,_,$(subst .,_,$(1))) + +# Use recursive makes in order to ignore errors during check +check-code-coverage:'"$CODE_COVERAGE_RULES_CHECK"' + +# Capture code coverage data +code-coverage-capture: code-coverage-capture-hook'"$CODE_COVERAGE_RULES_CAPTURE"' + +# Hook rule executed before code-coverage-capture, overridable by the user +code-coverage-capture-hook: + +'"$CODE_COVERAGE_RULES_CLEAN"' + +A''M_DISTCHECK_CONFIGURE_FLAGS ?= +A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage + +.PHONY: check-code-coverage code-coverage-capture code-coverage-capture-hook code-coverage-clean +' + + + + + + { $as_echo "$as_me:$LINENO: checking zfs author" >&5 $as_echo_n "checking zfs author... " >&6; } { $as_echo "$as_me:$LINENO: result: $ZFS_META_AUTHOR" >&5 @@ -11974,10 +12379,45 @@ fi RPM_DEFINE_COMMON='--define "$(DEBUG_ZFS) 1"' - RPM_DEFINE_UTIL='--define "_dracutdir $(dracutdir)" --define "_udevdir $(udevdir)" --define "_udevruledir $(udevruledir)" --define "_initconfdir $(DEFAULT_INITCONF_DIR)" $(DEFINE_INITRAMFS)' + + + RPM_DEFINE_UTIL=' --define "_initconfdir $(DEFAULT_INITCONF_DIR)"' + + if test -n "$dracutdir" ; then + + RPM_DEFINE_UTIL='--define "_dracutdir $(dracutdir)"' + +fi + + if test -n "$udevdir" ; then + + RPM_DEFINE_UTIL+=' --define "_udevdir $(udevdir)"' + +fi + + if test -n "$udevruledir" ; then + + RPM_DEFINE_UTIL+=' --define "_udevdir $(udevruledir)"' + +fi + + RPM_DEFINE_UTIL+=' $(DEFINE_INITRAMFS)' + RPM_DEFINE_UTIL+=' $(DEFINE_SYSTEMD)' + RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)" --define "require_spldir $(SPL)" --define "require_splobj $(SPL_OBJ)" --define "ksrc $(LINUX)" --define "kobj $(LINUX_OBJ)"' + RPM_DEFINE_KMOD+=' --define "_wrong_version_format_terminate_build 0"' + RPM_DEFINE_DKMS= + if test "$DEFAULT_PACKAGE" = "deb"; then + + MULTIARCH_LIBDIR="lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)" + RPM_DEFINE_UTIL+=' --define "_lib $(MULTIARCH_LIBDIR)"' + + +fi + + SRPM_DEFINE_COMMON='--define "build_src_rpm 1"' SRPM_DEFINE_UTIL= SRPM_DEFINE_KMOD= @@ -13994,7 +14434,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14078,7 +14518,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14233,7 +14673,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14309,7 +14749,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14369,7 +14809,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14509,7 +14949,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14583,7 +15023,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14646,7 +15086,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14732,7 +15172,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14807,7 +15247,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14896,7 +15336,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14981,7 +15421,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15054,7 +15494,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15128,7 +15568,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15201,7 +15641,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15313,7 +15753,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15425,7 +15865,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15490,7 +15930,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15633,7 +16073,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15760,7 +16200,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15836,7 +16276,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15913,7 +16353,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15988,7 +16428,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16064,7 +16504,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16140,7 +16580,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16214,7 +16654,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16287,7 +16727,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16360,7 +16800,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16433,7 +16873,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16507,7 +16947,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16583,7 +17023,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16659,7 +17099,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16733,7 +17173,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16807,7 +17247,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16882,7 +17322,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16918,10 +17358,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether blk_queue_flush() is available" >&5 -$as_echo_n "checking whether blk_queue_flush() is available... " >&6; } - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" + { $as_echo "$as_me:$LINENO: checking whether blk_queue_flag_clear() exists" >&5 +$as_echo_n "checking whether blk_queue_flag_clear() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -16932,6 +17370,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ + #include #include int @@ -16939,7 +17378,7 @@ main (void) { struct request_queue *q = NULL; - (void) blk_queue_flush(q, REQ_FLUSH); + blk_queue_flag_clear(0, q); ; return 0; @@ -16958,7 +17397,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16970,16 +17409,33 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BLK_QUEUE_FLUSH 1 +#define HAVE_BLK_QUEUE_FLAG_CLEAR 1 _ACEOF - { $as_echo "$as_me:$LINENO: checking whether blk_queue_flush() is GPL-only" >&5 -$as_echo_n "checking whether blk_queue_flush() is GPL-only... " >&6; } +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether blk_queue_flag_set() exists" >&5 +$as_echo_n "checking whether blk_queue_flag_set() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -16990,17 +17446,15 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include - - MODULE_LICENSE("$ZFS_META_LICENSE"); + #include + #include int main (void) { - struct request_queue *q = NULL; - (void) blk_queue_flush(q, REQ_FLUSH); + struct request_queue *q = NULL; + blk_queue_flag_set(0, q); ; return 0; @@ -17019,7 +17473,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17031,29 +17485,14 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BLK_QUEUE_FLUSH_GPL_ONLY 1 +#define HAVE_BLK_QUEUE_FLAG_SET 1 _ACEOF - - -fi - - rm -Rf build - - - else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -17069,8 +17508,11 @@ fi - { $as_echo "$as_me:$LINENO: checking whether blk_queue_write_cache() exists" >&5 -$as_echo_n "checking whether blk_queue_write_cache() exists... " >&6; } + + { $as_echo "$as_me:$LINENO: checking whether blk_queue_flush() is available" >&5 +$as_echo_n "checking whether blk_queue_flush() is available... " >&6; } + tmp_flags="$EXTRA_KCFLAGS" + EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" cat confdefs.h - <<_ACEOF >conftest.c @@ -17081,16 +17523,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include #include - int main (void) { struct request_queue *q = NULL; - blk_queue_write_cache(q, true, true); + (void) blk_queue_flush(q, REQ_FLUSH); ; return 0; @@ -17109,7 +17549,158 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_BLK_QUEUE_FLUSH 1 +_ACEOF + + + { $as_echo "$as_me:$LINENO: checking whether blk_queue_flush() is GPL-only" >&5 +$as_echo_n "checking whether blk_queue_flush() is GPL-only... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + #include + + MODULE_LICENSE("$ZFS_META_LICENSE"); + +int +main (void) +{ + + struct request_queue *q = NULL; + (void) blk_queue_flush(q, REQ_FLUSH); + + ; + return 0; +} + +_ACEOF + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_BLK_QUEUE_FLUSH_GPL_ONLY 1 +_ACEOF + + + + +fi + + rm -Rf build + + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + + +fi + + rm -Rf build + + + + { $as_echo "$as_me:$LINENO: checking whether blk_queue_write_cache() exists" >&5 +$as_echo_n "checking whether blk_queue_write_cache() exists... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + #include + + +int +main (void) +{ + + struct request_queue *q = NULL; + blk_queue_write_cache(q, true, true); + + ; + return 0; +} + +_ACEOF + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17171,7 +17762,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17264,7 +17855,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17341,7 +17932,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17419,7 +18010,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17498,7 +18089,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17534,6 +18125,119 @@ fi EXTRA_KCFLAGS="$tmp_flags" + { $as_echo "$as_me:$LINENO: checking whether get_disk_and_module() is available" >&5 +$as_echo_n "checking whether get_disk_and_module() is available... " >&6; } + + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + +int +main (void) +{ + + struct gendisk *disk = NULL; + (void) get_disk_and_module(disk); + + ; + return 0; +} + +_ACEOF + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + rc=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + rc=1 + + +fi + + rm -Rf build + + + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + else + if test "x$enable_linux_builtin" != xyes; then + + grep -q -E '[[:space:]]get_disk_and_module[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in block/genhd.c; do + grep -q -E "EXPORT_SYMBOL.*(get_disk_and_module)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi + + fi + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + else : + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_GET_DISK_AND_MODULE 1 +_ACEOF + + + fi + fi + + { $as_echo "$as_me:$LINENO: checking whether get_disk_ro() is available" >&5 $as_echo_n "checking whether get_disk_ro() is available... " >&6; } @@ -17575,7 +18279,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17649,7 +18353,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17763,7 +18467,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17838,7 +18542,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17913,7 +18617,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18000,7 +18704,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18077,7 +18781,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18157,7 +18861,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18227,7 +18931,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18297,7 +19001,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18366,7 +19070,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18473,7 +19177,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18544,7 +19248,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18614,7 +19318,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18684,7 +19388,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18787,7 +19491,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18857,7 +19561,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18928,7 +19632,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18998,7 +19702,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19097,7 +19801,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19162,7 +19866,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19248,7 +19952,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19324,7 +20028,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19387,7 +20091,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19483,7 +20187,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19557,7 +20261,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19630,7 +20334,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19705,7 +20409,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19783,7 +20487,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19862,7 +20566,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19911,6 +20615,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include + #include int permission_fn(struct inode *inode, int mask, struct nameidata *nd) { return 0; } @@ -19942,7 +20647,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20026,7 +20731,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20106,7 +20811,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20191,7 +20896,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20271,7 +20976,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20354,7 +21059,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20436,7 +21141,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20511,7 +21216,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20547,8 +21252,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether uncached_acl_sentinel() exists" >&5 -$as_echo_n "checking whether uncached_acl_sentinel() exists... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether inode_set_iversion() exists" >&5 +$as_echo_n "checking whether inode_set_iversion() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -20559,13 +21264,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - void *sentinel __attribute__ ((unused)) = uncached_acl_sentinel(NULL); + struct inode inode; + inode_set_iversion(&inode, 1); ; return 0; @@ -20584,7 +21290,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20600,7 +21306,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_KERNEL_GET_ACL_HANDLE_CACHE 1 +#define HAVE_INODE_SET_IVERSION 1 _ACEOF @@ -20620,9 +21326,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether sops->show_options() wants dentry" >&5 -$as_echo_n "checking whether sops->show_options() wants dentry... " >&6; } - + { $as_echo "$as_me:$LINENO: checking whether uncached_acl_sentinel() exists" >&5 +$as_echo_n "checking whether uncached_acl_sentinel() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -20635,15 +21340,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include - int show_options (struct seq_file * x, struct dentry * y) { return 0; }; - static struct super_operations sops __attribute__ ((unused)) = { - .show_options = show_options, - }; - int main (void) { + void *sentinel __attribute__ ((unused)) = uncached_acl_sentinel(NULL); ; return 0; @@ -20662,7 +21363,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20678,7 +21379,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_SHOW_OPTIONS_WITH_DENTRY 1 +#define HAVE_KERNEL_GET_ACL_HANDLE_CACHE 1 _ACEOF @@ -20698,8 +21399,9 @@ fi - { $as_echo "$as_me:$LINENO: checking whether file_inode() is available" >&5 -$as_echo_n "checking whether file_inode() is available... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether sops->show_options() wants dentry" >&5 +$as_echo_n "checking whether sops->show_options() wants dentry... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.c @@ -20712,12 +21414,15 @@ cat >>conftest.$ac_ext <<_ACEOF #include + int show_options (struct seq_file * x, struct dentry * y) { return 0; }; + static struct super_operations sops __attribute__ ((unused)) = { + .show_options = show_options, + }; + int main (void) { - struct file *f = NULL; - file_inode(f); ; return 0; @@ -20736,7 +21441,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20752,7 +21457,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_FILE_INODE 1 +#define HAVE_SHOW_OPTIONS_WITH_DENTRY 1 _ACEOF @@ -20772,8 +21477,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether file_dentry() is available" >&5 -$as_echo_n "checking whether file_dentry() is available... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether file_inode() is available" >&5 +$as_echo_n "checking whether file_inode() is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -20791,7 +21496,7 @@ main (void) { struct file *f = NULL; - file_dentry(f); + file_inode(f); ; return 0; @@ -20810,7 +21515,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20826,7 +21531,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_FILE_DENTRY 1 +#define HAVE_FILE_INODE 1 _ACEOF @@ -20846,9 +21551,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether fops->fsync() wants" >&5 -$as_echo_n "checking whether fops->fsync() wants... " >&6; } - + { $as_echo "$as_me:$LINENO: checking whether file_dentry() is available" >&5 +$as_echo_n "checking whether file_dentry() is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -20861,18 +21565,12 @@ cat >>conftest.$ac_ext <<_ACEOF #include - int test_fsync(struct file *f, struct dentry *dentry, int x) - { return 0; } - - static const struct file_operations - fops __attribute__ ((unused)) = { - .fsync = test_fsync, - }; - int main (void) { + struct file *f = NULL; + file_dentry(f); ; return 0; @@ -20891,7 +21589,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20903,11 +21601,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: dentry" >&5 -$as_echo "dentry" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_FSYNC_WITH_DENTRY 1 +#define HAVE_FILE_DENTRY 1 _ACEOF @@ -20915,6 +21613,8 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } @@ -20925,6 +21625,9 @@ fi + { $as_echo "$as_me:$LINENO: checking whether fops->fsync() wants" >&5 +$as_echo_n "checking whether fops->fsync() wants... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.c @@ -20937,7 +21640,8 @@ cat >>conftest.$ac_ext <<_ACEOF #include - int test_fsync(struct file *f, int x) { return 0; } + int test_fsync(struct file *f, struct dentry *dentry, int x) + { return 0; } static const struct file_operations fops __attribute__ ((unused)) = { @@ -20966,7 +21670,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20978,11 +21682,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: no dentry" >&5 -$as_echo "no dentry" >&6; } + { $as_echo "$as_me:$LINENO: result: dentry" >&5 +$as_echo "dentry" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_FSYNC_WITHOUT_DENTRY 1 +#define HAVE_FSYNC_WITH_DENTRY 1 _ACEOF @@ -21012,8 +21716,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include - int test_fsync(struct file *f, loff_t a, loff_t b, int c) - { return 0; } + int test_fsync(struct file *f, int x) { return 0; } static const struct file_operations fops __attribute__ ((unused)) = { @@ -21042,82 +21745,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - { $as_echo "$as_me:$LINENO: result: range" >&5 -$as_echo "range" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_FSYNC_RANGE 1 -_ACEOF - - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - - - -fi - - rm -Rf build - - - - - - { $as_echo "$as_me:$LINENO: checking whether sops->evict_inode() exists" >&5 -$as_echo_n "checking whether sops->evict_inode() exists... " >&6; } - - -cat confdefs.h - <<_ACEOF >conftest.c -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - - #include - void evict_inode (struct inode * t) { return; } - static struct super_operations sops __attribute__ ((unused)) = { - .evict_inode = evict_inode, - }; - -int -main (void) -{ - - - ; - return 0; -} - -_ACEOF - - - -cat - <<_ACEOF >conftest.h - -_ACEOF - - - rm -Rf build && mkdir -p build && touch build/conftest.mod.c - echo "obj-m := conftest.o" >build/Makefile - modpost_flag='' - test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21129,11 +21757,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:$LINENO: result: no dentry" >&5 +$as_echo "no dentry" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_EVICT_INODE 1 +#define HAVE_FSYNC_WITHOUT_DENTRY 1 _ACEOF @@ -21141,8 +21769,6 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } @@ -21153,8 +21779,6 @@ fi - { $as_echo "$as_me:$LINENO: checking whether sops->dirty_inode() wants flags" >&5 -$as_echo_n "checking whether sops->dirty_inode() wants flags... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -21167,11 +21791,12 @@ cat >>conftest.$ac_ext <<_ACEOF #include - void dirty_inode(struct inode *a, int b) { return; } + int test_fsync(struct file *f, loff_t a, loff_t b, int c) + { return 0; } - static const struct super_operations - sops __attribute__ ((unused)) = { - .dirty_inode = dirty_inode, + static const struct file_operations + fops __attribute__ ((unused)) = { + .fsync = test_fsync, }; int @@ -21196,7 +21821,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21208,11 +21833,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:$LINENO: result: range" >&5 +$as_echo "range" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_DIRTY_INODE_WITH_FLAGS 1 +#define HAVE_FSYNC_RANGE 1 _ACEOF @@ -21220,8 +21845,6 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } @@ -21232,87 +21855,9 @@ fi - { $as_echo "$as_me:$LINENO: checking whether sops->nr_cached_objects() exists" >&5 -$as_echo_n "checking whether sops->nr_cached_objects() exists... " >&6; } - - -cat confdefs.h - <<_ACEOF >conftest.c -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - - #include - - int nr_cached_objects(struct super_block *sb) { return 0; } - - static const struct super_operations - sops __attribute__ ((unused)) = { - .nr_cached_objects = nr_cached_objects, - }; - -int -main (void) -{ - - ; - return 0; -} - -_ACEOF - - - -cat - <<_ACEOF >conftest.h - -_ACEOF - - - rm -Rf build && mkdir -p build && touch build/conftest.mod.c - echo "obj-m := conftest.o" >build/Makefile - modpost_flag='' - test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_NR_CACHED_OBJECTS 1 -_ACEOF - - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - - -fi - - rm -Rf build - - - - - { $as_echo "$as_me:$LINENO: checking whether sops->free_cached_objects() exists" >&5 -$as_echo_n "checking whether sops->free_cached_objects() exists... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether sops->evict_inode() exists" >&5 +$as_echo_n "checking whether sops->evict_inode() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -21324,13 +21869,9 @@ cat >>conftest.$ac_ext <<_ACEOF #include - - void free_cached_objects(struct super_block *sb, int x) - { return; } - - static const struct super_operations - sops __attribute__ ((unused)) = { - .free_cached_objects = free_cached_objects, + void evict_inode (struct inode * t) { return; } + static struct super_operations sops __attribute__ ((unused)) = { + .evict_inode = evict_inode, }; int @@ -21355,7 +21896,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21371,7 +21912,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_FREE_CACHED_OBJECTS 1 +#define HAVE_EVICT_INODE 1 _ACEOF @@ -21391,9 +21932,8 @@ fi - - { $as_echo "$as_me:$LINENO: checking whether fops->fallocate() exists" >&5 -$as_echo_n "checking whether fops->fallocate() exists... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether sops->dirty_inode() wants flags" >&5 +$as_echo_n "checking whether sops->dirty_inode() wants flags... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -21406,12 +21946,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include - long test_fallocate(struct file *file, int mode, - loff_t offset, loff_t len) { return 0; } + void dirty_inode(struct inode *a, int b) { return; } - static const struct file_operations - fops __attribute__ ((unused)) = { - .fallocate = test_fallocate, + static const struct super_operations + sops __attribute__ ((unused)) = { + .dirty_inode = dirty_inode, }; int @@ -21436,7 +21975,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21452,7 +21991,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_FILE_FALLOCATE 1 +#define HAVE_DIRTY_INODE_WITH_FLAGS 1 _ACEOF @@ -21472,8 +22011,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether iops->fallocate() exists" >&5 -$as_echo_n "checking whether iops->fallocate() exists... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether sops->nr_cached_objects() exists" >&5 +$as_echo_n "checking whether sops->nr_cached_objects() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -21486,12 +22025,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include - long test_fallocate(struct inode *inode, int mode, - loff_t offset, loff_t len) { return 0; } + int nr_cached_objects(struct super_block *sb) { return 0; } - static const struct inode_operations - fops __attribute__ ((unused)) = { - .fallocate = test_fallocate, + static const struct super_operations + sops __attribute__ ((unused)) = { + .nr_cached_objects = nr_cached_objects, }; int @@ -21516,7 +22054,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21532,7 +22070,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_INODE_FALLOCATE 1 +#define HAVE_NR_CACHED_OBJECTS 1 _ACEOF @@ -21552,9 +22090,8 @@ fi - - { $as_echo "$as_me:$LINENO: checking whether fops->aio_fsync() exists" >&5 -$as_echo_n "checking whether fops->aio_fsync() exists... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether sops->free_cached_objects() exists" >&5 +$as_echo_n "checking whether sops->free_cached_objects() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -21567,9 +22104,12 @@ cat >>conftest.$ac_ext <<_ACEOF #include - static const struct file_operations - fops __attribute__ ((unused)) = { - .aio_fsync = NULL, + void free_cached_objects(struct super_block *sb, int x) + { return; } + + static const struct super_operations + sops __attribute__ ((unused)) = { + .free_cached_objects = free_cached_objects, }; int @@ -21594,7 +22134,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21610,7 +22150,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_FILE_AIO_FSYNC 1 +#define HAVE_FREE_CACHED_OBJECTS 1 _ACEOF @@ -21630,8 +22170,9 @@ fi - { $as_echo "$as_me:$LINENO: checking whether iops->create()/mkdir()/mknod() take umode_t" >&5 -$as_echo_n "checking whether iops->create()/mkdir()/mknod() take umode_t... " >&6; } + + { $as_echo "$as_me:$LINENO: checking whether fops->fallocate() exists" >&5 +$as_echo_n "checking whether fops->fallocate() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -21644,12 +22185,12 @@ cat >>conftest.$ac_ext <<_ACEOF #include - int mkdir(struct inode *inode, struct dentry *dentry, - umode_t umode) { return 0; } + long test_fallocate(struct file *file, int mode, + loff_t offset, loff_t len) { return 0; } - static const struct inode_operations - iops __attribute__ ((unused)) = { - .mkdir = mkdir, + static const struct file_operations + fops __attribute__ ((unused)) = { + .fallocate = test_fallocate, }; int @@ -21674,7 +22215,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21690,7 +22231,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_MKDIR_UMODE_T 1 +#define HAVE_FILE_FALLOCATE 1 _ACEOF @@ -21710,8 +22251,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether iops->lookup() passes nameidata" >&5 -$as_echo_n "checking whether iops->lookup() passes nameidata... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether iops->fallocate() exists" >&5 +$as_echo_n "checking whether iops->fallocate() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -21724,13 +22265,12 @@ cat >>conftest.$ac_ext <<_ACEOF #include - struct dentry *inode_lookup(struct inode *inode, - struct dentry *dentry, struct nameidata *nidata) - { return NULL; } + long test_fallocate(struct inode *inode, int mode, + loff_t offset, loff_t len) { return 0; } - static const struct inode_operations iops - __attribute__ ((unused)) = { - .lookup = inode_lookup, + static const struct inode_operations + fops __attribute__ ((unused)) = { + .fallocate = test_fallocate, }; int @@ -21755,7 +22295,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21771,7 +22311,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_LOOKUP_NAMEIDATA 1 +#define HAVE_INODE_FALLOCATE 1 _ACEOF @@ -21791,8 +22331,9 @@ fi - { $as_echo "$as_me:$LINENO: checking whether iops->create() passes nameidata" >&5 -$as_echo_n "checking whether iops->create() passes nameidata... " >&6; } + + { $as_echo "$as_me:$LINENO: checking whether fops->aio_fsync() exists" >&5 +$as_echo_n "checking whether fops->aio_fsync() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -21805,17 +22346,9 @@ cat >>conftest.$ac_ext <<_ACEOF #include - #ifdef HAVE_MKDIR_UMODE_T - int inode_create(struct inode *inode ,struct dentry *dentry, - umode_t umode, struct nameidata *nidata) { return 0; } - #else - int inode_create(struct inode *inode,struct dentry *dentry, - int umode, struct nameidata * nidata) { return 0; } - #endif - - static const struct inode_operations - iops __attribute__ ((unused)) = { - .create = inode_create, + static const struct file_operations + fops __attribute__ ((unused)) = { + .aio_fsync = NULL, }; int @@ -21840,7 +22373,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21856,7 +22389,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_CREATE_NAMEIDATA 1 +#define HAVE_FILE_AIO_FSYNC 1 _ACEOF @@ -21876,8 +22409,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether iops->get_link() passes delayed" >&5 -$as_echo_n "checking whether iops->get_link() passes delayed... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether iops->create()/mkdir()/mknod() take umode_t" >&5 +$as_echo_n "checking whether iops->create()/mkdir()/mknod() take umode_t... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -21889,11 +22422,13 @@ cat >>conftest.$ac_ext <<_ACEOF #include - const char *get_link(struct dentry *de, struct inode *ip, - struct delayed_call *done) { return "symlink"; } - static struct inode_operations - iops __attribute__ ((unused)) = { - .get_link = get_link, + + int mkdir(struct inode *inode, struct dentry *dentry, + umode_t umode) { return 0; } + + static const struct inode_operations + iops __attribute__ ((unused)) = { + .mkdir = mkdir, }; int @@ -21918,7 +22453,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21934,7 +22469,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_GET_LINK_DELAYED 1 +#define HAVE_MKDIR_UMODE_T 1 _ACEOF @@ -21942,79 +22477,20 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether iops->get_link() passes cookie" >&5 -$as_echo_n "checking whether iops->get_link() passes cookie... " >&6; } - -cat confdefs.h - <<_ACEOF >conftest.c -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - #include - const char *get_link(struct dentry *de, struct - inode *ip, void **cookie) { return "symlink"; } - static struct inode_operations - iops __attribute__ ((unused)) = { - .get_link = get_link, - }; - -int -main (void) -{ - - - ; - return 0; -} - -_ACEOF - - - -cat - <<_ACEOF >conftest.h - -_ACEOF - - - rm -Rf build && mkdir -p build && touch build/conftest.mod.c - echo "obj-m := conftest.o" >build/Makefile - modpost_flag='' - test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } +fi -cat >>confdefs.h <<\_ACEOF -#define HAVE_GET_LINK_COOKIE 1 -_ACEOF + rm -Rf build -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether iops->follow_link() passes cookie" >&5 -$as_echo_n "checking whether iops->follow_link() passes cookie... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether iops->lookup() passes nameidata" >&5 +$as_echo_n "checking whether iops->lookup() passes nameidata... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -22026,80 +22502,16 @@ cat >>conftest.$ac_ext <<_ACEOF #include - const char *follow_link(struct dentry *de, - void **cookie) { return "symlink"; } - static struct inode_operations - iops __attribute__ ((unused)) = { - .follow_link = follow_link, - }; - -int -main (void) -{ - - - ; - return 0; -} - -_ACEOF - - - -cat - <<_ACEOF >conftest.h - -_ACEOF - - - rm -Rf build && mkdir -p build && touch build/conftest.mod.c - echo "obj-m := conftest.o" >build/Makefile - modpost_flag='' - test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_FOLLOW_LINK_COOKIE 1 -_ACEOF - - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether iops->follow_link() passes nameidata" >&5 -$as_echo_n "checking whether iops->follow_link() passes nameidata... " >&6; } - - -cat confdefs.h - <<_ACEOF >conftest.c -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + #include + struct dentry *inode_lookup(struct inode *inode, + struct dentry *dentry, struct nameidata *nidata) + { return NULL; } - #include - void *follow_link(struct dentry *de, struct - nameidata *nd) { return (void *)NULL; } - static struct inode_operations - iops __attribute__ ((unused)) = { - .follow_link = follow_link, - }; + static const struct inode_operations iops + __attribute__ ((unused)) = { + .lookup = inode_lookup, + }; int main (void) @@ -22123,7 +22535,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22135,11 +22547,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_FOLLOW_LINK_NAMEIDATA 1 +#define HAVE_LOOKUP_NAMEIDATA 1 _ACEOF @@ -22147,34 +22559,8 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { { $as_echo "$as_me:$LINENO: error: no; please file a bug report" >&5 -$as_echo "$as_me: error: no; please file a bug report" >&2;} - { (exit 1); exit 1; }; } - - - -fi - - rm -Rf build - - - - - -fi - - rm -Rf build - - - - - - -fi - - rm -Rf build - - + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } @@ -22185,6 +22571,8 @@ fi + { $as_echo "$as_me:$LINENO: checking whether iops->create() passes nameidata" >&5 +$as_echo_n "checking whether iops->create() passes nameidata... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -22195,10 +22583,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #if !defined(HAVE_GET_LINK_DELAYED) - #error "Expecting get_link() delayed done" + #include + #include + + #ifdef HAVE_MKDIR_UMODE_T + int inode_create(struct inode *inode ,struct dentry *dentry, + umode_t umode, struct nameidata *nidata) { return 0; } + #else + int inode_create(struct inode *inode,struct dentry *dentry, + int umode, struct nameidata * nidata) { return 0; } #endif + static const struct inode_operations + iops __attribute__ ((unused)) = { + .create = inode_create, + }; + int main (void) { @@ -22221,7 +22621,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22233,9 +22633,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_PUT_LINK_DELAYED 1 +#define HAVE_CREATE_NAMEIDATA 1 _ACEOF @@ -22243,8 +22645,20 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: checking whether iops->put_link() passes cookie" >&5 -$as_echo_n "checking whether iops->put_link() passes cookie... " >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether iops->get_link() passes delayed" >&5 +$as_echo_n "checking whether iops->get_link() passes delayed... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -22255,13 +22669,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - void put_link(struct inode *ip, void *cookie) - { return; } - static struct inode_operations - iops __attribute__ ((unused)) = { - .put_link = put_link, - }; + #include + const char *get_link(struct dentry *de, struct inode *ip, + struct delayed_call *done) { return "symlink"; } + static struct inode_operations + iops __attribute__ ((unused)) = { + .get_link = get_link, + }; int main (void) @@ -22285,7 +22699,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22297,11 +22711,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_PUT_LINK_COOKIE 1 +#define HAVE_GET_LINK_DELAYED 1 _ACEOF @@ -22309,10 +22723,10 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether iops->put_link() passes nameidata" >&5 -$as_echo_n "checking whether iops->put_link() passes nameidata... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether iops->get_link() passes cookie" >&5 +$as_echo_n "checking whether iops->get_link() passes cookie... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -22323,13 +22737,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - void put_link(struct dentry *de, struct - nameidata *nd, void *ptr) { return; } - static struct inode_operations - iops __attribute__ ((unused)) = { - .put_link = put_link, - }; + #include + const char *get_link(struct dentry *de, struct + inode *ip, void **cookie) { return "symlink"; } + static struct inode_operations + iops __attribute__ ((unused)) = { + .get_link = get_link, + }; int main (void) @@ -22353,7 +22767,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22365,11 +22779,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_PUT_LINK_NAMEIDATA 1 +#define HAVE_GET_LINK_COOKIE 1 _ACEOF @@ -22377,37 +22791,11 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { { $as_echo "$as_me:$LINENO: error: no; please file a bug report" >&5 -$as_echo "$as_me: error: no; please file a bug report" >&2;} - { (exit 1); exit 1; }; } - - - -fi - - rm -Rf build - - - - - -fi - - rm -Rf build - - - - - -fi - - rm -Rf build - - - + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether i_op->tmpfile() exists" >&5 -$as_echo_n "checking whether i_op->tmpfile() exists... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether iops->follow_link() passes cookie" >&5 +$as_echo_n "checking whether iops->follow_link() passes cookie... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -22419,11 +22807,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include - int tmpfile(struct inode *inode, struct dentry *dentry, - umode_t mode) { return 0; } + const char *follow_link(struct dentry *de, + void **cookie) { return "symlink"; } static struct inode_operations iops __attribute__ ((unused)) = { - .tmpfile = tmpfile, + .follow_link = follow_link, }; int @@ -22448,7 +22836,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22464,7 +22852,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_TMPFILE 1 +#define HAVE_FOLLOW_LINK_COOKIE 1 _ACEOF @@ -22472,20 +22860,10 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - - - -fi - - rm -Rf build - - - - - { $as_echo "$as_me:$LINENO: checking whether iops->truncate_range() exists" >&5 -$as_echo_n "checking whether iops->truncate_range() exists... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether iops->follow_link() passes nameidata" >&5 +$as_echo_n "checking whether iops->follow_link() passes nameidata... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -22497,11 +22875,12 @@ cat >>conftest.$ac_ext <<_ACEOF #include - void truncate_range(struct inode *inode, loff_t start, - loff_t end) { return; } - static struct inode_operations iops __attribute__ ((unused)) = { - .truncate_range = truncate_range, - }; + void *follow_link(struct dentry *de, struct + nameidata *nd) { return (void *)NULL; } + static struct inode_operations + iops __attribute__ ((unused)) = { + .follow_link = follow_link, + }; int main (void) @@ -22525,7 +22904,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22537,11 +22916,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_INODE_TRUNCATE_RANGE 1 +#define HAVE_FOLLOW_LINK_NAMEIDATA 1 _ACEOF @@ -22549,8 +22928,34 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: no; please file a bug report" >&5 +$as_echo "$as_me: error: no; please file a bug report" >&2;} + { (exit 1); exit 1; }; } + + + +fi + + rm -Rf build + + + + + +fi + + rm -Rf build + + + + + + +fi + + rm -Rf build + + @@ -22561,8 +22966,6 @@ fi - { $as_echo "$as_me:$LINENO: checking whether dops->d_automount() exists" >&5 -$as_echo_n "checking whether dops->d_automount() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -22573,11 +22976,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - struct vfsmount *d_automount(struct path *p) { return NULL; } - struct dentry_operations dops __attribute__ ((unused)) = { - .d_automount = d_automount, - }; + #if !defined(HAVE_GET_LINK_DELAYED) + #error "Expecting get_link() delayed done" + #endif int main (void) @@ -22601,7 +23002,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22613,11 +23014,9 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_AUTOMOUNT 1 +#define HAVE_PUT_LINK_DELAYED 1 _ACEOF @@ -22625,20 +23024,8 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - - -fi - - rm -Rf build - - - - - { $as_echo "$as_me:$LINENO: checking whether eops->encode_fh() wants inode" >&5 -$as_echo_n "checking whether eops->encode_fh() wants inode... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether iops->put_link() passes cookie" >&5 +$as_echo_n "checking whether iops->put_link() passes cookie... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -22649,12 +23036,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - int encode_fh(struct inode *inode, __u32 *fh, int *max_len, - struct inode *parent) { return 0; } - static struct export_operations eops __attribute__ ((unused))={ - .encode_fh = encode_fh, - }; + #include + void put_link(struct inode *ip, void *cookie) + { return; } + static struct inode_operations + iops __attribute__ ((unused)) = { + .put_link = put_link, + }; int main (void) @@ -22678,7 +23066,400 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_PUT_LINK_COOKIE 1 +_ACEOF + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: checking whether iops->put_link() passes nameidata" >&5 +$as_echo_n "checking whether iops->put_link() passes nameidata... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + void put_link(struct dentry *de, struct + nameidata *nd, void *ptr) { return; } + static struct inode_operations + iops __attribute__ ((unused)) = { + .put_link = put_link, + }; + +int +main (void) +{ + + + ; + return 0; +} + +_ACEOF + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_PUT_LINK_NAMEIDATA 1 +_ACEOF + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { { $as_echo "$as_me:$LINENO: error: no; please file a bug report" >&5 +$as_echo "$as_me: error: no; please file a bug report" >&2;} + { (exit 1); exit 1; }; } + + + +fi + + rm -Rf build + + + + + +fi + + rm -Rf build + + + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether i_op->tmpfile() exists" >&5 +$as_echo_n "checking whether i_op->tmpfile() exists... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + int tmpfile(struct inode *inode, struct dentry *dentry, + umode_t mode) { return 0; } + static struct inode_operations + iops __attribute__ ((unused)) = { + .tmpfile = tmpfile, + }; + +int +main (void) +{ + + + ; + return 0; +} + +_ACEOF + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_TMPFILE 1 +_ACEOF + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether iops->truncate_range() exists" >&5 +$as_echo_n "checking whether iops->truncate_range() exists... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + void truncate_range(struct inode *inode, loff_t start, + loff_t end) { return; } + static struct inode_operations iops __attribute__ ((unused)) = { + .truncate_range = truncate_range, + }; + +int +main (void) +{ + + + ; + return 0; +} + +_ACEOF + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_INODE_TRUNCATE_RANGE 1 +_ACEOF + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether dops->d_automount() exists" >&5 +$as_echo_n "checking whether dops->d_automount() exists... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + struct vfsmount *d_automount(struct path *p) { return NULL; } + struct dentry_operations dops __attribute__ ((unused)) = { + .d_automount = d_automount, + }; + +int +main (void) +{ + + + ; + return 0; +} + +_ACEOF + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_AUTOMOUNT 1 +_ACEOF + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether eops->encode_fh() wants inode" >&5 +$as_echo_n "checking whether eops->encode_fh() wants inode... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + int encode_fh(struct inode *inode, __u32 *fh, int *max_len, + struct inode *parent) { return 0; } + static struct export_operations eops __attribute__ ((unused))={ + .encode_fh = encode_fh, + }; + +int +main (void) +{ + + + ; + return 0; +} + +_ACEOF + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22754,7 +23535,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22827,7 +23608,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22943,7 +23724,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23055,7 +23836,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23167,7 +23948,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23279,7 +24060,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23392,7 +24173,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23504,7 +24285,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23592,6 +24373,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include + #include int revalidate (struct dentry *dentry, struct nameidata *nidata) { return 0; } @@ -23623,7 +24405,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23702,7 +24484,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23775,7 +24557,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23894,7 +24676,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23972,7 +24754,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24007,9 +24789,9 @@ fi - { $as_echo "$as_me:$LINENO: checking whether mount_nodev() is available" >&5 -$as_echo_n "checking whether mount_nodev() is available... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether fst->mount() exists" >&5 +$as_echo_n "checking whether fst->mount() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -24020,13 +24802,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + + static struct dentry * + mount(struct file_system_type *fs_type, int flags, + const char *osname, void *data) { + struct dentry *d = NULL; + return (d); + } + + static struct file_system_type fst __attribute__ ((unused)) = { + .mount = mount, + }; int main (void) { - mount_nodev(NULL, 0, NULL, NULL); ; return 0; @@ -24045,7 +24837,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24056,11 +24848,22 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_FST_MOUNT 1 +_ACEOF + + else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + fi @@ -24068,60 +24871,168 @@ fi rm -Rf build - if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - else - if test "x$enable_linux_builtin" != xyes; then + { $as_echo "$as_me:$LINENO: checking whether super_block has s_shrink" >&5 +$as_echo_n "checking whether super_block has s_shrink... " >&6; } - grep -q -E '[[:space:]]mount_nodev[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in fs/super.c; do - grep -q -E "EXPORT_SYMBOL.*(mount_nodev)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - fi - if test $rc -ne 0; then : +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + + int shrink(struct shrinker *s, struct shrink_control *sc) + { return 0; } + + static const struct super_block + sb __attribute__ ((unused)) = { + .s_shrink.shrink = shrink, + .s_shrink.seeks = DEFAULT_SEEKS, + .s_shrink.batch = 0, + }; + +int +main (void) +{ + + + ; + return 0; +} + +_ACEOF + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_SHRINK 1 +_ACEOF + + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - else : + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether shrink_control has nid" >&5 +$as_echo_n "checking whether shrink_control has nid... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + +int +main (void) +{ + + struct shrink_control sc __attribute__ ((unused)); + unsigned long scnidsize __attribute__ ((unused)) = + sizeof(sc.nid); + + ; + return 0; +} + +_ACEOF + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_MOUNT_NODEV 1 +#define SHRINK_CONTROL_HAS_NID 1 _ACEOF - fi - fi +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + + +fi + + rm -Rf build - { $as_echo "$as_me:$LINENO: checking whether super_block has s_shrink" >&5 -$as_echo_n "checking whether super_block has s_shrink... " >&6; } + + { $as_echo "$as_me:$LINENO: checking whether super_block has s_instances list_head" >&5 +$as_echo_n "checking whether super_block has s_instances list_head... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -24134,20 +25045,86 @@ cat >>conftest.$ac_ext <<_ACEOF #include - int shrink(struct shrinker *s, struct shrink_control *sc) - { return 0; } +int +main (void) +{ - static const struct super_block - sb __attribute__ ((unused)) = { - .s_shrink.shrink = shrink, - .s_shrink.seeks = DEFAULT_SEEKS, - .s_shrink.batch = 0, - }; + struct super_block sb __attribute__ ((unused)); + + INIT_LIST_HEAD(&sb.s_instances); + + ; + return 0; +} + +_ACEOF + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_S_INSTANCES_LIST_HEAD 1 +_ACEOF + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + + +fi + + rm -Rf build + + + + { $as_echo "$as_me:$LINENO: checking whether super_block has s_d_op" >&5 +$as_echo_n "checking whether super_block has s_d_op... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include int main (void) { + struct super_block sb __attribute__ ((unused)); + sb.s_d_op = NULL; ; return 0; @@ -24166,7 +25143,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24182,11 +25159,10 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_SHRINK 1 +#define HAVE_S_D_OP 1 _ACEOF - else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -24203,8 +25179,9 @@ fi - { $as_echo "$as_me:$LINENO: checking whether shrink_control has nid" >&5 -$as_echo_n "checking whether shrink_control has nid... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether super_setup_bdi_name() exists" >&5 +$as_echo_n "checking whether super_setup_bdi_name() exists... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.c @@ -24216,14 +25193,16 @@ cat >>conftest.$ac_ext <<_ACEOF #include + struct super_block sb; int main (void) { - struct shrink_control sc __attribute__ ((unused)); - unsigned long scnidsize __attribute__ ((unused)) = - sizeof(sc.nid); + char *name = "bdi"; + atomic_long_t zfs_bdi_seq; + int error __attribute__((unused)) = + super_setup_bdi_name(&sb, "%.28s-%ld", name, atomic_long_inc_return(&zfs_bdi_seq)); ; return 0; @@ -24242,7 +25221,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24253,22 +25232,11 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define SHRINK_CONTROL_HAS_NID 1 -_ACEOF - - + rc=0 else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - + rc=1 fi @@ -24276,10 +25244,13 @@ fi rm -Rf build + if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: checking whether bdi_setup_and_register() wants 2 args" >&5 +$as_echo_n "checking whether bdi_setup_and_register() wants 2 args... " >&6; } - { $as_echo "$as_me:$LINENO: checking whether super_block has s_instances list_head" >&5 -$as_echo_n "checking whether super_block has s_instances list_head... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -24290,15 +25261,16 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + struct backing_dev_info bdi; int main (void) { - struct super_block sb __attribute__ ((unused)); - - INIT_LIST_HEAD(&sb.s_instances); + char *name = "bdi"; + int error __attribute__((unused)) = + bdi_setup_and_register(&bdi, name); ; return 0; @@ -24317,7 +25289,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24328,22 +25300,11 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_S_INSTANCES_LIST_HEAD 1 -_ACEOF - - + rc=0 else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - + rc=1 fi @@ -24351,9 +25312,13 @@ fi rm -Rf build + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: checking whether bdi_setup_and_register() wants 3 args" >&5 +$as_echo_n "checking whether bdi_setup_and_register() wants 3 args... " >&6; } - { $as_echo "$as_me:$LINENO: checking whether super_block has s_d_op" >&5 -$as_echo_n "checking whether super_block has s_d_op... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -24364,14 +25329,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + struct backing_dev_info bdi; int main (void) { - struct super_block sb __attribute__ ((unused)); - sb.s_d_op = NULL; + char *name = "bdi"; + unsigned int cap = BDI_CAP_MAP_COPY; + int error __attribute__((unused)) = + bdi_setup_and_register(&bdi, name, cap); ; return 0; @@ -24390,7 +25358,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24401,33 +25369,102 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + rc=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + rc=1 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_S_D_OP 1 -_ACEOF +fi + rm -Rf build -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } + else + if test "x$enable_linux_builtin" != xyes; then + grep -q -E '[[:space:]]bdi_setup_and_register[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in mm/backing-dev.c; do + grep -q -E "EXPORT_SYMBOL.*(bdi_setup_and_register)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi -fi + fi + if test $rc -ne 0; then : - rm -Rf build + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + else : + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +cat >>confdefs.h <<\_ACEOF +#define HAVE_3ARGS_BDI_SETUP_AND_REGISTER 1 +_ACEOF - { $as_echo "$as_me:$LINENO: checking whether super_setup_bdi_name() exists" >&5 -$as_echo_n "checking whether super_setup_bdi_name() exists... " >&6; } + + fi + fi + + + else + if test "x$enable_linux_builtin" != xyes; then + + grep -q -E '[[:space:]]bdi_setup_and_register[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in mm/backing-dev.c; do + grep -q -E "EXPORT_SYMBOL.*(bdi_setup_and_register)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi + + fi + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: checking whether bdi_setup_and_register() wants 3 args" >&5 +$as_echo_n "checking whether bdi_setup_and_register() wants 3 args... " >&6; } @@ -24439,17 +25476,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - struct super_block sb; + #include + struct backing_dev_info bdi; int main (void) { - char *name = "bdi"; - atomic_long_t zfs_bdi_seq; - int error __attribute__((unused)) = - super_setup_bdi_name(&sb, "%.28s-%ld", name, atomic_long_inc_return(&zfs_bdi_seq)); + char *name = "bdi"; + unsigned int cap = BDI_CAP_MAP_COPY; + int error __attribute__((unused)) = + bdi_setup_and_register(&bdi, name, cap); ; return 0; @@ -24468,7 +25505,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24493,6 +25530,98 @@ fi if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + else + if test "x$enable_linux_builtin" != xyes; then + + grep -q -E '[[:space:]]bdi_setup_and_register[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in mm/backing-dev.c; do + grep -q -E "EXPORT_SYMBOL.*(bdi_setup_and_register)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi + + fi + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + else : + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_3ARGS_BDI_SETUP_AND_REGISTER 1 +_ACEOF + + + fi + fi + + + else : + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_2ARGS_BDI_SETUP_AND_REGISTER 1 +_ACEOF + + + fi + fi + + + else + if test "x$enable_linux_builtin" != xyes; then + + grep -q -E '[[:space:]]super_setup_bdi_name[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in fs/super.c; do + grep -q -E "EXPORT_SYMBOL.*(super_setup_bdi_name)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi + + fi + if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } { $as_echo "$as_me:$LINENO: checking whether bdi_setup_and_register() wants 2 args" >&5 @@ -24536,7 +25665,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24605,7 +25734,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24752,383 +25881,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - rc=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 - - -fi - - rm -Rf build - - - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - else - if test "x$enable_linux_builtin" != xyes; then - - grep -q -E '[[:space:]]bdi_setup_and_register[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in mm/backing-dev.c; do - grep -q -E "EXPORT_SYMBOL.*(bdi_setup_and_register)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - - fi - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - else : - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_3ARGS_BDI_SETUP_AND_REGISTER 1 -_ACEOF - - - fi - fi - - - else : - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_2ARGS_BDI_SETUP_AND_REGISTER 1 -_ACEOF - - - fi - fi - - - else - if test "x$enable_linux_builtin" != xyes; then - - grep -q -E '[[:space:]]super_setup_bdi_name[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in fs/super.c; do - grep -q -E "EXPORT_SYMBOL.*(super_setup_bdi_name)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - - fi - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether bdi_setup_and_register() wants 2 args" >&5 -$as_echo_n "checking whether bdi_setup_and_register() wants 2 args... " >&6; } - - - -cat confdefs.h - <<_ACEOF >conftest.c -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - - #include - struct backing_dev_info bdi; - -int -main (void) -{ - - char *name = "bdi"; - int error __attribute__((unused)) = - bdi_setup_and_register(&bdi, name); - - ; - return 0; -} - -_ACEOF - - - -cat - <<_ACEOF >conftest.h - -_ACEOF - - - rm -Rf build && mkdir -p build && touch build/conftest.mod.c - echo "obj-m := conftest.o" >build/Makefile - modpost_flag='' - test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - rc=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 - - -fi - - rm -Rf build - - - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether bdi_setup_and_register() wants 3 args" >&5 -$as_echo_n "checking whether bdi_setup_and_register() wants 3 args... " >&6; } - - - -cat confdefs.h - <<_ACEOF >conftest.c -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - - #include - struct backing_dev_info bdi; - -int -main (void) -{ - - char *name = "bdi"; - unsigned int cap = BDI_CAP_MAP_COPY; - int error __attribute__((unused)) = - bdi_setup_and_register(&bdi, name, cap); - - ; - return 0; -} - -_ACEOF - - - -cat - <<_ACEOF >conftest.h - -_ACEOF - - - rm -Rf build && mkdir -p build && touch build/conftest.mod.c - echo "obj-m := conftest.o" >build/Makefile - modpost_flag='' - test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - rc=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 - - -fi - - rm -Rf build - - - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - else - if test "x$enable_linux_builtin" != xyes; then - - grep -q -E '[[:space:]]bdi_setup_and_register[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in mm/backing-dev.c; do - grep -q -E "EXPORT_SYMBOL.*(bdi_setup_and_register)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - - fi - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - else : - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_3ARGS_BDI_SETUP_AND_REGISTER 1 -_ACEOF - - - fi - fi - - - else - if test "x$enable_linux_builtin" != xyes; then - - grep -q -E '[[:space:]]bdi_setup_and_register[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in mm/backing-dev.c; do - grep -q -E "EXPORT_SYMBOL.*(bdi_setup_and_register)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - - fi - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether bdi_setup_and_register() wants 3 args" >&5 -$as_echo_n "checking whether bdi_setup_and_register() wants 3 args... " >&6; } - - - -cat confdefs.h - <<_ACEOF >conftest.c -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - - #include - struct backing_dev_info bdi; - -int -main (void) -{ - - char *name = "bdi"; - unsigned int cap = BDI_CAP_MAP_COPY; - int error __attribute__((unused)) = - bdi_setup_and_register(&bdi, name, cap); - - ; - return 0; -} - -_ACEOF - - - -cat - <<_ACEOF >conftest.h - -_ACEOF - - - rm -Rf build && mkdir -p build && touch build/conftest.mod.c - echo "obj-m := conftest.o" >build/Makefile - modpost_flag='' - test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25270,7 +26023,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25349,7 +26102,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25427,7 +26180,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25505,7 +26258,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25623,7 +26376,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25650,7 +26403,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether fops->iterate() is available" >&5 + { $as_echo "$as_me:$LINENO: checking whether fops->iterate() is available" >&5 $as_echo_n "checking whether fops->iterate() is available... " >&6; } @@ -25663,14 +26416,18 @@ cat >>conftest.$ac_ext <<_ACEOF #include - int iterate(struct file *filp, struct dir_context * context) - { return 0; } + int iterate(struct file *filp, + struct dir_context *context) { return 0; } static const struct file_operations fops __attribute__ ((unused)) = { .iterate = iterate, }; + #if defined(FMODE_KABI_ITERATE) + #error "RHEL 7.5, FMODE_KABI_ITERATE interface" + #endif + int main (void) { @@ -25693,7 +26450,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25733,8 +26490,8 @@ cat >>conftest.$ac_ext <<_ACEOF #include - int readdir(struct file *filp, void *entry, filldir_t func) - { return 0; } + int readdir(struct file *filp, void *entry, + filldir_t func) { return 0; } static const struct file_operations fops __attribute__ ((unused)) = { @@ -25763,7 +26520,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25787,8 +26544,8 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { { $as_echo "$as_me:$LINENO: error: no; file a bug report with ZFSOnLinux" >&5 -$as_echo "$as_me: error: no; file a bug report with ZFSOnLinux" >&2;} + { { $as_echo "$as_me:$LINENO: error: no; file a bug report with ZoL" >&5 +$as_echo "$as_me: error: no; file a bug report with ZoL" >&2;} { (exit 1); exit 1; }; } @@ -25862,7 +26619,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25927,7 +26684,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26018,7 +26775,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26092,7 +26849,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26166,7 +26923,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26244,7 +27001,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26317,7 +27074,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26385,7 +27142,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26489,7 +27246,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26608,7 +27365,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26721,7 +27478,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26795,7 +27552,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26880,7 +27637,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26960,7 +27717,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -27038,7 +27795,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -27114,7 +27871,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -27189,8 +27946,9 @@ _ACEOF - { $as_echo "$as_me:$LINENO: checking whether to use vm_node_stat based fn's" >&5 -$as_echo_n "checking whether to use vm_node_stat based fn's... " >&6; } + + { $as_echo "$as_me:$LINENO: checking whether global_node_page_state() exists" >&5 +$as_echo_n "checking whether global_node_page_state() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -27208,10 +27966,7 @@ int main (void) { - int a __attribute__ ((unused)) = NR_VM_NODE_STAT_ITEMS; - long x __attribute__ ((unused)) = - atomic_long_read(&vm_node_stat[0]); - (void) global_node_page_state(0); + (void) global_node_page_state(0); ; return 0; @@ -27230,7 +27985,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -27266,888 +28021,1141 @@ fi - if test "$LINUX_OBJ" != "$LINUX"; then + { $as_echo "$as_me:$LINENO: checking whether global_zone_page_state() exists" >&5 +$as_echo_n "checking whether global_zone_page_state() exists... " >&6; } - KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ" -fi +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + #include + #include +int +main (void) +{ - KERNELCPPFLAGS="$KERNELCPPFLAGS -std=gnu99" - KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-declaration-after-statement" - KERNELCPPFLAGS="$KERNELCPPFLAGS $NO_UNUSED_BUT_SET_VARIABLE" - KERNELCPPFLAGS="$KERNELCPPFLAGS $NO_BOOL_COMPARE" - KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL" - KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\"" + (void) global_zone_page_state(0); + ; + return 0; +} - ;; - user) +_ACEOF -# Check whether --with-mounthelperdir was given. -if test "${with_mounthelperdir+set}" = set; then - withval=$with_mounthelperdir; mounthelperdir=$withval -else - mounthelperdir=/sbin -fi + +cat - <<_ACEOF >conftest.h + +_ACEOF + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +cat >>confdefs.h <<\_ACEOF +#define ZFS_GLOBAL_ZONE_PAGE_STATE 1 +_ACEOF - { $as_echo "$as_me:$LINENO: checking for udev directories" >&5 -$as_echo_n "checking for udev directories... " >&6; } -# Check whether --with-udevdir was given. -if test "${with_udevdir+set}" = set; then - withval=$with_udevdir; udevdir=$withval else - udevdir=check + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + + fi + rm -Rf build - if test "x$udevdir" = xcheck; then - path1=/lib/udev - path2=/usr/lib/udev - default=$path2 - if test -d "$path1"; then - udevdir="$path1" -else - if test -d "$path2"; then - udevdir="$path2" + + { $as_echo "$as_me:$LINENO: checking whether enum node_stat_item contains NR_FILE_PAGES" >&5 +$as_echo_n "checking whether enum node_stat_item contains NR_FILE_PAGES... " >&6; } + if { ac_try='"${srcdir}/scripts/enum-extract.pl" "node_stat_item" "$LINUX/include/linux/mmzone.h" | egrep -qx NR_FILE_PAGES' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define ZFS_ENUM_NODE_STAT_ITEM_NR_FILE_PAGES 1 +_ACEOF + + ZFS_ENUM_NODE_STAT_ITEM_NR_FILE_PAGES=1 + else - udevdir="$default" -fi + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -fi + { $as_echo "$as_me:$LINENO: checking whether enum node_stat_item contains NR_INACTIVE_ANON" >&5 +$as_echo_n "checking whether enum node_stat_item contains NR_INACTIVE_ANON... " >&6; } + if { ac_try='"${srcdir}/scripts/enum-extract.pl" "node_stat_item" "$LINUX/include/linux/mmzone.h" | egrep -qx NR_INACTIVE_ANON' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define ZFS_ENUM_NODE_STAT_ITEM_NR_INACTIVE_ANON 1 +_ACEOF + ZFS_ENUM_NODE_STAT_ITEM_NR_INACTIVE_ANON=1 -# Check whether --with-udevruledir was given. -if test "${with_udevruledir+set}" = set; then - withval=$with_udevruledir; udevruledir=$withval else - udevruledir="${udevdir}/rules.d" + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + fi + { $as_echo "$as_me:$LINENO: checking whether enum node_stat_item contains NR_INACTIVE_FILE" >&5 +$as_echo_n "checking whether enum node_stat_item contains NR_INACTIVE_FILE... " >&6; } + if { ac_try='"${srcdir}/scripts/enum-extract.pl" "node_stat_item" "$LINUX/include/linux/mmzone.h" | egrep -qx NR_INACTIVE_FILE' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } - { $as_echo "$as_me:$LINENO: result: $udevdir;$udevruledir" >&5 -$as_echo "$udevdir;$udevruledir" >&6; } +cat >>confdefs.h <<\_ACEOF +#define ZFS_ENUM_NODE_STAT_ITEM_NR_INACTIVE_FILE 1 +_ACEOF + ZFS_ENUM_NODE_STAT_ITEM_NR_INACTIVE_FILE=1 - # Check whether --enable-systemd was given. -if test "${enable_systemd+set}" = set; then - enableval=$enable_systemd; else - enable_systemd=yes + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + fi -# Check whether --with-systemdunitdir was given. -if test "${with_systemdunitdir+set}" = set; then - withval=$with_systemdunitdir; systemdunitdir=$withval -else - systemdunitdir=/usr/lib/systemd/system -fi + { $as_echo "$as_me:$LINENO: checking whether enum node_stat_item contains NR_SLAB_RECLAIMABLE" >&5 +$as_echo_n "checking whether enum node_stat_item contains NR_SLAB_RECLAIMABLE... " >&6; } + if { ac_try='"${srcdir}/scripts/enum-extract.pl" "node_stat_item" "$LINUX/include/linux/mmzone.h" | egrep -qx NR_SLAB_RECLAIMABLE' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +cat >>confdefs.h <<\_ACEOF +#define ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE 1 +_ACEOF + + ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE=1 -# Check whether --with-systemdpresetdir was given. -if test "${with_systemdpresetdir+set}" = set; then - withval=$with_systemdpresetdir; systemdpresetdir=$withval else - systemdpresetdir=/usr/lib/systemd/system-preset + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + fi -# Check whether --with-systemdmodulesloaddir was given. -if test "${with_systemdmodulesloaddir+set}" = set; then - withval=$with_systemdmodulesloaddir; systemdmoduleloaddir=$withval -else - systemdmodulesloaddir=/usr/lib/modules-load.d -fi + { $as_echo "$as_me:$LINENO: checking whether enum zone_stat_item contains NR_FILE_PAGES" >&5 +$as_echo_n "checking whether enum zone_stat_item contains NR_FILE_PAGES... " >&6; } + if { ac_try='"${srcdir}/scripts/enum-extract.pl" "zone_stat_item" "$LINUX/include/linux/mmzone.h" | egrep -qx NR_FILE_PAGES' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } - if test "x$enable_systemd" = xyes; then +cat >>confdefs.h <<\_ACEOF +#define ZFS_ENUM_ZONE_STAT_ITEM_NR_FILE_PAGES 1 +_ACEOF - ZFS_INIT_SYSTEMD=systemd - ZFS_MODULE_LOAD=modules-load.d - modulesloaddir=$systemdmodulesloaddir + ZFS_ENUM_ZONE_STAT_ITEM_NR_FILE_PAGES=1 -fi +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + { $as_echo "$as_me:$LINENO: checking whether enum zone_stat_item contains NR_INACTIVE_ANON" >&5 +$as_echo_n "checking whether enum zone_stat_item contains NR_INACTIVE_ANON... " >&6; } + if { ac_try='"${srcdir}/scripts/enum-extract.pl" "zone_stat_item" "$LINUX/include/linux/mmzone.h" | egrep -qx NR_INACTIVE_ANON' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +cat >>confdefs.h <<\_ACEOF +#define ZFS_ENUM_ZONE_STAT_ITEM_NR_INACTIVE_ANON 1 +_ACEOF + ZFS_ENUM_ZONE_STAT_ITEM_NR_INACTIVE_ANON=1 - # Check whether --enable-sysvinit was given. -if test "${enable_sysvinit+set}" = set; then - enableval=$enable_sysvinit; else - enable_sysvinit=yes -fi + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - if test "x$enable_sysvinit" = xyes; then - ZFS_INIT_SYSV=init.d fi + { $as_echo "$as_me:$LINENO: checking whether enum zone_stat_item contains NR_INACTIVE_FILE" >&5 +$as_echo_n "checking whether enum zone_stat_item contains NR_INACTIVE_FILE... " >&6; } + if { ac_try='"${srcdir}/scripts/enum-extract.pl" "zone_stat_item" "$LINUX/include/linux/mmzone.h" | egrep -qx NR_INACTIVE_FILE' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +cat >>confdefs.h <<\_ACEOF +#define ZFS_ENUM_ZONE_STAT_ITEM_NR_INACTIVE_FILE 1 +_ACEOF - { $as_echo "$as_me:$LINENO: checking for dracut directory" >&5 -$as_echo_n "checking for dracut directory... " >&6; } + ZFS_ENUM_ZONE_STAT_ITEM_NR_INACTIVE_FILE=1 -# Check whether --with-dracutdir was given. -if test "${with_dracutdir+set}" = set; then - withval=$with_dracutdir; dracutdir=$withval else - dracutdir=check + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + fi - if test "x$dracutdir" = xcheck; then - path1=/usr/share/dracut - path2=/usr/lib/dracut - default=$path2 + { $as_echo "$as_me:$LINENO: checking whether enum zone_stat_item contains NR_SLAB_RECLAIMABLE" >&5 +$as_echo_n "checking whether enum zone_stat_item contains NR_SLAB_RECLAIMABLE... " >&6; } + if { ac_try='"${srcdir}/scripts/enum-extract.pl" "zone_stat_item" "$LINUX/include/linux/mmzone.h" | egrep -qx NR_SLAB_RECLAIMABLE' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then - if test -d "$path1"; then - dracutdir="$path1" -else + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define ZFS_ENUM_ZONE_STAT_ITEM_NR_SLAB_RECLAIMABLE 1 +_ACEOF + + ZFS_ENUM_ZONE_STAT_ITEM_NR_SLAB_RECLAIMABLE=1 - if test -d "$path2"; then - dracutdir="$path2" else - dracutdir="$default" + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + fi + + + { $as_echo "$as_me:$LINENO: checking global_page_state enums are sane" >&5 +$as_echo_n "checking global_page_state enums are sane... " >&6; } + + + enum_check_a="$ZFS_ENUM_NODE_STAT_ITEM_NR_FILE_PAGES" + enum_check_b="$ZFS_ENUM_ZONE_STAT_ITEM_NR_FILE_PAGES" + if test -n "$enum_check_a" -a -n "$enum_check_b"; then + + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: NR_FILE_PAGES in either node_stat_item or zone_stat_item: DUPLICATE" >&5 +$as_echo "NR_FILE_PAGES in either node_stat_item or zone_stat_item: DUPLICATE" >&6; } + { $as_echo "$as_me:$LINENO: result: configure needs updating, see: config/kernel-global_page_state.m4" >&5 +$as_echo "configure needs updating, see: config/kernel-global_page_state.m4" >&6; } + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + + fi + if test -z "$enum_check_a" -a -z "$enum_check_b"; then + + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: NR_FILE_PAGES in either node_stat_item or zone_stat_item: NOT FOUND" >&5 +$as_echo "NR_FILE_PAGES in either node_stat_item or zone_stat_item: NOT FOUND" >&6; } + { $as_echo "$as_me:$LINENO: result: configure needs updating, see: config/kernel-global_page_state.m4" >&5 +$as_echo "configure needs updating, see: config/kernel-global_page_state.m4" >&6; } + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + fi - { $as_echo "$as_me:$LINENO: result: $dracutdir" >&5 -$as_echo "$dracutdir" >&6; } + enum_check_a="$ZFS_ENUM_NODE_STAT_ITEM_NR_INACTIVE_ANON" + enum_check_b="$ZFS_ENUM_ZONE_STAT_ITEM_NR_INACTIVE_ANON" + if test -n "$enum_check_a" -a -n "$enum_check_b"; then - ZLIB= + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: NR_INACTIVE_ANON in either node_stat_item or zone_stat_item: DUPLICATE" >&5 +$as_echo "NR_INACTIVE_ANON in either node_stat_item or zone_stat_item: DUPLICATE" >&6; } + { $as_echo "$as_me:$LINENO: result: configure needs updating, see: config/kernel-global_page_state.m4" >&5 +$as_echo "configure needs updating, see: config/kernel-global_page_state.m4" >&6; } + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + - if test "${ac_cv_header_zlib_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for zlib.h" >&5 -$as_echo_n "checking for zlib.h... " >&6; } -if test "${ac_cv_header_zlib_h+set}" = set; then - $as_echo_n "(cached) " >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 -$as_echo "$ac_cv_header_zlib_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking zlib.h usability" >&5 -$as_echo_n "checking zlib.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + if test -z "$enum_check_a" -a -z "$enum_check_b"; then + + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: NR_INACTIVE_ANON in either node_stat_item or zone_stat_item: NOT FOUND" >&5 +$as_echo "NR_INACTIVE_ANON in either node_stat_item or zone_stat_item: NOT FOUND" >&6; } + { $as_echo "$as_me:$LINENO: result: configure needs updating, see: config/kernel-global_page_state.m4" >&5 +$as_echo "configure needs updating, see: config/kernel-global_page_state.m4" >&6; } + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking zlib.h presence" >&5 -$as_echo_n "checking zlib.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no + enum_check_a="$ZFS_ENUM_NODE_STAT_ITEM_NR_INACTIVE_FILE" + enum_check_b="$ZFS_ENUM_ZONE_STAT_ITEM_NR_INACTIVE_FILE" + if test -n "$enum_check_a" -a -n "$enum_check_b"; then + + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: NR_INACTIVE_FILE in either node_stat_item or zone_stat_item: DUPLICATE" >&5 +$as_echo "NR_INACTIVE_FILE in either node_stat_item or zone_stat_item: DUPLICATE" >&6; } + { $as_echo "$as_me:$LINENO: result: configure needs updating, see: config/kernel-global_page_state.m4" >&5 +$as_echo "configure needs updating, see: config/kernel-global_page_state.m4" >&6; } + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + + fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } + if test -z "$enum_check_a" -a -z "$enum_check_b"; then + + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: NR_INACTIVE_FILE in either node_stat_item or zone_stat_item: NOT FOUND" >&5 +$as_echo "NR_INACTIVE_FILE in either node_stat_item or zone_stat_item: NOT FOUND" >&6; } + { $as_echo "$as_me:$LINENO: result: configure needs updating, see: config/kernel-global_page_state.m4" >&5 +$as_echo "configure needs updating, see: config/kernel-global_page_state.m4" >&6; } + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for zlib.h" >&5 -$as_echo_n "checking for zlib.h... " >&6; } -if test "${ac_cv_header_zlib_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_zlib_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 -$as_echo "$ac_cv_header_zlib_h" >&6; } + + + + enum_check_a="$ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE" + enum_check_b="$ZFS_ENUM_ZONE_STAT_ITEM_NR_SLAB_RECLAIMABLE" + if test -n "$enum_check_a" -a -n "$enum_check_b"; then + + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: NR_SLAB_RECLAIMABLE in either node_stat_item or zone_stat_item: DUPLICATE" >&5 +$as_echo "NR_SLAB_RECLAIMABLE in either node_stat_item or zone_stat_item: DUPLICATE" >&6; } + { $as_echo "$as_me:$LINENO: result: configure needs updating, see: config/kernel-global_page_state.m4" >&5 +$as_echo "configure needs updating, see: config/kernel-global_page_state.m4" >&6; } + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + fi -if test "x$ac_cv_header_zlib_h" = x""yes; then - : -else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + + if test -z "$enum_check_a" -a -z "$enum_check_b"; then + + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: NR_SLAB_RECLAIMABLE in either node_stat_item or zone_stat_item: NOT FOUND" >&5 +$as_echo "NR_SLAB_RECLAIMABLE in either node_stat_item or zone_stat_item: NOT FOUND" >&6; } + { $as_echo "$as_me:$LINENO: result: configure needs updating, see: config/kernel-global_page_state.m4" >&5 +$as_echo "configure needs updating, see: config/kernel-global_page_state.m4" >&6; } + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: - *** zlib.h missing, zlib-devel package required +{ { $as_echo "$as_me:$LINENO: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! See \`config.log' for more details." >&5 -$as_echo "$as_me: error: - *** zlib.h missing, zlib-devel package required +$as_echo "$as_me: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; }; } + + fi - { $as_echo "$as_me:$LINENO: checking for library containing compress2" >&5 -$as_echo_n "checking for library containing compress2... " >&6; } -if test "${ac_cv_search_compress2+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + + + + { $as_echo "$as_me:$LINENO: checking whether posix_acl has refcount_t" >&5 +$as_echo_n "checking whether posix_acl has refcount_t... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char compress2 (); + + #include + #include + #include + int -main () +main (void) { -return compress2 (); + + struct posix_acl acl; + refcount_t *r __attribute__ ((unused)) = &acl.a_refcount; + ; return 0; } + _ACEOF -for ac_lib in '' z; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_search_compress2=$ac_res -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_compress2+set}" = set; then - break -fi -done -if test "${ac_cv_search_compress2+set}" = set; then - : -else - ac_cv_search_compress2=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_compress2" >&5 -$as_echo "$ac_cv_search_compress2" >&6; } -ac_res=$ac_cv_search_compress2 -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: - *** compress2() missing, zlib-devel package required -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: - *** compress2() missing, zlib-devel package required -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -fi +cat - <<_ACEOF >conftest.h - { $as_echo "$as_me:$LINENO: checking for library containing uncompress" >&5 -$as_echo_n "checking for library containing uncompress... " >&6; } -if test "${ac_cv_search_uncompress+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char uncompress (); -int -main () -{ -return uncompress (); - ; - return 0; -} -_ACEOF -for ac_lib in '' z; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_search_uncompress=$ac_res + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_ACL_REFCOUNT 1 +_ACEOF + + else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_uncompress+set}" = set; then - break -fi -done -if test "${ac_cv_search_uncompress+set}" = set; then - : -else - ac_cv_search_uncompress=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_uncompress" >&5 -$as_echo "$ac_cv_search_uncompress" >&6; } -ac_res=$ac_cv_search_uncompress -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: - *** uncompress() missing, zlib-devel package required -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: - *** uncompress() missing, zlib-devel package required -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } fi + rm -Rf build - { $as_echo "$as_me:$LINENO: checking for library containing crc32" >&5 -$as_echo_n "checking for library containing crc32... " >&6; } -if test "${ac_cv_search_crc32+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF + + + + + { $as_echo "$as_me:$LINENO: checking whether ns_capable exists" >&5 +$as_echo_n "checking whether ns_capable exists... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char crc32 (); + + #include + int -main () +main (void) { -return crc32 (); + + ns_capable((struct user_namespace *)NULL, CAP_SYS_ADMIN); + ; return 0; } + _ACEOF -for ac_lib in '' z; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_search_crc32=$ac_res + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_NS_CAPABLE 1 +_ACEOF + + else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_crc32+set}" = set; then - break -fi -done -if test "${ac_cv_search_crc32+set}" = set; then - : -else - ac_cv_search_crc32=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_crc32" >&5 -$as_echo "$ac_cv_search_crc32" >&6; } -ac_res=$ac_cv_search_crc32 -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: - *** crc32() missing, zlib-devel package required -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: - *** crc32() missing, zlib-devel package required -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } fi - - ZLIB="-lz" + rm -Rf build -cat >>confdefs.h <<\_ACEOF -#define HAVE_ZLIB 1 -_ACEOF + { $as_echo "$as_me:$LINENO: checking whether cred_t->user_ns exists" >&5 +$as_echo_n "checking whether cred_t->user_ns exists... " >&6; } - LIBUUID= - if test "${ac_cv_header_uuid_uuid_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for uuid/uuid.h" >&5 -$as_echo_n "checking for uuid/uuid.h... " >&6; } -if test "${ac_cv_header_uuid_uuid_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_uuid_uuid_h" >&5 -$as_echo "$ac_cv_header_uuid_uuid_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking uuid/uuid.h usability" >&5 -$as_echo_n "checking uuid/uuid.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.c /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } + #include + +int +main (void) +{ + + struct cred cr; + cr.user_ns = (struct user_namespace *)NULL; + + ; + return 0; +} -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking uuid/uuid.h presence" >&5 -$as_echo_n "checking uuid/uuid.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include + + + +cat - <<_ACEOF >conftest.h + _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_CRED_USER_NS 1 +_ACEOF + + else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: uuid/uuid.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: uuid/uuid.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: uuid/uuid.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: uuid/uuid.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: uuid/uuid.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: uuid/uuid.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: uuid/uuid.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: uuid/uuid.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: uuid/uuid.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: uuid/uuid.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: uuid/uuid.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: uuid/uuid.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: uuid/uuid.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: uuid/uuid.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: uuid/uuid.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: uuid/uuid.h: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for uuid/uuid.h" >&5 -$as_echo_n "checking for uuid/uuid.h... " >&6; } -if test "${ac_cv_header_uuid_uuid_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_uuid_uuid_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_uuid_uuid_h" >&5 -$as_echo "$ac_cv_header_uuid_uuid_h" >&6; } -fi -if test "x$ac_cv_header_uuid_uuid_h" = x""yes; then - : -else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: - *** uuid/uuid.h missing, libuuid-devel package required -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: - *** uuid/uuid.h missing, libuuid-devel package required -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -fi + rm -Rf build - { $as_echo "$as_me:$LINENO: checking for library containing uuid_generate" >&5 -$as_echo_n "checking for library containing uuid_generate... " >&6; } -if test "${ac_cv_search_uuid_generate+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF + + { $as_echo "$as_me:$LINENO: checking whether kuid_has_mapping/kgid_has_mapping exist" >&5 +$as_echo_n "checking whether kuid_has_mapping/kgid_has_mapping exist... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char uuid_generate (); + + #include + int -main () +main (void) { -return uuid_generate (); + + kuid_has_mapping((struct user_namespace *)NULL, KUIDT_INIT(0)); + kgid_has_mapping((struct user_namespace *)NULL, KGIDT_INIT(0)); + ; return 0; } + _ACEOF -for ac_lib in '' uuid; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_search_uuid_generate=$ac_res + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_KUID_HAS_MAPPING 1 +_ACEOF + + else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_uuid_generate+set}" = set; then - break + rm -Rf build + + + + + + if test "$LINUX_OBJ" != "$LINUX"; then + + KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ" + fi -done -if test "${ac_cv_search_uuid_generate+set}" = set; then - : + + + + + KERNELCPPFLAGS="$KERNELCPPFLAGS -std=gnu99" + KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-declaration-after-statement" + KERNELCPPFLAGS="$KERNELCPPFLAGS $NO_UNUSED_BUT_SET_VARIABLE" + KERNELCPPFLAGS="$KERNELCPPFLAGS $NO_BOOL_COMPARE" + KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL" + KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\"" + + + ;; + user) + + +# Check whether --with-mounthelperdir was given. +if test "${with_mounthelperdir+set}" = set; then + withval=$with_mounthelperdir; mounthelperdir=$withval else - ac_cv_search_uuid_generate=no + mounthelperdir=/sbin fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS + + + + + + { $as_echo "$as_me:$LINENO: checking for udev directories" >&5 +$as_echo_n "checking for udev directories... " >&6; } + +# Check whether --with-udevdir was given. +if test "${with_udevdir+set}" = set; then + withval=$with_udevdir; udevdir=$withval +else + udevdir=check fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_uuid_generate" >&5 -$as_echo "$ac_cv_search_uuid_generate" >&6; } -ac_res=$ac_cv_search_uuid_generate -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + if test "x$udevdir" = xcheck; then + + path1=/lib/udev + path2=/usr/lib/udev + default=$path2 + + if test -d "$path1"; then + udevdir="$path1" +else + + if test -d "$path2"; then + udevdir="$path2" +else + udevdir="$default" +fi + + +fi + + +fi + + + +# Check whether --with-udevruledir was given. +if test "${with_udevruledir+set}" = set; then + withval=$with_udevruledir; udevruledir=$withval +else + udevruledir="${udevdir}/rules.d" +fi + + + + + { $as_echo "$as_me:$LINENO: result: $udevdir;$udevruledir" >&5 +$as_echo "$udevdir;$udevruledir" >&6; } + + + # Check whether --enable-systemd was given. +if test "${enable_systemd+set}" = set; then + enableval=$enable_systemd; enable_systemd=$enableval +else + enable_systemd=check +fi + + + +# Check whether --with-systemdunitdir was given. +if test "${with_systemdunitdir+set}" = set; then + withval=$with_systemdunitdir; systemdunitdir=$withval +else + systemdunitdir=/usr/lib/systemd/system +fi + + + +# Check whether --with-systemdpresetdir was given. +if test "${with_systemdpresetdir+set}" = set; then + withval=$with_systemdpresetdir; systemdpresetdir=$withval +else + systemdpresetdir=/usr/lib/systemd/system-preset +fi + + + +# Check whether --with-systemdmodulesloaddir was given. +if test "${with_systemdmodulesloaddir+set}" = set; then + withval=$with_systemdmodulesloaddir; systemdmoduleloaddir=$withval +else + systemdmodulesloaddir=/usr/lib/modules-load.d +fi + + + if test "x$enable_systemd" = xcheck; then + + if systemctl --version >/dev/null 2>&1; then + enable_systemd=yes +else + enable_systemd=no +fi + + +fi + + + { $as_echo "$as_me:$LINENO: checking for systemd support" >&5 +$as_echo_n "checking for systemd support... " >&6; } + { $as_echo "$as_me:$LINENO: result: $enable_systemd" >&5 +$as_echo "$enable_systemd" >&6; } + + if test "x$enable_systemd" = xyes; then + + ZFS_INIT_SYSTEMD=systemd + ZFS_MODULE_LOAD=modules-load.d + DEFINE_SYSTEMD='--with systemd --define "_unitdir $(systemdunitdir)" --define "_presetdir $(systemdpresetdir)"' + modulesloaddir=$systemdmodulesloaddir + +else + + DEFINE_SYSTEMD='--without systemd' + +fi + + + + + + + + + + + # Check whether --enable-sysvinit was given. +if test "${enable_sysvinit+set}" = set; then + enableval=$enable_sysvinit; +else + enable_sysvinit=yes +fi + + + if test "x$enable_sysvinit" = xyes; then + ZFS_INIT_SYSV=init.d +fi + + + + + + { $as_echo "$as_me:$LINENO: checking for dracut directory" >&5 +$as_echo_n "checking for dracut directory... " >&6; } + +# Check whether --with-dracutdir was given. +if test "${with_dracutdir+set}" = set; then + withval=$with_dracutdir; dracutdir=$withval +else + dracutdir=check +fi + + + if test "x$dracutdir" = xcheck; then + + path1=/usr/share/dracut + path2=/usr/lib/dracut + default=$path2 + + if test -d "$path1"; then + dracutdir="$path1" +else + + if test -d "$path2"; then + dracutdir="$path2" +else + dracutdir="$default" +fi + + +fi + + +fi + + + + { $as_echo "$as_me:$LINENO: result: $dracutdir" >&5 +$as_echo "$dracutdir" >&6; } + + + ZLIB= + + if test "${ac_cv_header_zlib_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for zlib.h" >&5 +$as_echo_n "checking for zlib.h... " >&6; } +if test "${ac_cv_header_zlib_h+set}" = set; then + $as_echo_n "(cached) " >&6 +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 +$as_echo "$ac_cv_header_zlib_h" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking zlib.h usability" >&5 +$as_echo_n "checking zlib.h usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking zlib.h presence" >&5 +$as_echo_n "checking zlib.h presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for zlib.h" >&5 +$as_echo_n "checking for zlib.h... " >&6; } +if test "${ac_cv_header_zlib_h+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_header_zlib_h=$ac_header_preproc +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 +$as_echo "$ac_cv_header_zlib_h" >&6; } + +fi +if test "x$ac_cv_header_zlib_h" = x""yes; then + : else { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { { $as_echo "$as_me:$LINENO: error: - *** uuid_generate() missing, libuuid-devel package required + *** zlib.h missing, zlib-devel package required See \`config.log' for more details." >&5 $as_echo "$as_me: error: - *** uuid_generate() missing, libuuid-devel package required + *** zlib.h missing, zlib-devel package required See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; }; } fi - { $as_echo "$as_me:$LINENO: checking for library containing uuid_is_null" >&5 -$as_echo_n "checking for library containing uuid_is_null... " >&6; } -if test "${ac_cv_search_uuid_is_null+set}" = set; then + + { $as_echo "$as_me:$LINENO: checking for library containing compress2" >&5 +$as_echo_n "checking for library containing compress2... " >&6; } +if test "${ac_cv_search_compress2+set}" = set; then $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -28164,16 +29172,16 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char uuid_is_null (); +char compress2 (); int main () { -return uuid_is_null (); +return compress2 (); ; return 0; } _ACEOF -for ac_lib in '' uuid; do +for ac_lib in '' z; do if test -z "$ac_lib"; then ac_res="none required" else @@ -28201,7 +29209,7 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_search_uuid_is_null=$ac_res + ac_cv_search_compress2=$ac_res else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -28212,21 +29220,21 @@ fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext - if test "${ac_cv_search_uuid_is_null+set}" = set; then + if test "${ac_cv_search_compress2+set}" = set; then break fi done -if test "${ac_cv_search_uuid_is_null+set}" = set; then +if test "${ac_cv_search_compress2+set}" = set; then : else - ac_cv_search_uuid_is_null=no + ac_cv_search_compress2=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_uuid_is_null" >&5 -$as_echo "$ac_cv_search_uuid_is_null" >&6; } -ac_res=$ac_cv_search_uuid_is_null +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_compress2" >&5 +$as_echo "$ac_cv_search_compress2" >&6; } +ac_res=$ac_cv_search_compress2 if test "$ac_res" != no; then test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" @@ -28234,44 +29242,21 @@ else { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { { $as_echo "$as_me:$LINENO: error: - *** uuid_is_null() missing, libuuid-devel package required + *** compress2() missing, zlib-devel package required See \`config.log' for more details." >&5 $as_echo "$as_me: error: - *** uuid_is_null() missing, libuuid-devel package required + *** compress2() missing, zlib-devel package required See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; }; } fi - LIBUUID="-luuid" - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBUUID 1 -_ACEOF - - - - -# Check whether --with-tirpc was given. -if test "${with_tirpc+set}" = set; then - withval=$with_tirpc; -else - with_tirpc=check -fi - - - LIBTIRPC= - LIBTIRPC_CFLAGS= - - if test "x$with_tirpc" != xno; then - { $as_echo "$as_me:$LINENO: checking for xdrmem_create in -ltirpc" >&5 -$as_echo_n "checking for xdrmem_create in -ltirpc... " >&6; } -if test "${ac_cv_lib_tirpc_xdrmem_create+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for library containing uncompress" >&5 +$as_echo_n "checking for library containing uncompress... " >&6; } +if test "${ac_cv_search_uncompress+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ltirpc $LIBS" + ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -28285,16 +29270,23 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char xdrmem_create (); +char uncompress (); int main () { -return xdrmem_create (); +return uncompress (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +for ac_lib in '' z; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -28315,45 +29307,51 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_tirpc_xdrmem_create=yes + ac_cv_search_uncompress=$ac_res else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_tirpc_xdrmem_create=no + fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + conftest$ac_exeext + if test "${ac_cv_search_uncompress+set}" = set; then + break fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tirpc_xdrmem_create" >&5 -$as_echo "$ac_cv_lib_tirpc_xdrmem_create" >&6; } -if test "x$ac_cv_lib_tirpc_xdrmem_create" = x""yes; then - LIBTIRPC=-ltirpc - - LIBTIRPC_CFLAGS=-I/usr/include/tirpc - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBTIRPC 1 -_ACEOF - +done +if test "${ac_cv_search_uncompress+set}" = set; then + : +else + ac_cv_search_uncompress=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_uncompress" >&5 +$as_echo "$ac_cv_search_uncompress" >&6; } +ac_res=$ac_cv_search_uncompress +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" else - if test "x$with_tirpc" != xcheck; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: --with-tirpc was given, but test for tirpc failed +{ { $as_echo "$as_me:$LINENO: error: + *** uncompress() missing, zlib-devel package required See \`config.log' for more details." >&5 -$as_echo "$as_me: error: --with-tirpc was given, but test for tirpc failed +$as_echo "$as_me: error: + *** uncompress() missing, zlib-devel package required See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; }; } - fi - { $as_echo "$as_me:$LINENO: checking for library containing xdrmem_create" >&5 -$as_echo_n "checking for library containing xdrmem_create... " >&6; } -if test "${ac_cv_search_xdrmem_create+set}" = set; then +fi + + + { $as_echo "$as_me:$LINENO: checking for library containing crc32" >&5 +$as_echo_n "checking for library containing crc32... " >&6; } +if test "${ac_cv_search_crc32+set}" = set; then $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -28370,16 +29368,16 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char xdrmem_create (); +char crc32 (); int main () { -return xdrmem_create (); +return crc32 (); ; return 0; } _ACEOF -for ac_lib in '' tirpc; do +for ac_lib in '' z; do if test -z "$ac_lib"; then ac_res="none required" else @@ -28407,7 +29405,7 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_search_xdrmem_create=$ac_res + ac_cv_search_crc32=$ac_res else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -28418,154 +29416,60 @@ fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext - if test "${ac_cv_search_xdrmem_create+set}" = set; then + if test "${ac_cv_search_crc32+set}" = set; then break fi done -if test "${ac_cv_search_xdrmem_create+set}" = set; then +if test "${ac_cv_search_crc32+set}" = set; then : else - ac_cv_search_xdrmem_create=no + ac_cv_search_crc32=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_xdrmem_create" >&5 -$as_echo "$ac_cv_search_xdrmem_create" >&6; } -ac_res=$ac_cv_search_xdrmem_create +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_crc32" >&5 +$as_echo "$ac_cv_search_crc32" >&6; } +ac_res=$ac_cv_search_crc32 if test "$ac_res" != no; then test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" else - - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: xdrmem_create() requires tirpc or libc +{ { $as_echo "$as_me:$LINENO: error: + *** crc32() missing, zlib-devel package required See \`config.log' for more details." >&5 -$as_echo "$as_me: error: xdrmem_create() requires tirpc or libc +$as_echo "$as_me: error: + *** crc32() missing, zlib-devel package required See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; }; } fi -fi + ZLIB="-lz" -else - { $as_echo "$as_me:$LINENO: checking for library containing xdrmem_create" >&5 -$as_echo_n "checking for library containing xdrmem_create... " >&6; } -if test "${ac_cv_search_xdrmem_create+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char xdrmem_create (); -int -main () -{ -return xdrmem_create (); - ; - return 0; -} +cat >>confdefs.h <<\_ACEOF +#define HAVE_ZLIB 1 _ACEOF -for ac_lib in '' tirpc; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_search_xdrmem_create=$ac_res -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_xdrmem_create+set}" = set; then - break -fi -done -if test "${ac_cv_search_xdrmem_create+set}" = set; then - : -else - ac_cv_search_xdrmem_create=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_xdrmem_create" >&5 -$as_echo "$ac_cv_search_xdrmem_create" >&6; } -ac_res=$ac_cv_search_xdrmem_create -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -else - - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: xdrmem_create() requires libc -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: xdrmem_create() requires libc -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -fi - - -fi - LIBBLKID= + LIBUUID= - if test "${ac_cv_header_blkid_blkid_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for blkid/blkid.h" >&5 -$as_echo_n "checking for blkid/blkid.h... " >&6; } -if test "${ac_cv_header_blkid_blkid_h+set}" = set; then + if test "${ac_cv_header_uuid_uuid_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for uuid/uuid.h" >&5 +$as_echo_n "checking for uuid/uuid.h... " >&6; } +if test "${ac_cv_header_uuid_uuid_h+set}" = set; then $as_echo_n "(cached) " >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_blkid_blkid_h" >&5 -$as_echo "$ac_cv_header_blkid_blkid_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_uuid_uuid_h" >&5 +$as_echo "$ac_cv_header_uuid_uuid_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking blkid/blkid.h usability" >&5 -$as_echo_n "checking blkid/blkid.h usability... " >&6; } +{ $as_echo "$as_me:$LINENO: checking uuid/uuid.h usability" >&5 +$as_echo_n "checking uuid/uuid.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -28573,7 +29477,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -28606,15 +29510,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext $as_echo "$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking blkid/blkid.h presence" >&5 -$as_echo_n "checking blkid/blkid.h presence... " >&6; } +{ $as_echo "$as_me:$LINENO: checking uuid/uuid.h presence" >&5 +$as_echo_n "checking uuid/uuid.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -28648,96 +29552,99 @@ $as_echo "$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: blkid/blkid.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: blkid/blkid.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: blkid/blkid.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: blkid/blkid.h: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: uuid/uuid.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: uuid/uuid.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: uuid/uuid.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: uuid/uuid.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: blkid/blkid.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: blkid/blkid.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: blkid/blkid.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: blkid/blkid.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: blkid/blkid.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: blkid/blkid.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: blkid/blkid.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: blkid/blkid.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: blkid/blkid.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: blkid/blkid.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: blkid/blkid.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: blkid/blkid.h: in the future, the compiler will take precedence" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: uuid/uuid.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: uuid/uuid.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: uuid/uuid.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: uuid/uuid.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: uuid/uuid.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: uuid/uuid.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: uuid/uuid.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: uuid/uuid.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: uuid/uuid.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: uuid/uuid.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: uuid/uuid.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: uuid/uuid.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for blkid/blkid.h" >&5 -$as_echo_n "checking for blkid/blkid.h... " >&6; } -if test "${ac_cv_header_blkid_blkid_h+set}" = set; then +{ $as_echo "$as_me:$LINENO: checking for uuid/uuid.h" >&5 +$as_echo_n "checking for uuid/uuid.h... " >&6; } +if test "${ac_cv_header_uuid_uuid_h+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_cv_header_blkid_blkid_h=$ac_header_preproc + ac_cv_header_uuid_uuid_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_blkid_blkid_h" >&5 -$as_echo "$ac_cv_header_blkid_blkid_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_uuid_uuid_h" >&5 +$as_echo "$ac_cv_header_uuid_uuid_h" >&6; } fi -if test "x$ac_cv_header_blkid_blkid_h" = x""yes; then +if test "x$ac_cv_header_uuid_uuid_h" = x""yes; then : else { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { { $as_echo "$as_me:$LINENO: error: - *** blkid.h missing, libblkid-devel package required + *** uuid/uuid.h missing, libuuid-devel package required See \`config.log' for more details." >&5 $as_echo "$as_me: error: - *** blkid.h missing, libblkid-devel package required + *** uuid/uuid.h missing, libuuid-devel package required See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; }; } fi - LIBBLKID="-lblkid" - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBBLKID 1 -_ACEOF - - - - LIBATTR= - - if test "${ac_cv_header_attr_xattr_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for attr/xattr.h" >&5 -$as_echo_n "checking for attr/xattr.h... " >&6; } -if test "${ac_cv_header_attr_xattr_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for library containing uuid_generate" >&5 +$as_echo_n "checking for library containing uuid_generate... " >&6; } +if test "${ac_cv_search_uuid_generate+set}" = set; then $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_attr_xattr_h" >&5 -$as_echo "$ac_cv_header_attr_xattr_h" >&6; } else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking attr/xattr.h usability" >&5 -$as_echo_n "checking attr/xattr.h usability... " >&6; } + ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char uuid_generate (); +int +main () +{ +return uuid_generate (); + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +for ac_lib in '' uuid; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -28746,152 +29653,96 @@ $as_echo "$ac_try_echo") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking attr/xattr.h presence" >&5 -$as_echo_n "checking attr/xattr.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext }; then - ac_header_preproc=yes + ac_cv_search_uuid_generate=$ac_res else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: attr/xattr.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: attr/xattr.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: attr/xattr.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: attr/xattr.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: attr/xattr.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: attr/xattr.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: attr/xattr.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: attr/xattr.h: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for attr/xattr.h" >&5 -$as_echo_n "checking for attr/xattr.h... " >&6; } -if test "${ac_cv_header_attr_xattr_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_attr_xattr_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_attr_xattr_h" >&5 -$as_echo "$ac_cv_header_attr_xattr_h" >&6; } +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_uuid_generate+set}" = set; then + break fi -if test "x$ac_cv_header_attr_xattr_h" = x""yes; then +done +if test "${ac_cv_search_uuid_generate+set}" = set; then : +else + ac_cv_search_uuid_generate=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_uuid_generate" >&5 +$as_echo "$ac_cv_search_uuid_generate" >&6; } +ac_res=$ac_cv_search_uuid_generate +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + else { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { { $as_echo "$as_me:$LINENO: error: - *** attr/xattr.h missing, libattr-devel package required + *** uuid_generate() missing, libuuid-devel package required See \`config.log' for more details." >&5 $as_echo "$as_me: error: - *** attr/xattr.h missing, libattr-devel package required + *** uuid_generate() missing, libuuid-devel package required See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; }; } fi - - LIBATTR="-lattr" - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBATTR 1 -_ACEOF - - - - LIBUDEV= - - if test "${ac_cv_header_libudev_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for libudev.h" >&5 -$as_echo_n "checking for libudev.h... " >&6; } -if test "${ac_cv_header_libudev_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for library containing uuid_is_null" >&5 +$as_echo_n "checking for library containing uuid_is_null... " >&6; } +if test "${ac_cv_search_uuid_is_null+set}" = set; then $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libudev_h" >&5 -$as_echo "$ac_cv_header_libudev_h" >&6; } else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking libudev.h usability" >&5 -$as_echo_n "checking libudev.h usability... " >&6; } + ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char uuid_is_null (); +int +main () +{ +return uuid_is_null (); + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +for ac_lib in '' uuid; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -28900,120 +29751,81 @@ $as_echo "$ac_try_echo") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_search_uuid_is_null=$ac_res else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +fi -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking libudev.h presence" >&5 -$as_echo_n "checking libudev.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_uuid_is_null+set}" = set; then + break +fi +done +if test "${ac_cv_search_uuid_is_null+set}" = set; then + : else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no + ac_cv_search_uuid_is_null=no fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_uuid_is_null" >&5 +$as_echo "$ac_cv_search_uuid_is_null" >&6; } +ac_res=$ac_cv_search_uuid_is_null +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: libudev.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: libudev.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libudev.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: libudev.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: libudev.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: libudev.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libudev.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: libudev.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libudev.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: libudev.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libudev.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: libudev.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libudev.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: libudev.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libudev.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: libudev.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for libudev.h" >&5 -$as_echo_n "checking for libudev.h... " >&6; } -if test "${ac_cv_header_libudev_h+set}" = set; then - $as_echo_n "(cached) " >&6 else - ac_cv_header_libudev_h=$ac_header_preproc + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: + *** uuid_is_null() missing, libuuid-devel package required +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: + *** uuid_is_null() missing, libuuid-devel package required +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libudev_h" >&5 -$as_echo "$ac_cv_header_libudev_h" >&6; } -fi -if test "x$ac_cv_header_libudev_h" = x""yes; then - user_libudev=yes - LIBUDEV="-ludev" + LIBUUID="-luuid" cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBUDEV 1 +#define HAVE_LIBUUID 1 _ACEOF -else - user_libudev=no +# Check whether --with-tirpc was given. +if test "${with_tirpc+set}" = set; then + withval=$with_tirpc; +else + with_tirpc=check fi + LIBTIRPC= + LIBTIRPC_CFLAGS= - { $as_echo "$as_me:$LINENO: checking for library containing udev_device_get_is_initialized" >&5 -$as_echo_n "checking for library containing udev_device_get_is_initialized... " >&6; } -if test "${ac_cv_search_udev_device_get_is_initialized+set}" = set; then + if test "x$with_tirpc" != xno; then + { $as_echo "$as_me:$LINENO: checking for xdrmem_create in -ltirpc" >&5 +$as_echo_n "checking for xdrmem_create in -ltirpc... " >&6; } +if test "${ac_cv_lib_tirpc_xdrmem_create+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_func_search_save_LIBS=$LIBS + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltirpc $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -29027,23 +29839,16 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char udev_device_get_is_initialized (); +char xdrmem_create (); int main () { -return udev_device_get_is_initialized (); +return xdrmem_create (); ; return 0; } _ACEOF -for ac_lib in '' udev; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext +rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -29064,75 +29869,86 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_search_udev_device_get_is_initialized=$ac_res + ac_cv_lib_tirpc_xdrmem_create=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - + ac_cv_lib_tirpc_xdrmem_create=no fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_udev_device_get_is_initialized+set}" = set; then - break + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -done -if test "${ac_cv_search_udev_device_get_is_initialized+set}" = set; then - : -else - ac_cv_search_udev_device_get_is_initialized=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_udev_device_get_is_initialized" >&5 -$as_echo "$ac_cv_search_udev_device_get_is_initialized" >&6; } -ac_res=$ac_cv_search_udev_device_get_is_initialized -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tirpc_xdrmem_create" >&5 +$as_echo "$ac_cv_lib_tirpc_xdrmem_create" >&6; } +if test "x$ac_cv_lib_tirpc_xdrmem_create" = x""yes; then + LIBTIRPC=-ltirpc + + LIBTIRPC_CFLAGS=-I/usr/include/tirpc cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBUDEV_UDEV_DEVICE_GET_IS_INITIALIZED 1 +#define HAVE_LIBTIRPC 1 _ACEOF -fi - - - - - { $as_echo "$as_me:$LINENO: checking for -Wframe-larger-than= support" >&5 -$as_echo_n "checking for -Wframe-larger-than= support... " >&6; } - - saved_flags="$CFLAGS" - CFLAGS="$CFLAGS -Wframe-larger-than=1024" - cat >conftest.$ac_ext <<_ACEOF +else + if test "x$with_tirpc" != xcheck; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: --with-tirpc was given, but test for tirpc failed +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: --with-tirpc was given, but test for tirpc failed +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + fi + { $as_echo "$as_me:$LINENO: checking for library containing xdrmem_create" >&5 +$as_echo_n "checking for library containing xdrmem_create... " >&6; } +if test "${ac_cv_search_xdrmem_create+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char xdrmem_create (); int main () { - +return xdrmem_create (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +for ac_lib in '' tirpc; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -29141,66 +29957,98 @@ $as_echo "$ac_try_echo") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - - FRAME_LARGER_THAN=-Wframe-larger-than=1024 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_search_xdrmem_create=$ac_res else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - FRAME_LARGER_THAN= - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - CFLAGS="$saved_flags" - +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_xdrmem_create+set}" = set; then + break +fi +done +if test "${ac_cv_search_xdrmem_create+set}" = set; then + : +else + ac_cv_search_xdrmem_create=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_xdrmem_create" >&5 +$as_echo "$ac_cv_search_xdrmem_create" >&6; } +ac_res=$ac_cv_search_xdrmem_create +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +else - if test "x$runstatedir" = x; then - runstatedir='${localstatedir}/run' + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: xdrmem_create() requires tirpc or libc +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: xdrmem_create() requires tirpc or libc +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } +fi - fi +fi - { $as_echo "$as_me:$LINENO: checking makedev() is declared in sys/sysmacros.h" >&5 -$as_echo_n "checking makedev() is declared in sys/sysmacros.h... " >&6; } - cat >conftest.$ac_ext <<_ACEOF +else + { $as_echo "$as_me:$LINENO: checking for library containing xdrmem_create" >&5 +$as_echo_n "checking for library containing xdrmem_create... " >&6; } +if test "${ac_cv_search_xdrmem_create+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char xdrmem_create (); int main () { - - int k; - k = makedev(0,0); - +return xdrmem_create (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +for ac_lib in '' tirpc; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -29209,50 +30057,77 @@ $as_echo "$ac_try_echo") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_search_xdrmem_create=$ac_res +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_MAKEDEV_IN_SYSMACROS 1 -_ACEOF +fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_xdrmem_create+set}" = set; then + break +fi +done +if test "${ac_cv_search_xdrmem_create+set}" = set; then + : +else + ac_cv_search_xdrmem_create=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_xdrmem_create" >&5 +$as_echo "$ac_cv_search_xdrmem_create" >&6; } +ac_res=$ac_cv_search_xdrmem_create +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: xdrmem_create() requires libc +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: xdrmem_create() requires libc +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } +fi - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking makedev() is declared in sys/mkdev.h" >&5 -$as_echo_n "checking makedev() is declared in sys/mkdev.h... " >&6; } - cat >conftest.$ac_ext <<_ACEOF + LIBBLKID= + + if test "${ac_cv_header_blkid_blkid_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for blkid/blkid.h" >&5 +$as_echo_n "checking for blkid/blkid.h... " >&6; } +if test "${ac_cv_header_blkid_blkid_h+set}" = set; then + $as_echo_n "(cached) " >&6 +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_blkid_blkid_h" >&5 +$as_echo "$ac_cv_header_blkid_blkid_h" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking blkid/blkid.h usability" >&5 +$as_echo_n "checking blkid/blkid.h usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - - #include - -int -main () -{ - - int k; - k = makedev(0,0); - - ; - return 0; -} +$ac_includes_default +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -29272,48 +30147,141 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_MAKEDEV_IN_MKDEV 1 -_ACEOF + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking blkid/blkid.h presence" >&5 +$as_echo_n "checking blkid/blkid.h presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no +fi - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: blkid/blkid.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: blkid/blkid.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: blkid/blkid.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: blkid/blkid.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: blkid/blkid.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: blkid/blkid.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: blkid/blkid.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: blkid/blkid.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: blkid/blkid.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: blkid/blkid.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: blkid/blkid.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: blkid/blkid.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: blkid/blkid.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: blkid/blkid.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: blkid/blkid.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: blkid/blkid.h: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for blkid/blkid.h" >&5 +$as_echo_n "checking for blkid/blkid.h... " >&6; } +if test "${ac_cv_header_blkid_blkid_h+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_header_blkid_blkid_h=$ac_header_preproc +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_blkid_blkid_h" >&5 +$as_echo "$ac_cv_header_blkid_blkid_h" >&6; } +fi +if test "x$ac_cv_header_blkid_blkid_h" = x""yes; then + : +else + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: + *** blkid.h missing, libblkid-devel package required +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: + *** blkid.h missing, libblkid-devel package required +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking for -Wno-format-truncation support" >&5 -$as_echo_n "checking for -Wno-format-truncation support... " >&6; } + LIBBLKID="-lblkid" - saved_flags="$CFLAGS" - CFLAGS="$CFLAGS -Wno-format-truncation" - cat >conftest.$ac_ext <<_ACEOF +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBBLKID 1 +_ACEOF + + + + LIBUDEV= + + if test "${ac_cv_header_libudev_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for libudev.h" >&5 +$as_echo_n "checking for libudev.h... " >&6; } +if test "${ac_cv_header_libudev_h+set}" = set; then + $as_echo_n "(cached) " >&6 +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libudev_h" >&5 +$as_echo "$ac_cv_header_libudev_h" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking libudev.h usability" >&5 +$as_echo_n "checking libudev.h usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +$ac_includes_default +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -29333,66 +30301,125 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - NO_FORMAT_TRUNCATION=-Wno-format-truncation - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking libudev.h presence" >&5 +$as_echo_n "checking libudev.h presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no +fi - NO_FORMAT_TRUNCATION= - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } -fi +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: libudev.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: libudev.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libudev.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: libudev.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: libudev.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: libudev.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libudev.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: libudev.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libudev.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: libudev.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libudev.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: libudev.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libudev.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: libudev.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libudev.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: libudev.h: in the future, the compiler will take precedence" >&2;} -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for libudev.h" >&5 +$as_echo_n "checking for libudev.h... " >&6; } +if test "${ac_cv_header_libudev_h+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_header_libudev_h=$ac_header_preproc +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libudev_h" >&5 +$as_echo "$ac_cv_header_libudev_h" >&6; } - CFLAGS="$saved_flags" +fi +if test "x$ac_cv_header_libudev_h" = x""yes; then + user_libudev=yes + LIBUDEV="-ludev" +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBUDEV 1 +_ACEOF - ZONENAME="echo global" +else + user_libudev=no +fi -for ac_func in mlockall -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for library containing udev_device_get_is_initialized" >&5 +$as_echo_n "checking for library containing udev_device_get_is_initialized... " >&6; } +if test "${ac_cv_search_udev_device_get_is_initialized+set}" = set; then $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_func_search_save_LIBS=$LIBS +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -29400,25 +30427,547 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - +char udev_device_get_is_initialized (); int main () { -return $ac_func (); +return udev_device_get_is_initialized (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in +for ac_lib in '' udev; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_search_udev_device_get_is_initialized=$ac_res +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_udev_device_get_is_initialized+set}" = set; then + break +fi +done +if test "${ac_cv_search_udev_device_get_is_initialized+set}" = set; then + : +else + ac_cv_search_udev_device_get_is_initialized=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_udev_device_get_is_initialized" >&5 +$as_echo "$ac_cv_search_udev_device_get_is_initialized" >&6; } +ac_res=$ac_cv_search_udev_device_get_is_initialized +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBUDEV_UDEV_DEVICE_GET_IS_INITIALIZED 1 +_ACEOF + +fi + + + + + { $as_echo "$as_me:$LINENO: checking for -Wframe-larger-than= support" >&5 +$as_echo_n "checking for -Wframe-larger-than= support... " >&6; } + + saved_flags="$CFLAGS" + CFLAGS="$CFLAGS -Wframe-larger-than=1024" + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + + FRAME_LARGER_THAN=-Wframe-larger-than=1024 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + FRAME_LARGER_THAN= + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CFLAGS="$saved_flags" + + + + LIBAIO= + + if test "${ac_cv_header_libaio_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for libaio.h" >&5 +$as_echo_n "checking for libaio.h... " >&6; } +if test "${ac_cv_header_libaio_h+set}" = set; then + $as_echo_n "(cached) " >&6 +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libaio_h" >&5 +$as_echo "$ac_cv_header_libaio_h" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking libaio.h usability" >&5 +$as_echo_n "checking libaio.h usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking libaio.h presence" >&5 +$as_echo_n "checking libaio.h presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: libaio.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: libaio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libaio.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: libaio.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: libaio.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: libaio.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libaio.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: libaio.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libaio.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: libaio.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libaio.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: libaio.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libaio.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: libaio.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libaio.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: libaio.h: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for libaio.h" >&5 +$as_echo_n "checking for libaio.h... " >&6; } +if test "${ac_cv_header_libaio_h+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_header_libaio_h=$ac_header_preproc +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libaio_h" >&5 +$as_echo "$ac_cv_header_libaio_h" >&6; } + +fi +if test "x$ac_cv_header_libaio_h" = x""yes; then + + user_libaio=yes + LIBAIO="-laio" + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBAIO 1 +_ACEOF + + +else + + user_libaio=no + +fi + + + + + if test "x$runstatedir" = x; then + runstatedir='${localstatedir}/run' + + fi + + + { $as_echo "$as_me:$LINENO: checking makedev() is declared in sys/sysmacros.h" >&5 +$as_echo_n "checking makedev() is declared in sys/sysmacros.h... " >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + +int +main () +{ + + int k; + k = makedev(0,0); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_MAKEDEV_IN_SYSMACROS 1 +_ACEOF + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + { $as_echo "$as_me:$LINENO: checking makedev() is declared in sys/mkdev.h" >&5 +$as_echo_n "checking makedev() is declared in sys/mkdev.h... " >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + +int +main () +{ + + int k; + k = makedev(0,0); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_MAKEDEV_IN_MKDEV 1 +_ACEOF + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + { $as_echo "$as_me:$LINENO: checking for -Wno-format-truncation support" >&5 +$as_echo_n "checking for -Wno-format-truncation support... " >&6; } + + saved_flags="$CFLAGS" + CFLAGS="$CFLAGS -Wno-format-truncation" + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + + NO_FORMAT_TRUNCATION=-Wno-format-truncation + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + NO_FORMAT_TRUNCATION= + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CFLAGS="$saved_flags" + + + + + ZONENAME="echo global" + + + + + + +for ac_func in mlockall +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -29529,9 +31078,9 @@ $as_echo "$udevdir;$udevruledir" >&6; } # Check whether --enable-systemd was given. if test "${enable_systemd+set}" = set; then - enableval=$enable_systemd; + enableval=$enable_systemd; enable_systemd=$enableval else - enable_systemd=yes + enable_systemd=check fi @@ -29562,13 +31111,34 @@ else fi + if test "x$enable_systemd" = xcheck; then + + if systemctl --version >/dev/null 2>&1; then + enable_systemd=yes +else + enable_systemd=no +fi + + +fi + + + { $as_echo "$as_me:$LINENO: checking for systemd support" >&5 +$as_echo_n "checking for systemd support... " >&6; } + { $as_echo "$as_me:$LINENO: result: $enable_systemd" >&5 +$as_echo "$enable_systemd" >&6; } if test "x$enable_systemd" = xyes; then ZFS_INIT_SYSTEMD=systemd ZFS_MODULE_LOAD=modules-load.d + DEFINE_SYSTEMD='--with systemd --define "_unitdir $(systemdunitdir)" --define "_presetdir $(systemdpresetdir)"' modulesloaddir=$systemdmodulesloaddir +else + + DEFINE_SYSTEMD='--without systemd' + fi @@ -29579,6 +31149,7 @@ fi + # Check whether --enable-sysvinit was given. if test "${enable_sysvinit+set}" = set; then enableval=$enable_sysvinit; @@ -30867,10 +32438,10 @@ else { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { { $as_echo "$as_me:$LINENO: error: - *** blkid.h missing, libblkid-devel package required + *** blkid.h missing, libblkid-devel package required See \`config.log' for more details." >&5 $as_echo "$as_me: error: - *** blkid.h missing, libblkid-devel package required + *** blkid.h missing, libblkid-devel package required See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; }; } fi @@ -30886,20 +32457,324 @@ _ACEOF - LIBATTR= + LIBUDEV= + + if test "${ac_cv_header_libudev_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for libudev.h" >&5 +$as_echo_n "checking for libudev.h... " >&6; } +if test "${ac_cv_header_libudev_h+set}" = set; then + $as_echo_n "(cached) " >&6 +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libudev_h" >&5 +$as_echo "$ac_cv_header_libudev_h" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking libudev.h usability" >&5 +$as_echo_n "checking libudev.h usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking libudev.h presence" >&5 +$as_echo_n "checking libudev.h presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: libudev.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: libudev.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libudev.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: libudev.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: libudev.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: libudev.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libudev.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: libudev.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libudev.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: libudev.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libudev.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: libudev.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libudev.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: libudev.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libudev.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: libudev.h: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for libudev.h" >&5 +$as_echo_n "checking for libudev.h... " >&6; } +if test "${ac_cv_header_libudev_h+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_header_libudev_h=$ac_header_preproc +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libudev_h" >&5 +$as_echo "$ac_cv_header_libudev_h" >&6; } + +fi +if test "x$ac_cv_header_libudev_h" = x""yes; then + + user_libudev=yes + LIBUDEV="-ludev" + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBUDEV 1 +_ACEOF + + +else + + user_libudev=no + +fi + + + + { $as_echo "$as_me:$LINENO: checking for library containing udev_device_get_is_initialized" >&5 +$as_echo_n "checking for library containing udev_device_get_is_initialized... " >&6; } +if test "${ac_cv_search_udev_device_get_is_initialized+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char udev_device_get_is_initialized (); +int +main () +{ +return udev_device_get_is_initialized (); + ; + return 0; +} +_ACEOF +for ac_lib in '' udev; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_search_udev_device_get_is_initialized=$ac_res +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_udev_device_get_is_initialized+set}" = set; then + break +fi +done +if test "${ac_cv_search_udev_device_get_is_initialized+set}" = set; then + : +else + ac_cv_search_udev_device_get_is_initialized=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_udev_device_get_is_initialized" >&5 +$as_echo "$ac_cv_search_udev_device_get_is_initialized" >&6; } +ac_res=$ac_cv_search_udev_device_get_is_initialized +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBUDEV_UDEV_DEVICE_GET_IS_INITIALIZED 1 +_ACEOF + +fi + + + + + { $as_echo "$as_me:$LINENO: checking for -Wframe-larger-than= support" >&5 +$as_echo_n "checking for -Wframe-larger-than= support... " >&6; } + + saved_flags="$CFLAGS" + CFLAGS="$CFLAGS -Wframe-larger-than=1024" + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ - if test "${ac_cv_header_attr_xattr_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for attr/xattr.h" >&5 -$as_echo_n "checking for attr/xattr.h... " >&6; } -if test "${ac_cv_header_attr_xattr_h+set}" = set; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + + FRAME_LARGER_THAN=-Wframe-larger-than=1024 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + FRAME_LARGER_THAN= + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CFLAGS="$saved_flags" + + + + LIBAIO= + + if test "${ac_cv_header_libaio_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for libaio.h" >&5 +$as_echo_n "checking for libaio.h... " >&6; } +if test "${ac_cv_header_libaio_h+set}" = set; then $as_echo_n "(cached) " >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_attr_xattr_h" >&5 -$as_echo "$ac_cv_header_attr_xattr_h" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libaio_h" >&5 +$as_echo "$ac_cv_header_libaio_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking attr/xattr.h usability" >&5 -$as_echo_n "checking attr/xattr.h usability... " >&6; } +{ $as_echo "$as_me:$LINENO: checking libaio.h usability" >&5 +$as_echo_n "checking libaio.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -30907,7 +32782,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -30940,15 +32815,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext $as_echo "$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking attr/xattr.h presence" >&5 -$as_echo_n "checking attr/xattr.h presence... " >&6; } +{ $as_echo "$as_me:$LINENO: checking libaio.h presence" >&5 +$as_echo_n "checking libaio.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -30982,621 +32857,1172 @@ $as_echo "$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: attr/xattr.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: attr/xattr.h: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libaio.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: libaio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libaio.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: libaio.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: attr/xattr.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: attr/xattr.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: attr/xattr.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: attr/xattr.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: attr/xattr.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: attr/xattr.h: in the future, the compiler will take precedence" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libaio.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: libaio.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libaio.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: libaio.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libaio.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: libaio.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libaio.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: libaio.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libaio.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: libaio.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libaio.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: libaio.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for attr/xattr.h" >&5 -$as_echo_n "checking for attr/xattr.h... " >&6; } -if test "${ac_cv_header_attr_xattr_h+set}" = set; then +{ $as_echo "$as_me:$LINENO: checking for libaio.h" >&5 +$as_echo_n "checking for libaio.h... " >&6; } +if test "${ac_cv_header_libaio_h+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_header_libaio_h=$ac_header_preproc +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libaio_h" >&5 +$as_echo "$ac_cv_header_libaio_h" >&6; } + +fi +if test "x$ac_cv_header_libaio_h" = x""yes; then + + user_libaio=yes + LIBAIO="-laio" + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBAIO 1 +_ACEOF + + +else + + user_libaio=no + +fi + + + + + if test "x$runstatedir" = x; then + runstatedir='${localstatedir}/run' + + fi + + + { $as_echo "$as_me:$LINENO: checking makedev() is declared in sys/sysmacros.h" >&5 +$as_echo_n "checking makedev() is declared in sys/sysmacros.h... " >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + +int +main () +{ + + int k; + k = makedev(0,0); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_MAKEDEV_IN_SYSMACROS 1 +_ACEOF + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + { $as_echo "$as_me:$LINENO: checking makedev() is declared in sys/mkdev.h" >&5 +$as_echo_n "checking makedev() is declared in sys/mkdev.h... " >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + +int +main () +{ + + int k; + k = makedev(0,0); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_MAKEDEV_IN_MKDEV 1 +_ACEOF + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + { $as_echo "$as_me:$LINENO: checking for -Wno-format-truncation support" >&5 +$as_echo_n "checking for -Wno-format-truncation support... " >&6; } + + saved_flags="$CFLAGS" + CFLAGS="$CFLAGS -Wno-format-truncation" + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + + NO_FORMAT_TRUNCATION=-Wno-format-truncation + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + NO_FORMAT_TRUNCATION= + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CFLAGS="$saved_flags" + + + + + ZONENAME="echo global" + + + + + + +for ac_func in mlockall +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - ac_cv_header_attr_xattr_h=$ac_header_preproc + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + + + +# Check whether --with-linux was given. +if test "${with_linux+set}" = set; then + withval=$with_linux; kernelsrc="$withval" +fi + + + +# Check whether --with-linux-obj was given. +if test "${with_linux_obj+set}" = set; then + withval=$with_linux_obj; kernelbuild="$withval" +fi + + + { $as_echo "$as_me:$LINENO: checking kernel source directory" >&5 +$as_echo_n "checking kernel source directory... " >&6; } + if test -z "$kernelsrc"; then + + if test -e "/lib/modules/$(uname -r)/source"; then + + headersdir="/lib/modules/$(uname -r)/source" + sourcelink=$(readlink -f "$headersdir") + +elif test -e "/lib/modules/$(uname -r)/build"; then + + headersdir="/lib/modules/$(uname -r)/build" + sourcelink=$(readlink -f "$headersdir") + +else + + sourcelink=$(ls -1d /usr/src/kernels/* \ + /usr/src/linux-* \ + 2>/dev/null | grep -v obj | tail -1) + +fi + + + if test -n "$sourcelink" && test -e ${sourcelink}; then + + kernelsrc=`readlink -f ${sourcelink}` + +else + + kernelsrc="Not found" + +fi + + +else + + if test "$kernelsrc" = "NONE"; then + + kernsrcver=NONE + +fi + + withlinux=yes + +fi + + + { $as_echo "$as_me:$LINENO: result: $kernelsrc" >&5 +$as_echo "$kernelsrc" >&6; } + if test ! -d "$kernelsrc"; then + + { { $as_echo "$as_me:$LINENO: error: + *** Please make sure the kernel devel package for your distribution + *** is installed and then try again. If that fails, you can specify the + *** location of the kernel source with the '--with-linux=PATH' option." >&5 +$as_echo "$as_me: error: + *** Please make sure the kernel devel package for your distribution + *** is installed and then try again. If that fails, you can specify the + *** location of the kernel source with the '--with-linux=PATH' option." >&2;} + { (exit 1); exit 1; }; } + +fi + + + { $as_echo "$as_me:$LINENO: checking kernel build directory" >&5 +$as_echo_n "checking kernel build directory... " >&6; } + if test -z "$kernelbuild"; then + + if test x$withlinux != xyes -a -e "/lib/modules/$(uname -r)/build"; then + + kernelbuild=`readlink -f /lib/modules/$(uname -r)/build` + +elif test -d ${kernelsrc}-obj/${target_cpu}/${target_cpu}; then + + kernelbuild=${kernelsrc}-obj/${target_cpu}/${target_cpu} + +elif test -d ${kernelsrc}-obj/${target_cpu}/default; then + + kernelbuild=${kernelsrc}-obj/${target_cpu}/default + +elif test -d `dirname ${kernelsrc}`/build-${target_cpu}; then + + kernelbuild=`dirname ${kernelsrc}`/build-${target_cpu} + +else + + kernelbuild=${kernelsrc} + +fi + + +fi + + { $as_echo "$as_me:$LINENO: result: $kernelbuild" >&5 +$as_echo "$kernelbuild" >&6; } + + { $as_echo "$as_me:$LINENO: checking kernel source version" >&5 +$as_echo_n "checking kernel source version... " >&6; } + utsrelease1=$kernelbuild/include/linux/version.h + utsrelease2=$kernelbuild/include/linux/utsrelease.h + utsrelease3=$kernelbuild/include/generated/utsrelease.h + if test -r $utsrelease1 && fgrep -q UTS_RELEASE $utsrelease1; then + + utsrelease=linux/version.h + +elif test -r $utsrelease2 && fgrep -q UTS_RELEASE $utsrelease2; then + + utsrelease=linux/utsrelease.h + +elif test -r $utsrelease3 && fgrep -q UTS_RELEASE $utsrelease3; then + + utsrelease=generated/utsrelease.h + +fi + + + if test "$utsrelease"; then + + kernsrcver=`(echo "#include <$utsrelease>"; + echo "kernsrcver=UTS_RELEASE") | + cpp -I $kernelbuild/include | + grep "^kernsrcver=" | cut -d \" -f 2` + + if test -z "$kernsrcver"; then + + { $as_echo "$as_me:$LINENO: result: Not found" >&5 +$as_echo "Not found" >&6; } + { { $as_echo "$as_me:$LINENO: error: *** Cannot determine kernel version." >&5 +$as_echo "$as_me: error: *** Cannot determine kernel version." >&2;} + { (exit 1); exit 1; }; } + +fi + + +else + + { $as_echo "$as_me:$LINENO: result: Not found" >&5 +$as_echo "Not found" >&6; } + if test "x$enable_linux_builtin" != xyes; then + { { $as_echo "$as_me:$LINENO: error: *** Cannot find UTS_RELEASE definition." >&5 +$as_echo "$as_me: error: *** Cannot find UTS_RELEASE definition." >&2;} + { (exit 1); exit 1; }; } + else + { { $as_echo "$as_me:$LINENO: error: + *** Cannot find UTS_RELEASE definition. + *** Please run 'make prepare' inside the kernel source tree." >&5 +$as_echo "$as_me: error: + *** Cannot find UTS_RELEASE definition. + *** Please run 'make prepare' inside the kernel source tree." >&2;} + { (exit 1); exit 1; }; } + fi + +fi + + + { $as_echo "$as_me:$LINENO: result: $kernsrcver" >&5 +$as_echo "$kernsrcver" >&6; } + + LINUX=${kernelsrc} + LINUX_OBJ=${kernelbuild} + LINUX_VERSION=${kernsrcver} + + + + + + + modpost=$LINUX/scripts/Makefile.modpost + { $as_echo "$as_me:$LINENO: checking kernel file name for module symbols" >&5 +$as_echo_n "checking kernel file name for module symbols... " >&6; } + if test "x$enable_linux_builtin" != xyes -a -f "$modpost"; then + + if grep -q Modules.symvers $modpost; then + + LINUX_SYMBOLS=Modules.symvers + +else + + LINUX_SYMBOLS=Module.symvers + +fi + + + if test ! -f "$LINUX_OBJ/$LINUX_SYMBOLS"; then + + { { $as_echo "$as_me:$LINENO: error: + *** Please make sure the kernel devel package for your distribution + *** is installed. If you are building with a custom kernel, make sure the + *** kernel is configured, built, and the '--with-linux=PATH' configure + *** option refers to the location of the kernel source." >&5 +$as_echo "$as_me: error: + *** Please make sure the kernel devel package for your distribution + *** is installed. If you are building with a custom kernel, make sure the + *** kernel is configured, built, and the '--with-linux=PATH' configure + *** option refers to the location of the kernel source." >&2;} + { (exit 1); exit 1; }; } + +fi + + +else + + LINUX_SYMBOLS=NONE + +fi + + { $as_echo "$as_me:$LINENO: result: $LINUX_SYMBOLS" >&5 +$as_echo "$LINUX_SYMBOLS" >&6; } + + + + + +# Check whether --with-spl was given. +if test "${with_spl+set}" = set; then + withval=$with_spl; if test "$withval" = "yes"; then + { { $as_echo "$as_me:$LINENO: error: --with-spl=PATH requires a PATH" >&5 +$as_echo "$as_me: error: --with-spl=PATH requires a PATH" >&2;} + { (exit 1); exit 1; }; } +else + splsrc="$withval" +fi + +fi + + + +# Check whether --with-spl-obj was given. +if test "${with_spl_obj+set}" = set; then + withval=$with_spl_obj; splbuild="$withval" +fi + + + +# Check whether --with-spl-timeout was given. +if test "${with_spl_timeout+set}" = set; then + withval=$with_spl_timeout; timeout="$withval" +else + timeout=0 +fi + + + splsrc0="/var/lib/dkms/spl/${VERSION}/build" + splsrc1="/usr/local/src/spl-${VERSION}/${LINUX_VERSION}" + splsrc2="/usr/local/src/spl-${VERSION}" + splsrc3="/usr/src/spl-${VERSION}/${LINUX_VERSION}" + splsrc4="/usr/src/spl-${VERSION}" + splsrc5="../spl/" + splsrc6="$LINUX" + + { $as_echo "$as_me:$LINENO: checking spl source directory" >&5 +$as_echo_n "checking spl source directory... " >&6; } + if test -z "${splsrc}"; then + + all_spl_sources=" + ${splsrc0} + ${splsrc1} + ${splsrc2} + ${splsrc3} + ${splsrc4} + ${splsrc5} + ${splsrc6}", + if test -e "${splsrc0}/spl.release.in"; then + + splsrc=${splsrc0} + +elif test -e "${splsrc1}/spl.release.in"; then + + splsrc=${splsrc1} + +elif test -e "${splsrc2}/spl.release.in"; then + + splsrc=${splsrc2} + +elif test -e "${splsrc3}/spl.release.in"; then + + splsrc=$(readlink -f "${splsrc3}") + +elif test -e "${splsrc4}/spl.release.in" ; then + + splsrc=${splsrc4} + +elif test -e "${splsrc5}/spl.release.in"; then + + splsrc=$(readlink -f "${splsrc5}") + +elif test -e "${splsrc6}/spl.release.in" ; then + + splsrc=${splsrc6} + +else + + splsrc="Not found" + +fi + + +else + + all_spl_sources="$withval", + if test "$splsrc" = "NONE"; then + + splbuild=NONE + splsrcver=NONE + +fi + + +fi + + + { $as_echo "$as_me:$LINENO: result: $splsrc" >&5 +$as_echo "$splsrc" >&6; } + if test ! -e "$splsrc/spl.release.in"; then + + { { $as_echo "$as_me:$LINENO: error: + *** Please make sure the kmod spl devel package for your distribution + *** is installed then try again. If that fails you can specify the + *** location of the spl source with the '--with-spl=PATH' option. + *** The spl version must match the version of ZFS you are building, + *** ${VERSION}. Failed to find spl.release.in in the following: + $all_spl_sources" >&5 +$as_echo "$as_me: error: + *** Please make sure the kmod spl devel package for your distribution + *** is installed then try again. If that fails you can specify the + *** location of the spl source with the '--with-spl=PATH' option. + *** The spl version must match the version of ZFS you are building, + *** ${VERSION}. Failed to find spl.release.in in the following: + $all_spl_sources" >&2;} + { (exit 1); exit 1; }; } + +fi + + + { $as_echo "$as_me:$LINENO: checking spl build directory" >&5 +$as_echo_n "checking spl build directory... " >&6; } + + all_spl_config_locs="${splsrc}/${LINUX_VERSION} + ${splsrc}" + + while true; do + if test -z "$splbuild"; then + + if test -e "${splsrc}/${LINUX_VERSION}/spl_config.h" ; then + + splbuild="${splsrc}/${LINUX_VERSION}" + +elif test -e "${splsrc}/spl_config.h" ; then + + splbuild="${splsrc}" + +elif find -L "${splsrc}" -name spl_config.h 2> /dev/null | grep -wq spl_config.h ; then + + splbuild=$(find -L "${splsrc}" -name spl_config.h | sed 's,/spl_config.h,,') + +else + + splbuild="Not found" + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_attr_xattr_h" >&5 -$as_echo "$ac_cv_header_attr_xattr_h" >&6; } + fi -if test "x$ac_cv_header_attr_xattr_h" = x""yes; then - : + + if test -e "$splbuild/spl_config.h" -o $timeout -le 0; then + + break; + else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: - *** attr/xattr.h missing, libattr-devel package required -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: - *** attr/xattr.h missing, libattr-devel package required -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + + sleep 1 + timeout=$((timeout-1)) + fi + done + { $as_echo "$as_me:$LINENO: result: $splbuild" >&5 +$as_echo "$splbuild" >&6; } + if ! test -e "$splbuild/spl_config.h"; then - LIBATTR="-lattr" + { { $as_echo "$as_me:$LINENO: error: + *** Please make sure the kmod spl devel package for your + *** distribution is installed then try again. If that fails you + *** can specify the location of the spl objects with the + *** '--with-spl-obj=PATH' option. Failed to find spl_config.h in + *** any of the following: + $all_spl_config_locs" >&5 +$as_echo "$as_me: error: + *** Please make sure the kmod spl devel package for your + *** distribution is installed then try again. If that fails you + *** can specify the location of the spl objects with the + *** '--with-spl-obj=PATH' option. Failed to find spl_config.h in + *** any of the following: + $all_spl_config_locs" >&2;} + { (exit 1); exit 1; }; } +fi -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBATTR 1 -_ACEOF + { $as_echo "$as_me:$LINENO: checking spl source version" >&5 +$as_echo_n "checking spl source version... " >&6; } + if test -r $splbuild/spl_config.h && + fgrep -q SPL_META_VERSION $splbuild/spl_config.h; then - LIBUDEV= + splsrcver=`(echo "#include "; + echo "splsrcver=SPL_META_VERSION-SPL_META_RELEASE") | + cpp -I $splbuild | + grep "^splsrcver=" | tr -d \" | cut -d= -f2` - if test "${ac_cv_header_libudev_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for libudev.h" >&5 -$as_echo_n "checking for libudev.h... " >&6; } -if test "${ac_cv_header_libudev_h+set}" = set; then - $as_echo_n "(cached) " >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libudev_h" >&5 -$as_echo "$ac_cv_header_libudev_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking libudev.h usability" >&5 -$as_echo_n "checking libudev.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } + if test -z "$splsrcver"; then -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking libudev.h presence" >&5 -$as_echo_n "checking libudev.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:$LINENO: result: Not found" >&5 +$as_echo "Not found" >&6; } + { { $as_echo "$as_me:$LINENO: error: + *** Cannot determine the version of the spl source. + *** Please prepare the spl source before running this script" >&5 +$as_echo "$as_me: error: + *** Cannot determine the version of the spl source. + *** Please prepare the spl source before running this script" >&2;} + { (exit 1); exit 1; }; } - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: libudev.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: libudev.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libudev.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: libudev.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: libudev.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: libudev.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libudev.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: libudev.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libudev.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: libudev.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libudev.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: libudev.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libudev.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: libudev.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libudev.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: libudev.h: in the future, the compiler will take precedence" >&2;} + { $as_echo "$as_me:$LINENO: result: $splsrcver" >&5 +$as_echo "$splsrcver" >&6; } - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for libudev.h" >&5 -$as_echo_n "checking for libudev.h... " >&6; } -if test "${ac_cv_header_libudev_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_libudev_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libudev_h" >&5 -$as_echo "$ac_cv_header_libudev_h" >&6; } + SPL=${splsrc} + SPL_OBJ=${splbuild} + SPL_VERSION=${splsrcver} -fi -if test "x$ac_cv_header_libudev_h" = x""yes; then - user_libudev=yes - LIBUDEV="-ludev" -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBUDEV 1 -_ACEOF + { $as_echo "$as_me:$LINENO: checking spl file name for module symbols" >&5 +$as_echo_n "checking spl file name for module symbols... " >&6; } + SPL_SYMBOLS=NONE -else + while true; do + if test -r $SPL_OBJ/Module.symvers; then - user_libudev=no + SPL_SYMBOLS=Module.symvers + +elif test -r $SPL_OBJ/Modules.symvers; then + + SPL_SYMBOLS=Modules.symvers + +elif test -r $SPL_OBJ/module/Module.symvers; then + + SPL_SYMBOLS=Module.symvers + +elif test -r $SPL_OBJ/module/Modules.symvers; then + + SPL_SYMBOLS=Modules.symvers fi + if test $SPL_SYMBOLS != NONE -o $timeout -le 0; then - { $as_echo "$as_me:$LINENO: checking for library containing udev_device_get_is_initialized" >&5 -$as_echo_n "checking for library containing udev_device_get_is_initialized... " >&6; } -if test "${ac_cv_search_udev_device_get_is_initialized+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + break; -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char udev_device_get_is_initialized (); -int -main () -{ -return udev_device_get_is_initialized (); - ; - return 0; -} -_ACEOF -for ac_lib in '' udev; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_search_udev_device_get_is_initialized=$ac_res else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + sleep 1 + timeout=$((timeout-1)) fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_udev_device_get_is_initialized+set}" = set; then - break + done + + if test "$SPL_SYMBOLS" = NONE; then + + SPL_SYMBOLS=$LINUX_SYMBOLS + fi -done -if test "${ac_cv_search_udev_device_get_is_initialized+set}" = set; then - : + + + { $as_echo "$as_me:$LINENO: result: $SPL_SYMBOLS" >&5 +$as_echo "$SPL_SYMBOLS" >&6; } + + + + +# Check whether --with-qat was given. +if test "${with_qat+set}" = set; then + withval=$with_qat; if test "$withval" = "yes"; then + { { $as_echo "$as_me:$LINENO: error: --with-qat=PATH requires a PATH" >&5 +$as_echo "$as_me: error: --with-qat=PATH requires a PATH" >&2;} + { (exit 1); exit 1; }; } else - ac_cv_search_udev_device_get_is_initialized=no + qatsrc="$withval" fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_udev_device_get_is_initialized" >&5 -$as_echo "$ac_cv_search_udev_device_get_is_initialized" >&6; } -ac_res=$ac_cv_search_udev_device_get_is_initialized -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBUDEV_UDEV_DEVICE_GET_IS_INITIALIZED 1 -_ACEOF +# Check whether --with-qat-obj was given. +if test "${with_qat_obj+set}" = set; then + withval=$with_qat_obj; qatbuild="$withval" fi + if test ! -z "${qatsrc}"; then + { $as_echo "$as_me:$LINENO: checking qat source directory" >&5 +$as_echo_n "checking qat source directory... " >&6; } + { $as_echo "$as_me:$LINENO: result: $qatsrc" >&5 +$as_echo "$qatsrc" >&6; } + QAT_SRC="${qatsrc}/quickassist" + if test ! -e "$QAT_SRC/include/cpa.h"; then - { $as_echo "$as_me:$LINENO: checking for -Wframe-larger-than= support" >&5 -$as_echo_n "checking for -Wframe-larger-than= support... " >&6; } - - saved_flags="$CFLAGS" - CFLAGS="$CFLAGS -Wframe-larger-than=1024" + { { $as_echo "$as_me:$LINENO: error: + *** Please make sure the qat driver package is installed + *** and specify the location of the qat source with the + *** '--with-qat=PATH' option then try again. Failed to + *** find cpa.h in: + ${QAT_SRC}/include" >&5 +$as_echo "$as_me: error: + *** Please make sure the qat driver package is installed + *** and specify the location of the qat source with the + *** '--with-qat=PATH' option then try again. Failed to + *** find cpa.h in: + ${QAT_SRC}/include" >&2;} + { (exit 1); exit 1; }; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +fi -int -main () -{ - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +fi - FRAME_LARGER_THAN=-Wframe-larger-than=1024 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if test ! -z "${qatsrc}"; then + { $as_echo "$as_me:$LINENO: checking qat build directory" >&5 +$as_echo_n "checking qat build directory... " >&6; } + if test -z "$qatbuild"; then - FRAME_LARGER_THAN= - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + qatbuild="${qatsrc}/build" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS="$saved_flags" + { $as_echo "$as_me:$LINENO: result: $qatbuild" >&5 +$as_echo "$qatbuild" >&6; } + QAT_OBJ=${qatbuild} + if ! test -e "$QAT_OBJ/icp_qa_al.ko" && ! test -e "$QAT_OBJ/qat_api.ko"; then + + { { $as_echo "$as_me:$LINENO: error: + *** Please make sure the qat driver is installed then try again. + *** Failed to find icp_qa_al.ko or qat_api.ko in: + $QAT_OBJ" >&5 +$as_echo "$as_me: error: + *** Please make sure the qat driver is installed then try again. + *** Failed to find icp_qa_al.ko or qat_api.ko in: + $QAT_OBJ" >&2;} + { (exit 1); exit 1; }; } +fi - if test "x$runstatedir" = x; then - runstatedir='${localstatedir}/run' - fi - { $as_echo "$as_me:$LINENO: checking makedev() is declared in sys/sysmacros.h" >&5 -$as_echo_n "checking makedev() is declared in sys/sysmacros.h... " >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + +cat >>confdefs.h <<\_ACEOF +#define HAVE_QAT 1 _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - #include -int -main () -{ +fi - int k; - k = makedev(0,0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if test ! -z "${qatsrc}"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:$LINENO: checking qat file for module symbols" >&5 +$as_echo_n "checking qat file for module symbols... " >&6; } + QAT_SYMBOLS=$QAT_SRC/lookaside/access_layer/src/Module.symvers -cat >>confdefs.h <<\_ACEOF -#define HAVE_MAKEDEV_IN_SYSMACROS 1 -_ACEOF + if test -r $QAT_SYMBOLS; then + + { $as_echo "$as_me:$LINENO: result: $QAT_SYMBOLS" >&5 +$as_echo "$QAT_SYMBOLS" >&6; } else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + { { $as_echo "$as_me:$LINENO: error: + *** Please make sure the qat driver is installed then try again. + *** Failed to find Module.symvers in: + $QAT_SYMBOLS" >&5 +$as_echo "$as_me: error: + *** Please make sure the qat driver is installed then try again. + *** Failed to find Module.symvers in: + $QAT_SYMBOLS" >&2;} + { (exit 1); exit 1; }; } + +fi - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: checking makedev() is declared in sys/mkdev.h" >&5 -$as_echo_n "checking makedev() is declared in sys/mkdev.h... " >&6; } - cat >conftest.$ac_ext <<_ACEOF + { $as_echo "$as_me:$LINENO: checking whether modules can be built" >&5 +$as_echo_n "checking whether modules can be built... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include int -main () +main (void) { - int k; - k = makedev(0,0); - ; return 0; } + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_MAKEDEV_IN_MKDEV 1 -_ACEOF - - else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } + if test "x$enable_linux_builtin" != xyes; then + { { $as_echo "$as_me:$LINENO: error: *** Unable to build an empty module." >&5 +$as_echo "$as_me: error: *** Unable to build an empty module." >&2;} + { (exit 1); exit 1; }; } + else + { { $as_echo "$as_me:$LINENO: error: + *** Unable to build an empty module. + *** Please run 'make scripts' inside the kernel source tree." >&5 +$as_echo "$as_me: error: + *** Unable to build an empty module. + *** Please run 'make scripts' inside the kernel source tree." >&2;} + { (exit 1); exit 1; }; } + fi + + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + rm -Rf build - { $as_echo "$as_me:$LINENO: checking for -Wno-format-truncation support" >&5 -$as_echo_n "checking for -Wno-format-truncation support... " >&6; } - saved_flags="$CFLAGS" - CFLAGS="$CFLAGS -Wno-format-truncation" - cat >conftest.$ac_ext <<_ACEOF + { $as_echo "$as_me:$LINENO: checking for compile-time stack validation (objtool)" >&5 +$as_echo_n "checking for compile-time stack validation (objtool)... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ + + #undef __ASSEMBLY__ + #include + int -main () +main (void) { + #if !defined(FRAME_BEGIN) + CTASSERT(1); + #endif + ; return 0; } + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then - NO_FORMAT_TRUNCATION=-Wno-format-truncation { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } +cat >>confdefs.h <<\_ACEOF +#define HAVE_KERNEL_OBJTOOL 1 +_ACEOF + + else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - NO_FORMAT_TRUNCATION= { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - CFLAGS="$saved_flags" - - - ZONENAME="echo global" +fi + rm -Rf build + if test "x$cross_compiling" != xyes; then -for ac_func in mlockall -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + if test "$cross_compiling" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } else cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + + /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif + #include "$LINUX/include/linux/license.h" int main () { -return $ac_func (); + + return !license_is_gpl_compatible("$ZFS_META_LICENSE"); + ; return 0; } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +rm -f conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -31604,675 +34030,699 @@ case "(($ac_try" in esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_link") 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then - eval "$as_ac_var=no" -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +cat >>confdefs.h <<\_ACEOF +#define ZFS_IS_GPL_COMPATIBLE 1 _ACEOF -fi -done - +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +( exit $ac_status ) -# Check whether --with-linux was given. -if test "${with_linux+set}" = set; then - withval=$with_linux; kernelsrc="$withval" +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -# Check whether --with-linux-obj was given. -if test "${with_linux_obj+set}" = set; then - withval=$with_linux_obj; kernelbuild="$withval" fi - { $as_echo "$as_me:$LINENO: checking kernel source directory" >&5 -$as_echo_n "checking kernel source directory... " >&6; } - if test -z "$kernelsrc"; then - - if test -e "/lib/modules/$(uname -r)/source"; then - headersdir="/lib/modules/$(uname -r)/source" - sourcelink=$(readlink -f "$headersdir") + { $as_echo "$as_me:$LINENO: checking whether kernel was built with 16K or larger stacks" >&5 +$as_echo_n "checking whether kernel was built with 16K or larger stacks... " >&6; } -elif test -e "/lib/modules/$(uname -r)/build"; then - headersdir="/lib/modules/$(uname -r)/build" - sourcelink=$(readlink -f "$headersdir") +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -else - sourcelink=$(ls -1d /usr/src/kernels/* \ - /usr/src/linux-* \ - 2>/dev/null | grep -v obj | tail -1) + #include -fi +int +main (void) +{ + #if (THREAD_SIZE < 16384) + #error "THREAD_SIZE is less than 16K" + #endif - if test -n "$sourcelink" && test -e ${sourcelink}; then + ; + return 0; +} - kernelsrc=`readlink -f ${sourcelink}` +_ACEOF -else - kernelsrc="Not found" -fi +cat - <<_ACEOF >conftest.h +_ACEOF -else - if test "$kernelsrc" = "NONE"; then + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then - kernsrcver=NONE + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_LARGE_STACKS 1 +_ACEOF - withlinux=yes -fi +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: result: $kernelsrc" >&5 -$as_echo "$kernelsrc" >&6; } - if test ! -d "$kernelsrc"; then - { { $as_echo "$as_me:$LINENO: error: - *** Please make sure the kernel devel package for your distribution - *** is installed and then try again. If that fails, you can specify the - *** location of the kernel source with the '--with-linux=PATH' option." >&5 -$as_echo "$as_me: error: - *** Please make sure the kernel devel package for your distribution - *** is installed and then try again. If that fails, you can specify the - *** location of the kernel source with the '--with-linux=PATH' option." >&2;} - { (exit 1); exit 1; }; } fi + rm -Rf build - { $as_echo "$as_me:$LINENO: checking kernel build directory" >&5 -$as_echo_n "checking kernel build directory... " >&6; } - if test -z "$kernelbuild"; then - - if test x$withlinux != xyes -a -e "/lib/modules/$(uname -r)/build"; then - - kernelbuild=`readlink -f /lib/modules/$(uname -r)/build` - -elif test -d ${kernelsrc}-obj/${target_cpu}/${target_cpu}; then - - kernelbuild=${kernelsrc}-obj/${target_cpu}/${target_cpu} - -elif test -d ${kernelsrc}-obj/${target_cpu}/default; then - kernelbuild=${kernelsrc}-obj/${target_cpu}/default -elif test -d `dirname ${kernelsrc}`/build-${target_cpu}; then - kernelbuild=`dirname ${kernelsrc}`/build-${target_cpu} -else + { $as_echo "$as_me:$LINENO: checking whether kernel was built with CONFIG_DEBUG_LOCK_ALLOC" >&5 +$as_echo_n "checking whether kernel was built with CONFIG_DEBUG_LOCK_ALLOC... " >&6; } - kernelbuild=${kernelsrc} -fi +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -fi + #include - { $as_echo "$as_me:$LINENO: result: $kernelbuild" >&5 -$as_echo "$kernelbuild" >&6; } +int +main (void) +{ - { $as_echo "$as_me:$LINENO: checking kernel source version" >&5 -$as_echo_n "checking kernel source version... " >&6; } - utsrelease1=$kernelbuild/include/linux/version.h - utsrelease2=$kernelbuild/include/linux/utsrelease.h - utsrelease3=$kernelbuild/include/generated/utsrelease.h - if test -r $utsrelease1 && fgrep -q UTS_RELEASE $utsrelease1; then + #ifndef CONFIG_DEBUG_LOCK_ALLOC + #error CONFIG_DEBUG_LOCK_ALLOC not #defined + #endif - utsrelease=linux/version.h + ; + return 0; +} -elif test -r $utsrelease2 && fgrep -q UTS_RELEASE $utsrelease2; then +_ACEOF - utsrelease=linux/utsrelease.h -elif test -r $utsrelease3 && fgrep -q UTS_RELEASE $utsrelease3; then - utsrelease=generated/utsrelease.h +cat - <<_ACEOF >conftest.h -fi +_ACEOF - if test "$utsrelease"; then + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then - kernsrcver=`(echo "#include <$utsrelease>"; - echo "kernsrcver=UTS_RELEASE") | - cpp -I $kernelbuild/include | - grep "^kernsrcver=" | cut -d \" -f 2` + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } - if test -z "$kernsrcver"; then + { $as_echo "$as_me:$LINENO: checking whether mutex_lock() is GPL-only" >&5 +$as_echo_n "checking whether mutex_lock() is GPL-only... " >&6; } + tmp_flags="$EXTRA_KCFLAGS" - { $as_echo "$as_me:$LINENO: result: Not found" >&5 -$as_echo "Not found" >&6; } - { { $as_echo "$as_me:$LINENO: error: *** Cannot determine kernel version." >&5 -$as_echo "$as_me: error: *** Cannot determine kernel version." >&2;} - { (exit 1); exit 1; }; } -fi +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -else + #include + #include - { $as_echo "$as_me:$LINENO: result: Not found" >&5 -$as_echo "Not found" >&6; } - if test "x$enable_linux_builtin" != xyes; then - { { $as_echo "$as_me:$LINENO: error: *** Cannot find UTS_RELEASE definition." >&5 -$as_echo "$as_me: error: *** Cannot find UTS_RELEASE definition." >&2;} - { (exit 1); exit 1; }; } - else - { { $as_echo "$as_me:$LINENO: error: - *** Cannot find UTS_RELEASE definition. - *** Please run 'make prepare' inside the kernel source tree." >&5 -$as_echo "$as_me: error: - *** Cannot find UTS_RELEASE definition. - *** Please run 'make prepare' inside the kernel source tree." >&2;} - { (exit 1); exit 1; }; } - fi + MODULE_LICENSE("$ZFS_META_LICENSE"); -fi +int +main (void) +{ + struct mutex lock; - { $as_echo "$as_me:$LINENO: result: $kernsrcver" >&5 -$as_echo "$kernsrcver" >&6; } + mutex_init(&lock); + mutex_lock(&lock); + mutex_unlock(&lock); - LINUX=${kernelsrc} - LINUX_OBJ=${kernelbuild} - LINUX_VERSION=${kernsrcver} + ; + return 0; +} +_ACEOF +cat - <<_ACEOF >conftest.h +_ACEOF - modpost=$LINUX/scripts/Makefile.modpost - { $as_echo "$as_me:$LINENO: checking kernel file name for module symbols" >&5 -$as_echo_n "checking kernel file name for module symbols... " >&6; } - if test "x$enable_linux_builtin" != xyes -a -f "$modpost"; then - if grep -q Modules.symvers $modpost; then + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then - LINUX_SYMBOLS=Modules.symvers + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - LINUX_SYMBOLS=Module.symvers - -fi - - - if test ! -f "$LINUX_OBJ/$LINUX_SYMBOLS"; then - + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } { { $as_echo "$as_me:$LINENO: error: - *** Please make sure the kernel devel package for your distribution - *** is installed. If you are building with a custom kernel, make sure the - *** kernel is configured, built, and the '--with-linux=PATH' configure - *** option refers to the location of the kernel source." >&5 + *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible + *** with the CDDL license and will prevent the module linking stage + *** from succeeding. You must rebuild your kernel without this + *** option enabled." >&5 $as_echo "$as_me: error: - *** Please make sure the kernel devel package for your distribution - *** is installed. If you are building with a custom kernel, make sure the - *** kernel is configured, built, and the '--with-linux=PATH' configure - *** option refers to the location of the kernel source." >&2;} + *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible + *** with the CDDL license and will prevent the module linking stage + *** from succeeding. You must rebuild your kernel without this + *** option enabled." >&2;} { (exit 1); exit 1; }; } -fi - - -else - LINUX_SYMBOLS=NONE fi - { $as_echo "$as_me:$LINENO: result: $LINUX_SYMBOLS" >&5 -$as_echo "$LINUX_SYMBOLS" >&6; } - - - + rm -Rf build -# Check whether --with-spl was given. -if test "${with_spl+set}" = set; then - withval=$with_spl; if test "$withval" = "yes"; then - { { $as_echo "$as_me:$LINENO: error: --with-spl=PATH requires a PATH" >&5 -$as_echo "$as_me: error: --with-spl=PATH requires a PATH" >&2;} - { (exit 1); exit 1; }; } -else - splsrc="$withval" -fi + EXTRA_KCFLAGS="$tmp_flags" -fi +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } -# Check whether --with-spl-obj was given. -if test "${with_spl_obj+set}" = set; then - withval=$with_spl_obj; splbuild="$withval" -fi -# Check whether --with-spl-timeout was given. -if test "${with_spl_timeout+set}" = set; then - withval=$with_spl_timeout; timeout="$withval" -else - timeout=0 fi + rm -Rf build - splsrc0="/var/lib/dkms/spl/${VERSION}/build" - splsrc1="/usr/local/src/spl-${VERSION}/${LINUX_VERSION}" - splsrc2="/usr/local/src/spl-${VERSION}" - splsrc3="/usr/src/spl-${VERSION}/${LINUX_VERSION}" - splsrc4="/usr/src/spl-${VERSION}" - splsrc5="../spl/" - splsrc6="$LINUX" - { $as_echo "$as_me:$LINENO: checking spl source directory" >&5 -$as_echo_n "checking spl source directory... " >&6; } - if test -z "${splsrc}"; then - all_spl_sources=" - ${splsrc0} - ${splsrc1} - ${splsrc2} - ${splsrc3} - ${splsrc4} - ${splsrc5} - ${splsrc6}", - if test -e "${splsrc0}/spl.release.in"; then - splsrc=${splsrc0} -elif test -e "${splsrc1}/spl.release.in"; then - splsrc=${splsrc1} + tmp_flags="$EXTRA_KCFLAGS" + EXTRA_KCFLAGS="-I\$(src)" -elif test -e "${splsrc2}/spl.release.in"; then + { $as_echo "$as_me:$LINENO: checking whether DECLARE_EVENT_CLASS() is available" >&5 +$as_echo_n "checking whether DECLARE_EVENT_CLASS() is available... " >&6; } - splsrc=${splsrc2} -elif test -e "${splsrc3}/spl.release.in"; then +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - splsrc=$(readlink -f "${splsrc3}") -elif test -e "${splsrc4}/spl.release.in" ; then + #include + MODULE_LICENSE(ZFS_META_LICENSE); - splsrc=${splsrc4} + #define CREATE_TRACE_POINTS + #include "conftest.h" -elif test -e "${splsrc5}/spl.release.in"; then +int +main (void) +{ - splsrc=$(readlink -f "${splsrc5}") + trace_zfs_autoconf_event_one(1UL); + trace_zfs_autoconf_event_two(2UL); -elif test -e "${splsrc6}/spl.release.in" ; then + ; + return 0; +} - splsrc=${splsrc6} +_ACEOF -else - splsrc="Not found" -fi +cat - <<_ACEOF >conftest.h + #if !defined(_CONFTEST_H) || defined(TRACE_HEADER_MULTI_READ) + #define _CONFTEST_H -else + #undef TRACE_SYSTEM + #define TRACE_SYSTEM zfs + #include - all_spl_sources="$withval", - if test "$splsrc" = "NONE"; then + DECLARE_EVENT_CLASS(zfs_autoconf_event_class, + TP_PROTO(unsigned long i), + TP_ARGS(i), + TP_STRUCT__entry( + __field(unsigned long, i) + ), + TP_fast_assign( + __entry->i = i; + ), + TP_printk("i = %lu", __entry->i) + ); - splbuild=NONE - splsrcver=NONE + #define DEFINE_AUTOCONF_EVENT(name) \ + DEFINE_EVENT(zfs_autoconf_event_class, name, \ + TP_PROTO(unsigned long i), \ + TP_ARGS(i)) + DEFINE_AUTOCONF_EVENT(zfs_autoconf_event_one); + DEFINE_AUTOCONF_EVENT(zfs_autoconf_event_two); -fi + #endif /* _CONFTEST_H */ + #undef TRACE_INCLUDE_PATH + #define TRACE_INCLUDE_PATH . + #define TRACE_INCLUDE_FILE conftest + #include -fi +_ACEOF - { $as_echo "$as_me:$LINENO: result: $splsrc" >&5 -$as_echo "$splsrc" >&6; } - if test ! -e "$splsrc/spl.release.in"; then + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then - { { $as_echo "$as_me:$LINENO: error: - *** Please make sure the kmod spl devel package for your distribution - *** is installed then try again. If that fails you can specify the - *** location of the spl source with the '--with-spl=PATH' option. - *** The spl version must match the version of ZFS you are building, - *** ${VERSION}. Failed to find spl.release.in in the following: - $all_spl_sources" >&5 -$as_echo "$as_me: error: - *** Please make sure the kmod spl devel package for your distribution - *** is installed then try again. If that fails you can specify the - *** location of the spl source with the '--with-spl=PATH' option. - *** The spl version must match the version of ZFS you are building, - *** ${VERSION}. Failed to find spl.release.in in the following: - $all_spl_sources" >&2;} - { (exit 1); exit 1; }; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_DECLARE_EVENT_CLASS 1 +_ACEOF - { $as_echo "$as_me:$LINENO: checking spl build directory" >&5 -$as_echo_n "checking spl build directory... " >&6; } +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - all_spl_config_locs="${splsrc}/${LINUX_VERSION} - ${splsrc}" + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - while true; do - if test -z "$splbuild"; then - if test -e "${splsrc}/${LINUX_VERSION}/spl_config.h" ; then - splbuild="${splsrc}/${LINUX_VERSION}" +fi -elif test -e "${splsrc}/spl_config.h" ; then + rm -Rf build - splbuild="${splsrc}" -elif find -L "${splsrc}" -name spl_config.h 2> /dev/null | grep -wq spl_config.h ; then + EXTRA_KCFLAGS="$tmp_flags" - splbuild=$(find -L "${splsrc}" -name spl_config.h | sed 's,/spl_config.h,,') -else + { $as_echo "$as_me:$LINENO: checking whether current->bio_tail exists" >&5 +$as_echo_n "checking whether current->bio_tail exists... " >&6; } - splbuild="Not found" -fi +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -fi + #include - if test -e "$splbuild/spl_config.h" -o $timeout -le 0; then +int +main (void) +{ - break; + current->bio_tail = (struct bio **) NULL; -else + ; + return 0; +} - sleep 1 - timeout=$((timeout-1)) +_ACEOF -fi - done - { $as_echo "$as_me:$LINENO: result: $splbuild" >&5 -$as_echo "$splbuild" >&6; } - if ! test -e "$splbuild/spl_config.h"; then +cat - <<_ACEOF >conftest.h - { { $as_echo "$as_me:$LINENO: error: - *** Please make sure the kmod spl devel package for your - *** distribution is installed then try again. If that fails you - *** can specify the location of the spl objects with the - *** '--with-spl-obj=PATH' option. Failed to find spl_config.h in - *** any of the following: - $all_spl_config_locs" >&5 -$as_echo "$as_me: error: - *** Please make sure the kmod spl devel package for your - *** distribution is installed then try again. If that fails you - *** can specify the location of the spl objects with the - *** '--with-spl-obj=PATH' option. Failed to find spl_config.h in - *** any of the following: - $all_spl_config_locs" >&2;} - { (exit 1); exit 1; }; } +_ACEOF -fi + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: checking spl source version" >&5 -$as_echo_n "checking spl source version... " >&6; } - if test -r $splbuild/spl_config.h && - fgrep -q SPL_META_VERSION $splbuild/spl_config.h; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +cat >>confdefs.h <<\_ACEOF +#define HAVE_CURRENT_BIO_TAIL 1 +_ACEOF - splsrcver=`(echo "#include "; - echo "splsrcver=SPL_META_VERSION-SPL_META_RELEASE") | - cpp -I $splbuild | - grep "^splsrcver=" | tr -d \" | cut -d= -f2` -fi +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: checking whether current->bio_list exists" >&5 +$as_echo_n "checking whether current->bio_list exists... " >&6; } - if test -z "$splsrcver"; then - { $as_echo "$as_me:$LINENO: result: Not found" >&5 -$as_echo "Not found" >&6; } - { { $as_echo "$as_me:$LINENO: error: - *** Cannot determine the version of the spl source. - *** Please prepare the spl source before running this script" >&5 -$as_echo "$as_me: error: - *** Cannot determine the version of the spl source. - *** Please prepare the spl source before running this script" >&2;} - { (exit 1); exit 1; }; } +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -fi + #include - { $as_echo "$as_me:$LINENO: result: $splsrcver" >&5 -$as_echo "$splsrcver" >&6; } +int +main (void) +{ - SPL=${splsrc} - SPL_OBJ=${splbuild} - SPL_VERSION=${splsrcver} + current->bio_list = (struct bio_list *) NULL; + ; + return 0; +} +_ACEOF - { $as_echo "$as_me:$LINENO: checking spl file name for module symbols" >&5 -$as_echo_n "checking spl file name for module symbols... " >&6; } - SPL_SYMBOLS=NONE +cat - <<_ACEOF >conftest.h - while true; do - if test -r $SPL_OBJ/Module.symvers; then +_ACEOF - SPL_SYMBOLS=Module.symvers -elif test -r $SPL_OBJ/Modules.symvers; then + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then - SPL_SYMBOLS=Modules.symvers + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -elif test -r $SPL_OBJ/module/Module.symvers; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_CURRENT_BIO_LIST 1 +_ACEOF - SPL_SYMBOLS=Module.symvers -elif test -r $SPL_OBJ/module/Modules.symvers; then +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { { $as_echo "$as_me:$LINENO: error: no - Please file a bug report at + https://github.com/zfsonlinux/zfs/issues/new" >&5 +$as_echo "$as_me: error: no - Please file a bug report at + https://github.com/zfsonlinux/zfs/issues/new" >&2;} + { (exit 1); exit 1; }; } + - SPL_SYMBOLS=Modules.symvers fi + rm -Rf build - if test $SPL_SYMBOLS != NONE -o $timeout -le 0; then - break; -else - sleep 1 - timeout=$((timeout-1)) fi - done + rm -Rf build - if test "$SPL_SYMBOLS" = NONE; then - SPL_SYMBOLS=$LINUX_SYMBOLS -fi + { $as_echo "$as_me:$LINENO: checking whether super_block->s_user_ns exists" >&5 +$as_echo_n "checking whether super_block->s_user_ns exists... " >&6; } - { $as_echo "$as_me:$LINENO: result: $SPL_SYMBOLS" >&5 -$as_echo "$SPL_SYMBOLS" >&6; } +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + #include + #include -# Check whether --with-qat was given. -if test "${with_qat+set}" = set; then - withval=$with_qat; if test "$withval" = "yes"; then - { { $as_echo "$as_me:$LINENO: error: --with-qat=PATH requires a PATH" >&5 -$as_echo "$as_me: error: --with-qat=PATH requires a PATH" >&2;} - { (exit 1); exit 1; }; } -else - qatsrc="$withval" -fi +int +main (void) +{ -fi + struct super_block super; + super.s_user_ns = (struct user_namespace *)NULL; + ; + return 0; +} +_ACEOF -# Check whether --with-qat-obj was given. -if test "${with_qat_obj+set}" = set; then - withval=$with_qat_obj; qatbuild="$withval" -fi - if test ! -z "${qatsrc}"; then +cat - <<_ACEOF >conftest.h - { $as_echo "$as_me:$LINENO: checking qat source directory" >&5 -$as_echo_n "checking qat source directory... " >&6; } - { $as_echo "$as_me:$LINENO: result: $qatsrc" >&5 -$as_echo "$qatsrc" >&6; } - QAT_SRC="${qatsrc}/quickassist" - if test ! -e "$QAT_SRC/include/cpa.h"; then +_ACEOF - { { $as_echo "$as_me:$LINENO: error: - *** Please make sure the qat driver package is installed - *** and specify the location of the qat source with the - *** '--with-qat=PATH' option then try again. Failed to - *** find cpa.h in: - ${QAT_SRC}/include" >&5 -$as_echo "$as_me: error: - *** Please make sure the qat driver package is installed - *** and specify the location of the qat source with the - *** '--with-qat=PATH' option then try again. Failed to - *** find cpa.h in: - ${QAT_SRC}/include" >&2;} - { (exit 1); exit 1; }; } -fi + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_SUPER_USER_NS 1 +_ACEOF - if test ! -z "${qatsrc}"; then +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking qat build directory" >&5 -$as_echo_n "checking qat build directory... " >&6; } - if test -z "$qatbuild"; then - qatbuild="${qatsrc}/build" fi + rm -Rf build - { $as_echo "$as_me:$LINENO: result: $qatbuild" >&5 -$as_echo "$qatbuild" >&6; } - QAT_OBJ=${qatbuild} - if ! test -e "$QAT_OBJ/icp_qa_al.ko" && ! test -e "$QAT_OBJ/qat_api.ko"; then - { { $as_echo "$as_me:$LINENO: error: - *** Please make sure the qat driver is installed then try again. - *** Failed to find icp_qa_al.ko or qat_api.ko in: - $QAT_OBJ" >&5 -$as_echo "$as_me: error: - *** Please make sure the qat driver is installed then try again. - *** Failed to find icp_qa_al.ko or qat_api.ko in: - $QAT_OBJ" >&2;} - { (exit 1); exit 1; }; } -fi + + { $as_echo "$as_me:$LINENO: checking whether submit_bio() wants 1 arg" >&5 +$as_echo_n "checking whether submit_bio() wants 1 arg... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + #include +int +main (void) +{ + blk_qc_t blk_qc; + struct bio *bio = NULL; + blk_qc = submit_bio(bio); + ; + return 0; +} -cat >>confdefs.h <<\_ACEOF -#define HAVE_QAT 1 _ACEOF -fi +cat - <<_ACEOF >conftest.h - if test ! -z "${qatsrc}"; then +_ACEOF - { $as_echo "$as_me:$LINENO: checking qat file for module symbols" >&5 -$as_echo_n "checking qat file for module symbols... " >&6; } - QAT_SYMBOLS=$QAT_SRC/lookaside/access_layer/src/Module.symvers - if test -r $QAT_SYMBOLS; then + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: $QAT_SYMBOLS" >&5 -$as_echo "$QAT_SYMBOLS" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_1ARG_SUBMIT_BIO 1 +_ACEOF else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - { { $as_echo "$as_me:$LINENO: error: - *** Please make sure the qat driver is installed then try again. - *** Failed to find Module.symvers in: - $QAT_SYMBOLS" >&5 -$as_echo "$as_me: error: - *** Please make sure the qat driver is installed then try again. - *** Failed to find Module.symvers in: - $QAT_SYMBOLS" >&2;} - { (exit 1); exit 1; }; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } -fi fi + rm -Rf build + - { $as_echo "$as_me:$LINENO: checking whether modules can be built" >&5 -$as_echo_n "checking whether modules can be built... " >&6; } + + { $as_echo "$as_me:$LINENO: checking block device operation prototypes" >&5 +$as_echo_n "checking block device operation prototypes... " >&6; } + tmp_flags="$EXTRA_KCFLAGS" + EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" cat confdefs.h - <<_ACEOF >conftest.c @@ -32283,10 +34733,28 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ + #include + + int blk_open(struct block_device *bdev, fmode_t mode) + { return 0; } + int blk_ioctl(struct block_device *bdev, fmode_t mode, + unsigned x, unsigned long y) { return 0; } + int blk_compat_ioctl(struct block_device * bdev, fmode_t mode, + unsigned x, unsigned long y) { return 0; } + + static const struct block_device_operations + bops __attribute__ ((unused)) = { + .open = blk_open, + .release = NULL, + .ioctl = blk_ioctl, + .compat_ioctl = blk_compat_ioctl, + }; + int main (void) { + ; return 0; } @@ -32304,7 +34772,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -32316,28 +34784,20 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:$LINENO: result: struct block_device" >&5 +$as_echo "struct block_device" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_BDEV_BLOCK_DEVICE_OPERATIONS 1 +_ACEOF + else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - if test "x$enable_linux_builtin" != xyes; then - { { $as_echo "$as_me:$LINENO: error: *** Unable to build an empty module." >&5 -$as_echo "$as_me: error: *** Unable to build an empty module." >&2;} - { (exit 1); exit 1; }; } - else - { { $as_echo "$as_me:$LINENO: error: - *** Unable to build an empty module. - *** Please run 'make scripts' inside the kernel source tree." >&5 -$as_echo "$as_me: error: - *** Unable to build an empty module. - *** Please run 'make scripts' inside the kernel source tree." >&2;} - { (exit 1); exit 1; }; } - fi + { $as_echo "$as_me:$LINENO: result: struct inode" >&5 +$as_echo "struct inode" >&6; } @@ -32346,10 +34806,13 @@ fi rm -Rf build + EXTRA_KCFLAGS="$tmp_flags" - { $as_echo "$as_me:$LINENO: checking for compile-time stack validation (objtool)" >&5 -$as_echo_n "checking for compile-time stack validation (objtool)... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether block_device_operations.release is void" >&5 +$as_echo_n "checking whether block_device_operations.release is void... " >&6; } + tmp_flags="$EXTRA_KCFLAGS" + EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" cat confdefs.h - <<_ACEOF >conftest.c @@ -32360,16 +34823,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #undef __ASSEMBLY__ - #include + #include + + void blk_release(struct gendisk *g, fmode_t mode) { return; } + + static const struct block_device_operations + bops __attribute__ ((unused)) = { + .open = NULL, + .release = blk_release, + .ioctl = NULL, + .compat_ioctl = NULL, + }; int main (void) { - #if !defined(FRAME_BEGIN) - CTASSERT(1); - #endif ; return 0; @@ -32388,7 +34857,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -32400,11 +34869,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:$LINENO: result: void" >&5 +$as_echo "void" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_KERNEL_OBJTOOL 1 +#define HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID 1 _ACEOF @@ -32412,8 +34881,8 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: int" >&5 +$as_echo "int" >&6; } @@ -32422,90 +34891,83 @@ fi rm -Rf build + EXTRA_KCFLAGS="$tmp_flags" + { $as_echo "$as_me:$LINENO: checking whether kernel defines fmode_t" >&5 +$as_echo_n "checking whether kernel defines fmode_t... " >&6; } - if test "x$cross_compiling" != xyes; then - - if test "$cross_compiling" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include "$LINUX/include/linux/license.h" + + #include int -main () +main (void) { - return !license_is_gpl_compatible("$ZFS_META_LICENSE"); + fmode_t *ptr __attribute__ ((unused)); ; return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define ZFS_IS_GPL_COMPATIBLE 1 +#define HAVE_FMODE_T 1 _ACEOF else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -( exit $ac_status ) + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi +fi + rm -Rf build -fi - { $as_echo "$as_me:$LINENO: checking whether kernel was built with 16K or larger stacks" >&5 -$as_echo_n "checking whether kernel was built with 16K or larger stacks... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether blkdev_get() wants 3 args" >&5 +$as_echo_n "checking whether blkdev_get() wants 3 args... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -32516,15 +34978,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - #if (THREAD_SIZE < 16384) - #error "THREAD_SIZE is less than 16K" - #endif + struct block_device *bdev = NULL; + (void) blkdev_get(bdev, 0, NULL); ; return 0; @@ -32543,7 +35004,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -32559,7 +35020,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_LARGE_STACKS 1 +#define HAVE_3ARG_BLKDEV_GET 1 _ACEOF @@ -32578,11 +35039,10 @@ fi + { $as_echo "$as_me:$LINENO: checking whether blkdev_get_by_path() is available" >&5 +$as_echo_n "checking whether blkdev_get_by_path() is available... " >&6; } - { $as_echo "$as_me:$LINENO: checking whether kernel was built with CONFIG_DEBUG_LOCK_ALLOC" >&5 -$as_echo_n "checking whether kernel was built with CONFIG_DEBUG_LOCK_ALLOC... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.c /* confdefs.h. */ @@ -32592,15 +35052,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - #ifndef CONFIG_DEBUG_LOCK_ALLOC - #error CONFIG_DEBUG_LOCK_ALLOC not #defined - #endif + blkdev_get_by_path(NULL, 0, NULL); ; return 0; @@ -32619,7 +35077,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -32630,13 +35088,72 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + rc=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + rc=1 + + +fi + + rm -Rf build + + + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + else + if test "x$enable_linux_builtin" != xyes; then + + grep -q -E '[[:space:]]blkdev_get_by_path[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in fs/block_dev.c; do + grep -q -E "EXPORT_SYMBOL.*(blkdev_get_by_path)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi + + fi + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + else : { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } - { $as_echo "$as_me:$LINENO: checking whether mutex_lock() is GPL-only" >&5 -$as_echo_n "checking whether mutex_lock() is GPL-only... " >&6; } - tmp_flags="$EXTRA_KCFLAGS" +cat >>confdefs.h <<\_ACEOF +#define HAVE_BLKDEV_GET_BY_PATH 1 +_ACEOF + + + fi + fi + + + { $as_echo "$as_me:$LINENO: checking whether open_bdev_exclusive() is available" >&5 +$as_echo_n "checking whether open_bdev_exclusive() is available... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.c @@ -32647,20 +35164,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include - - MODULE_LICENSE("$ZFS_META_LICENSE"); + #include int main (void) { - struct mutex lock; - - mutex_init(&lock); - mutex_lock(&lock); - mutex_unlock(&lock); + open_bdev_exclusive(NULL, 0, NULL); ; return 0; @@ -32679,7 +35189,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -32690,28 +35200,11 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - + rc=0 else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - { { $as_echo "$as_me:$LINENO: error: - *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible - *** with the CDDL license and will prevent the module linking stage - *** from succeeding. You must rebuild your kernel without this - *** option enabled." >&5 -$as_echo "$as_me: error: - *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible - *** with the CDDL license and will prevent the module linking stage - *** from succeeding. You must rebuild your kernel without this - *** option enabled." >&2;} - { (exit 1); exit 1; }; } - + rc=1 fi @@ -32719,33 +35212,60 @@ fi rm -Rf build - EXTRA_KCFLAGS="$tmp_flags" - - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if test $rc -ne 0; then : { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } + else + if test "x$enable_linux_builtin" != xyes; then + grep -q -E '[[:space:]]open_bdev_exclusive[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in fs/block_dev.c; do + grep -q -E "EXPORT_SYMBOL.*(open_bdev_exclusive)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi + fi + if test $rc -ne 0; then : -fi + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - rm -Rf build + else : + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +cat >>confdefs.h <<\_ACEOF +#define HAVE_OPEN_BDEV_EXCLUSIVE 1 +_ACEOF + fi + fi - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="-I\$(src)" + { $as_echo "$as_me:$LINENO: checking whether lookup_bdev() wants 1 arg" >&5 +$as_echo_n "checking whether lookup_bdev() wants 1 arg... " >&6; } - { $as_echo "$as_me:$LINENO: checking whether DECLARE_EVENT_CLASS() is available" >&5 -$as_echo_n "checking whether DECLARE_EVENT_CLASS() is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -32756,18 +35276,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - MODULE_LICENSE(ZFS_META_LICENSE); - - #define CREATE_TRACE_POINTS - #include "conftest.h" + #include int main (void) { - trace_zfs_autoconf_event_one(1UL); - trace_zfs_autoconf_event_two(2UL); + lookup_bdev(NULL); ; return 0; @@ -32779,38 +35294,70 @@ _ACEOF cat - <<_ACEOF >conftest.h - #if !defined(_CONFTEST_H) || defined(TRACE_HEADER_MULTI_READ) - #define _CONFTEST_H +_ACEOF - #undef TRACE_SYSTEM - #define TRACE_SYSTEM zfs - #include - DECLARE_EVENT_CLASS(zfs_autoconf_event_class, - TP_PROTO(unsigned long i), - TP_ARGS(i), - TP_STRUCT__entry( - __field(unsigned long, i) - ), - TP_fast_assign( - __entry->i = i; - ), - TP_printk("i = %lu", __entry->i) - ); + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + rc=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + rc=1 - #define DEFINE_AUTOCONF_EVENT(name) \ - DEFINE_EVENT(zfs_autoconf_event_class, name, \ - TP_PROTO(unsigned long i), \ - TP_ARGS(i)) - DEFINE_AUTOCONF_EVENT(zfs_autoconf_event_one); - DEFINE_AUTOCONF_EVENT(zfs_autoconf_event_two); - #endif /* _CONFTEST_H */ +fi - #undef TRACE_INCLUDE_PATH - #define TRACE_INCLUDE_PATH . - #define TRACE_INCLUDE_FILE conftest - #include + rm -Rf build + + + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: checking whether lookup_bdev() wants 2 args" >&5 +$as_echo_n "checking whether lookup_bdev() wants 2 args... " >&6; } + + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + +int +main (void) +{ + + lookup_bdev(NULL, FMODE_READ); + + ; + return 0; +} + +_ACEOF + + + +cat - <<_ACEOF >conftest.h _ACEOF @@ -32819,7 +35366,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -32830,34 +35377,103 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + rc=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + rc=1 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_DECLARE_EVENT_CLASS 1 -_ACEOF +fi + rm -Rf build -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + else + if test "x$enable_linux_builtin" != xyes; then + + grep -q -E '[[:space:]]lookup_bdev[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in fs/block_dev.c; do + grep -q -E "EXPORT_SYMBOL.*(lookup_bdev)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi + + fi + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } + else : + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_2ARGS_LOOKUP_BDEV 1 +_ACEOF - rm -Rf build + fi + fi + + + else + if test "x$enable_linux_builtin" != xyes; then + + grep -q -E '[[:space:]]lookup_bdev[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in fs/block_dev.c; do + grep -q -E "EXPORT_SYMBOL.*(lookup_bdev)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi - EXTRA_KCFLAGS="$tmp_flags" + fi + if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: checking whether lookup_bdev() wants 2 args" >&5 +$as_echo_n "checking whether lookup_bdev() wants 2 args... " >&6; } - { $as_echo "$as_me:$LINENO: checking whether current->bio_tail exists" >&5 -$as_echo_n "checking whether current->bio_tail exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -32868,13 +35484,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - current->bio_tail = (struct bio **) NULL; + lookup_bdev(NULL, FMODE_READ); ; return 0; @@ -32893,7 +35509,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -32904,107 +35520,86 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CURRENT_BIO_TAIL 1 -_ACEOF - - + rc=0 else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + rc=1 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether current->bio_list exists" >&5 -$as_echo_n "checking whether current->bio_list exists... " >&6; } - - -cat confdefs.h - <<_ACEOF >conftest.c -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - - #include -int -main (void) -{ +fi - current->bio_list = (struct bio_list *) NULL; + rm -Rf build - ; - return 0; -} -_ACEOF + if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + else + if test "x$enable_linux_builtin" != xyes; then -cat - <<_ACEOF >conftest.h + grep -q -E '[[:space:]]lookup_bdev[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in fs/block_dev.c; do + grep -q -E "EXPORT_SYMBOL.*(lookup_bdev)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi -_ACEOF + fi + if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - rm -Rf build && mkdir -p build && touch build/conftest.mod.c - echo "obj-m := conftest.o" >build/Makefile - modpost_flag='' - test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + else : { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_CURRENT_BIO_LIST 1 +#define HAVE_2ARGS_LOOKUP_BDEV 1 _ACEOF -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { { $as_echo "$as_me:$LINENO: error: no - Please file a bug report at - https://github.com/zfsonlinux/zfs/issues/new" >&5 -$as_echo "$as_me: error: no - Please file a bug report at - https://github.com/zfsonlinux/zfs/issues/new" >&2;} - { (exit 1); exit 1; }; } - - - -fi - - rm -Rf build - + fi + fi + else : + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_1ARG_LOOKUP_BDEV 1 +_ACEOF - rm -Rf build + fi + fi - { $as_echo "$as_me:$LINENO: checking whether super_block->s_user_ns exists" >&5 -$as_echo_n "checking whether super_block->s_user_ns exists... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether invalidate_bdev() wants 1 arg" >&5 +$as_echo_n "checking whether invalidate_bdev() wants 1 arg... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -33015,15 +35610,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include + #include int main (void) { - struct super_block super; - super.s_user_ns = (struct user_namespace *)NULL; + struct block_device *bdev = NULL; + invalidate_bdev(bdev); ; return 0; @@ -33042,7 +35636,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -33058,7 +35652,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_SUPER_USER_NS 1 +#define HAVE_1ARG_INVALIDATE_BDEV 1 _ACEOF @@ -33078,8 +35672,10 @@ fi - { $as_echo "$as_me:$LINENO: checking whether submit_bio() wants 1 arg" >&5 -$as_echo_n "checking whether submit_bio() wants 1 arg... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether bdev_logical_block_size() is available" >&5 +$as_echo_n "checking whether bdev_logical_block_size() is available... " >&6; } + tmp_flags="$EXTRA_KCFLAGS" + EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" cat confdefs.h - <<_ACEOF >conftest.c @@ -33090,15 +35686,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - blk_qc_t blk_qc; - struct bio *bio = NULL; - blk_qc = submit_bio(bio); + struct block_device *bdev = NULL; + bdev_logical_block_size(bdev); ; return 0; @@ -33117,7 +35712,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -33133,7 +35728,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_1ARG_SUBMIT_BIO 1 +#define HAVE_BDEV_LOGICAL_BLOCK_SIZE 1 _ACEOF @@ -33151,10 +35746,11 @@ fi rm -Rf build + EXTRA_KCFLAGS="$tmp_flags" - { $as_echo "$as_me:$LINENO: checking block device operation prototypes" >&5 -$as_echo_n "checking block device operation prototypes... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether bdev_physical_block_size() is available" >&5 +$as_echo_n "checking whether bdev_physical_block_size() is available... " >&6; } tmp_flags="$EXTRA_KCFLAGS" EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" @@ -33169,25 +35765,12 @@ cat >>conftest.$ac_ext <<_ACEOF #include - int blk_open(struct block_device *bdev, fmode_t mode) - { return 0; } - int blk_ioctl(struct block_device *bdev, fmode_t mode, - unsigned x, unsigned long y) { return 0; } - int blk_compat_ioctl(struct block_device * bdev, fmode_t mode, - unsigned x, unsigned long y) { return 0; } - - static const struct block_device_operations - bops __attribute__ ((unused)) = { - .open = blk_open, - .release = NULL, - .ioctl = blk_ioctl, - .compat_ioctl = blk_compat_ioctl, - }; - int main (void) { + struct block_device *bdev = NULL; + bdev_physical_block_size(bdev); ; return 0; @@ -33206,7 +35789,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -33218,11 +35801,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: struct block_device" >&5 -$as_echo "struct block_device" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BDEV_BLOCK_DEVICE_OPERATIONS 1 +#define HAVE_BDEV_PHYSICAL_BLOCK_SIZE 1 _ACEOF @@ -33230,8 +35813,8 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: struct inode" >&5 -$as_echo "struct inode" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } @@ -33243,10 +35826,8 @@ fi EXTRA_KCFLAGS="$tmp_flags" - { $as_echo "$as_me:$LINENO: checking whether block_device_operations.release is void" >&5 -$as_echo_n "checking whether block_device_operations.release is void... " >&6; } - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" + { $as_echo "$as_me:$LINENO: checking whether bio has bi_iter" >&5 +$as_echo_n "checking whether bio has bi_iter... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -33257,22 +35838,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - - void blk_release(struct gendisk *g, fmode_t mode) { return; } - - static const struct block_device_operations - bops __attribute__ ((unused)) = { - .open = NULL, - .release = blk_release, - .ioctl = NULL, - .compat_ioctl = NULL, - }; + #include int main (void) { + struct bio bio; + bio.bi_iter.bi_sector = 0; ; return 0; @@ -33291,7 +35864,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -33303,11 +35876,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: void" >&5 -$as_echo "void" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID 1 +#define HAVE_BIO_BVEC_ITER 1 _ACEOF @@ -33315,8 +35888,8 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: int" >&5 -$as_echo "int" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } @@ -33325,10 +35898,10 @@ fi rm -Rf build - EXTRA_KCFLAGS="$tmp_flags" - { $as_echo "$as_me:$LINENO: checking whether kernel defines fmode_t" >&5 -$as_echo_n "checking whether kernel defines fmode_t... " >&6; } + + { $as_echo "$as_me:$LINENO: checking whether BIO_RW_FAILFAST_* are defined" >&5 +$as_echo_n "checking whether BIO_RW_FAILFAST_* are defined... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -33339,13 +35912,16 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - fmode_t *ptr __attribute__ ((unused)); + int flags __attribute__ ((unused)); + flags = ((1 << BIO_RW_FAILFAST_DEV) | + (1 << BIO_RW_FAILFAST_TRANSPORT) | + (1 << BIO_RW_FAILFAST_DRIVER)); ; return 0; @@ -33364,7 +35940,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -33380,7 +35956,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_FMODE_T 1 +#define HAVE_BIO_RW_FAILFAST_DTD 1 _ACEOF @@ -33400,8 +35976,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether blkdev_get() wants 3 args" >&5 -$as_echo_n "checking whether blkdev_get() wants 3 args... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether bio_set_dev() exists" >&5 +$as_echo_n "checking whether bio_set_dev() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -33412,6 +35988,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ + #include #include int @@ -33419,7 +35996,8 @@ main (void) { struct block_device *bdev = NULL; - (void) blkdev_get(bdev, 0, NULL); + struct bio *bio = NULL; + bio_set_dev(bio, bdev); ; return 0; @@ -33438,7 +36016,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -33454,7 +36032,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_3ARG_BLKDEV_GET 1 +#define HAVE_BIO_SET_DEV 1 _ACEOF @@ -33473,9 +36051,9 @@ fi - { $as_echo "$as_me:$LINENO: checking whether blkdev_get_by_path() is available" >&5 -$as_echo_n "checking whether blkdev_get_by_path() is available... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether REQ_FAILFAST_MASK is defined" >&5 +$as_echo_n "checking whether REQ_FAILFAST_MASK is defined... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -33486,13 +36064,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - blkdev_get_by_path(NULL, 0, NULL); + int flags __attribute__ ((unused)); + flags = REQ_FAILFAST_MASK; ; return 0; @@ -33511,7 +36090,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -33522,72 +36101,33 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -fi - - rm -Rf build - - - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - else - if test "x$enable_linux_builtin" != xyes; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_REQ_FAILFAST_MASK 1 +_ACEOF - grep -q -E '[[:space:]]blkdev_get_by_path[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in fs/block_dev.c; do - grep -q -E "EXPORT_SYMBOL.*(blkdev_get_by_path)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - fi - if test $rc -ne 0; then : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - else : - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_BLKDEV_GET_BY_PATH 1 -_ACEOF +fi + rm -Rf build - fi - fi - { $as_echo "$as_me:$LINENO: checking whether open_bdev_exclusive() is available" >&5 -$as_echo_n "checking whether open_bdev_exclusive() is available... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether REQ_OP_DISCARD is defined" >&5 +$as_echo_n "checking whether REQ_OP_DISCARD is defined... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -33598,13 +36138,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - open_bdev_exclusive(NULL, 0, NULL); + int op __attribute__ ((unused)) = REQ_OP_DISCARD; ; return 0; @@ -33623,7 +36163,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -33634,72 +36174,33 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 - - -fi - - rm -Rf build + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - else - if test "x$enable_linux_builtin" != xyes; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_REQ_OP_DISCARD 1 +_ACEOF - grep -q -E '[[:space:]]open_bdev_exclusive[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in fs/block_dev.c; do - grep -q -E "EXPORT_SYMBOL.*(open_bdev_exclusive)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - fi - if test $rc -ne 0; then : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - else : - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_OPEN_BDEV_EXCLUSIVE 1 -_ACEOF +fi + rm -Rf build - fi - fi - { $as_echo "$as_me:$LINENO: checking whether lookup_bdev() wants 1 arg" >&5 -$as_echo_n "checking whether lookup_bdev() wants 1 arg... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether REQ_OP_SECURE_ERASE is defined" >&5 +$as_echo_n "checking whether REQ_OP_SECURE_ERASE is defined... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -33710,13 +36211,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - lookup_bdev(NULL); + int op __attribute__ ((unused)) = REQ_OP_SECURE_ERASE; ; return 0; @@ -33735,7 +36236,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -33746,11 +36247,22 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_REQ_OP_SECURE_ERASE 1 +_ACEOF + + else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + fi @@ -33758,13 +36270,10 @@ fi rm -Rf build - if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether lookup_bdev() wants 2 args" >&5 -$as_echo_n "checking whether lookup_bdev() wants 2 args... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether REQ_OP_FLUSH is defined" >&5 +$as_echo_n "checking whether REQ_OP_FLUSH is defined... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -33775,13 +36284,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - lookup_bdev(NULL, FMODE_READ); + int op __attribute__ ((unused)) = REQ_OP_FLUSH; ; return 0; @@ -33800,7 +36309,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -33811,103 +36320,33 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -fi - - rm -Rf build - - - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - else - if test "x$enable_linux_builtin" != xyes; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_REQ_OP_FLUSH 1 +_ACEOF - grep -q -E '[[:space:]]lookup_bdev[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in fs/block_dev.c; do - grep -q -E "EXPORT_SYMBOL.*(lookup_bdev)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - fi - if test $rc -ne 0; then : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - else : - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_2ARGS_LOOKUP_BDEV 1 -_ACEOF - fi - fi - +fi - else - if test "x$enable_linux_builtin" != xyes; then + rm -Rf build - grep -q -E '[[:space:]]lookup_bdev[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in fs/block_dev.c; do - grep -q -E "EXPORT_SYMBOL.*(lookup_bdev)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - fi - if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether lookup_bdev() wants 2 args" >&5 -$as_echo_n "checking whether lookup_bdev() wants 2 args... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether bio->bi_opf is defined" >&5 +$as_echo_n "checking whether bio->bi_opf is defined... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -33918,13 +36357,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - lookup_bdev(NULL, FMODE_READ); + struct bio bio __attribute__ ((unused)); + bio.bi_opf = 0; ; return 0; @@ -33943,7 +36383,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -33954,11 +36394,22 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_BIO_BI_OPF 1 +_ACEOF + + else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + fi @@ -33966,74 +36417,86 @@ fi rm -Rf build - if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - else - if test "x$enable_linux_builtin" != xyes; then + { $as_echo "$as_me:$LINENO: checking whether bio_end_io_t wants 1 arg" >&5 +$as_echo_n "checking whether bio_end_io_t wants 1 arg... " >&6; } - grep -q -E '[[:space:]]lookup_bdev[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in fs/block_dev.c; do - grep -q -E "EXPORT_SYMBOL.*(lookup_bdev)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - fi - if test $rc -ne 0; then : +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - else : + #include - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + void wanted_end_io(struct bio *bio) { return; } + + bio_end_io_t *end_io __attribute__ ((unused)) = wanted_end_io; + +int +main (void) +{ + + + ; + return 0; +} -cat >>confdefs.h <<\_ACEOF -#define HAVE_2ARGS_LOOKUP_BDEV 1 _ACEOF - fi - fi +cat - <<_ACEOF >conftest.h + +_ACEOF - else : + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_1ARG_LOOKUP_BDEV 1 +#define HAVE_1ARG_BIO_END_IO_T 1 _ACEOF - fi - fi +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether invalidate_bdev() wants 1 arg" >&5 -$as_echo_n "checking whether invalidate_bdev() wants 1 arg... " >&6; } +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether bio->bi_status exists" >&5 +$as_echo_n "checking whether bio->bi_status exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -34044,14 +36507,16 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - struct block_device *bdev = NULL; - invalidate_bdev(bdev); + struct bio bio __attribute__ ((unused)); + blk_status_t status __attribute__ ((unused)) = BLK_STS_OK; + + bio.bi_status = status; ; return 0; @@ -34070,7 +36535,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -34086,7 +36551,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_1ARG_INVALIDATE_BDEV 1 +#define HAVE_BIO_BI_STATUS 1 _ACEOF @@ -34106,10 +36571,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether bdev_logical_block_size() is available" >&5 -$as_echo_n "checking whether bdev_logical_block_size() is available... " >&6; } - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" + { $as_echo "$as_me:$LINENO: checking whether BIO_RW_BARRIER is defined" >&5 +$as_echo_n "checking whether BIO_RW_BARRIER is defined... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -34120,14 +36583,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - struct block_device *bdev = NULL; - bdev_logical_block_size(bdev); + int flags __attribute__ ((unused)); + flags = BIO_RW_BARRIER; ; return 0; @@ -34146,7 +36609,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -34162,7 +36625,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BDEV_LOGICAL_BLOCK_SIZE 1 +#define HAVE_BIO_RW_BARRIER 1 _ACEOF @@ -34180,13 +36643,10 @@ fi rm -Rf build - EXTRA_KCFLAGS="$tmp_flags" - { $as_echo "$as_me:$LINENO: checking whether bdev_physical_block_size() is available" >&5 -$as_echo_n "checking whether bdev_physical_block_size() is available... " >&6; } - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" + { $as_echo "$as_me:$LINENO: checking whether BIO_RW_DISCARD is defined" >&5 +$as_echo_n "checking whether BIO_RW_DISCARD is defined... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -34197,14 +36657,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - struct block_device *bdev = NULL; - bdev_physical_block_size(bdev); + int flags __attribute__ ((unused)); + flags = BIO_RW_DISCARD; ; return 0; @@ -34223,7 +36683,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -34239,7 +36699,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BDEV_PHYSICAL_BLOCK_SIZE 1 +#define HAVE_BIO_RW_DISCARD 1 _ACEOF @@ -34257,11 +36717,10 @@ fi rm -Rf build - EXTRA_KCFLAGS="$tmp_flags" - { $as_echo "$as_me:$LINENO: checking whether bio has bi_iter" >&5 -$as_echo_n "checking whether bio has bi_iter... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether blk_queue bdi is dynamic" >&5 +$as_echo_n "checking whether blk_queue bdi is dynamic... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -34272,14 +36731,15 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - struct bio bio; - bio.bi_iter.bi_sector = 0; + struct request_queue q; + struct backing_dev_info bdi; + q.backing_dev_info = &bdi; ; return 0; @@ -34298,7 +36758,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -34314,7 +36774,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BIO_BVEC_ITER 1 +#define HAVE_BLK_QUEUE_BDI_DYNAMIC 1 _ACEOF @@ -34334,8 +36794,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether BIO_RW_FAILFAST_* are defined" >&5 -$as_echo_n "checking whether BIO_RW_FAILFAST_* are defined... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether blk_queue_flag_clear() exists" >&5 +$as_echo_n "checking whether blk_queue_flag_clear() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -34346,16 +36806,15 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + #include int main (void) { - int flags __attribute__ ((unused)); - flags = ((1 << BIO_RW_FAILFAST_DEV) | - (1 << BIO_RW_FAILFAST_TRANSPORT) | - (1 << BIO_RW_FAILFAST_DRIVER)); + struct request_queue *q = NULL; + blk_queue_flag_clear(0, q); ; return 0; @@ -34374,7 +36833,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -34386,11 +36845,12 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BIO_RW_FAILFAST_DTD 1 +#define HAVE_BLK_QUEUE_FLAG_CLEAR 1 _ACEOF @@ -34410,8 +36870,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether bio_set_dev() exists" >&5 -$as_echo_n "checking whether bio_set_dev() exists... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether blk_queue_flag_set() exists" >&5 +$as_echo_n "checking whether blk_queue_flag_set() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -34422,16 +36882,15 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include + #include + #include int main (void) { - struct block_device *bdev = NULL; - struct bio *bio = NULL; - bio_set_dev(bio, bdev); + struct request_queue *q = NULL; + blk_queue_flag_set(0, q); ; return 0; @@ -34450,7 +36909,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -34466,7 +36925,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BIO_SET_DEV 1 +#define HAVE_BLK_QUEUE_FLAG_SET 1 _ACEOF @@ -34486,8 +36945,10 @@ fi - { $as_echo "$as_me:$LINENO: checking whether REQ_FAILFAST_MASK is defined" >&5 -$as_echo_n "checking whether REQ_FAILFAST_MASK is defined... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether blk_queue_flush() is available" >&5 +$as_echo_n "checking whether blk_queue_flush() is available... " >&6; } + tmp_flags="$EXTRA_KCFLAGS" + EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" cat confdefs.h - <<_ACEOF >conftest.c @@ -34498,14 +36959,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - int flags __attribute__ ((unused)); - flags = REQ_FAILFAST_MASK; + struct request_queue *q = NULL; + (void) blk_queue_flush(q, REQ_FLUSH); ; return 0; @@ -34524,7 +36985,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -34540,8 +37001,84 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_REQ_FAILFAST_MASK 1 +#define HAVE_BLK_QUEUE_FLUSH 1 +_ACEOF + + + { $as_echo "$as_me:$LINENO: checking whether blk_queue_flush() is GPL-only" >&5 +$as_echo_n "checking whether blk_queue_flush() is GPL-only... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + #include + + MODULE_LICENSE("$ZFS_META_LICENSE"); + +int +main (void) +{ + + struct request_queue *q = NULL; + (void) blk_queue_flush(q, REQ_FLUSH); + + ; + return 0; +} + +_ACEOF + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_BLK_QUEUE_FLUSH_GPL_ONLY 1 +_ACEOF + + + + +fi + + rm -Rf build + else @@ -34559,9 +37096,8 @@ fi - - { $as_echo "$as_me:$LINENO: checking whether REQ_OP_DISCARD is defined" >&5 -$as_echo_n "checking whether REQ_OP_DISCARD is defined... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether blk_queue_write_cache() exists" >&5 +$as_echo_n "checking whether blk_queue_write_cache() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -34572,13 +37108,16 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + #include + int main (void) { - int op __attribute__ ((unused)) = REQ_OP_DISCARD; + struct request_queue *q = NULL; + blk_queue_write_cache(q, true, true); ; return 0; @@ -34597,7 +37136,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -34613,28 +37152,12 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_REQ_OP_DISCARD 1 +#define HAVE_BLK_QUEUE_WRITE_CACHE 1 _ACEOF -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - - -fi - - rm -Rf build - - - - - { $as_echo "$as_me:$LINENO: checking whether REQ_OP_SECURE_ERASE is defined" >&5 -$as_echo_n "checking whether REQ_OP_SECURE_ERASE is defined... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether blk_queue_write_cache() is GPL-only" >&5 +$as_echo_n "checking whether blk_queue_write_cache() is GPL-only... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -34645,13 +37168,18 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + #include + #include + + MODULE_LICENSE("$ZFS_META_LICENSE"); int main (void) { - int op __attribute__ ((unused)) = REQ_OP_SECURE_ERASE; + struct request_queue *q = NULL; + blk_queue_write_cache(q, true, true); ; return 0; @@ -34670,7 +37198,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -34682,14 +37210,29 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_REQ_OP_SECURE_ERASE 1 +#define HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY 1 _ACEOF + + +fi + + rm -Rf build + + + else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -34705,9 +37248,13 @@ fi + EXTRA_KCFLAGS="$tmp_flags" - { $as_echo "$as_me:$LINENO: checking whether REQ_OP_FLUSH is defined" >&5 -$as_echo_n "checking whether REQ_OP_FLUSH is defined... " >&6; } + + { $as_echo "$as_me:$LINENO: checking whether blk_queue_max_hw_sectors() is available" >&5 +$as_echo_n "checking whether blk_queue_max_hw_sectors() is available... " >&6; } + tmp_flags="$EXTRA_KCFLAGS" + EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" cat confdefs.h - <<_ACEOF >conftest.c @@ -34718,13 +37265,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - int op __attribute__ ((unused)) = REQ_OP_FLUSH; + struct request_queue *q = NULL; + (void) blk_queue_max_hw_sectors(q, BLK_SAFE_MAX_SECTORS); ; return 0; @@ -34743,7 +37291,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -34759,7 +37307,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_REQ_OP_FLUSH 1 +#define HAVE_BLK_QUEUE_MAX_HW_SECTORS 1 _ACEOF @@ -34777,10 +37325,13 @@ fi rm -Rf build + EXTRA_KCFLAGS="$tmp_flags" - { $as_echo "$as_me:$LINENO: checking whether bio->bi_opf is defined" >&5 -$as_echo_n "checking whether bio->bi_opf is defined... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether blk_queue_max_segments() is available" >&5 +$as_echo_n "checking whether blk_queue_max_segments() is available... " >&6; } + tmp_flags="$EXTRA_KCFLAGS" + EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" cat confdefs.h - <<_ACEOF >conftest.c @@ -34791,14 +37342,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - struct bio bio __attribute__ ((unused)); - bio.bi_opf = 0; + struct request_queue *q = NULL; + (void) blk_queue_max_segments(q, BLK_MAX_SEGMENTS); ; return 0; @@ -34817,7 +37368,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -34833,7 +37384,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BIO_BI_OPF 1 +#define HAVE_BLK_QUEUE_MAX_SEGMENTS 1 _ACEOF @@ -34851,10 +37402,13 @@ fi rm -Rf build + EXTRA_KCFLAGS="$tmp_flags" - { $as_echo "$as_me:$LINENO: checking whether bio_end_io_t wants 1 arg" >&5 -$as_echo_n "checking whether bio_end_io_t wants 1 arg... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether the BIO_RW_UNPLUG enum is available" >&5 +$as_echo_n "checking whether the BIO_RW_UNPLUG enum is available... " >&6; } + tmp_flags="$EXTRA_KCFLAGS" + EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" cat confdefs.h - <<_ACEOF >conftest.c @@ -34865,16 +37419,15 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - - void wanted_end_io(struct bio *bio) { return; } - - bio_end_io_t *end_io __attribute__ ((unused)) = wanted_end_io; + #include int main (void) { + extern enum bio_rw_flags rw; + + rw = BIO_RW_UNPLUG; ; return 0; @@ -34893,7 +37446,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -34909,7 +37462,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_1ARG_BIO_END_IO_T 1 +#define HAVE_BLK_QUEUE_HAVE_BIO_RW_UNPLUG 1 _ACEOF @@ -34927,10 +37480,13 @@ fi rm -Rf build + EXTRA_KCFLAGS="$tmp_flags" - { $as_echo "$as_me:$LINENO: checking whether bio->bi_status exists" >&5 -$as_echo_n "checking whether bio->bi_status exists... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether struct blk_plug is available" >&5 +$as_echo_n "checking whether struct blk_plug is available... " >&6; } + tmp_flags="$EXTRA_KCFLAGS" + EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" cat confdefs.h - <<_ACEOF >conftest.c @@ -34941,16 +37497,16 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - struct bio bio __attribute__ ((unused)); - blk_status_t status __attribute__ ((unused)) = BLK_STS_OK; + struct blk_plug plug; - bio.bi_status = status; + blk_start_plug(&plug); + blk_finish_plug(&plug); ; return 0; @@ -34969,7 +37525,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -34985,7 +37541,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BIO_BI_STATUS 1 +#define HAVE_BLK_QUEUE_HAVE_BLK_PLUG 1 _ACEOF @@ -35003,10 +37559,11 @@ fi rm -Rf build + EXTRA_KCFLAGS="$tmp_flags" + { $as_echo "$as_me:$LINENO: checking whether get_disk_and_module() is available" >&5 +$as_echo_n "checking whether get_disk_and_module() is available... " >&6; } - { $as_echo "$as_me:$LINENO: checking whether BIO_RW_BARRIER is defined" >&5 -$as_echo_n "checking whether BIO_RW_BARRIER is defined... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -35017,14 +37574,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - int flags __attribute__ ((unused)); - flags = BIO_RW_BARRIER; + struct gendisk *disk = NULL; + (void) get_disk_and_module(disk); ; return 0; @@ -35043,7 +37600,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -35054,33 +37611,74 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + rc=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + rc=1 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_BIO_RW_BARRIER 1 -_ACEOF +fi + rm -Rf build -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + + if test $rc -ne 0; then : { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } + else + if test "x$enable_linux_builtin" != xyes; then + grep -q -E '[[:space:]]get_disk_and_module[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in block/genhd.c; do + grep -q -E "EXPORT_SYMBOL.*(get_disk_and_module)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi -fi + fi + if test $rc -ne 0; then : - rm -Rf build + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + else : + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_GET_DISK_AND_MODULE 1 +_ACEOF + fi + fi - { $as_echo "$as_me:$LINENO: checking whether BIO_RW_DISCARD is defined" >&5 -$as_echo_n "checking whether BIO_RW_DISCARD is defined... " >&6; } + + { $as_echo "$as_me:$LINENO: checking whether get_disk_ro() is available" >&5 +$as_echo_n "checking whether get_disk_ro() is available... " >&6; } + tmp_flags="$EXTRA_KCFLAGS" + EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" cat confdefs.h - <<_ACEOF >conftest.c @@ -35091,14 +37689,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - int flags __attribute__ ((unused)); - flags = BIO_RW_DISCARD; + struct gendisk *disk = NULL; + (void) get_disk_ro(disk); ; return 0; @@ -35117,7 +37715,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -35133,7 +37731,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BIO_RW_DISCARD 1 +#define HAVE_GET_DISK_RO 1 _ACEOF @@ -35151,10 +37749,11 @@ fi rm -Rf build + EXTRA_KCFLAGS="$tmp_flags" + { $as_echo "$as_me:$LINENO: checking whether get_gendisk() is available" >&5 +$as_echo_n "checking whether get_gendisk() is available... " >&6; } - { $as_echo "$as_me:$LINENO: checking whether blk_queue bdi is dynamic" >&5 -$as_echo_n "checking whether blk_queue bdi is dynamic... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -35165,15 +37764,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - struct request_queue q; - struct backing_dev_info bdi; - q.backing_dev_info = &bdi; + get_gendisk(0, NULL); ; return 0; @@ -35192,7 +37789,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -35203,35 +37800,72 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + rc=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + rc=1 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_BLK_QUEUE_BDI_DYNAMIC 1 -_ACEOF +fi + rm -Rf build -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + + if test $rc -ne 0; then : { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } + else + if test "x$enable_linux_builtin" != xyes; then + grep -q -E '[[:space:]]get_gendisk[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in block/genhd.c; do + grep -q -E "EXPORT_SYMBOL.*(get_gendisk)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi -fi + fi + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + else : + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_GET_GENDISK 1 +_ACEOF - rm -Rf build + fi + fi - { $as_echo "$as_me:$LINENO: checking whether blk_queue_flush() is available" >&5 -$as_echo_n "checking whether blk_queue_flush() is available... " >&6; } - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" + { $as_echo "$as_me:$LINENO: checking whether bio_set_op_attrs is available" >&5 +$as_echo_n "checking whether bio_set_op_attrs is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -35242,14 +37876,15 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - struct request_queue *q = NULL; - (void) blk_queue_flush(q, REQ_FLUSH); + struct bio *bio __attribute__ ((unused)) = NULL; + + bio_set_op_attrs(bio, 0, 0); ; return 0; @@ -35268,7 +37903,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -35284,12 +37919,28 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BLK_QUEUE_FLUSH 1 +#define HAVE_BIO_SET_OP_ATTRS 1 _ACEOF - { $as_echo "$as_me:$LINENO: checking whether blk_queue_flush() is GPL-only" >&5 -$as_echo_n "checking whether blk_queue_flush() is GPL-only... " >&6; } +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether generic_readlink is global" >&5 +$as_echo_n "checking whether generic_readlink is global... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -35300,17 +37951,15 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include - - MODULE_LICENSE("$ZFS_META_LICENSE"); + #include int main (void) { - struct request_queue *q = NULL; - (void) blk_queue_flush(q, REQ_FLUSH); + int i __attribute__ ((unused)); + + i = generic_readlink(NULL, NULL, 0); ; return 0; @@ -35329,7 +37978,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -35341,29 +37990,14 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BLK_QUEUE_FLUSH_GPL_ONLY 1 +#define HAVE_GENERIC_READLINK 1 _ACEOF - - -fi - - rm -Rf build - - - else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -35379,8 +38013,9 @@ fi - { $as_echo "$as_me:$LINENO: checking whether blk_queue_write_cache() exists" >&5 -$as_echo_n "checking whether blk_queue_write_cache() exists... " >&6; } + + { $as_echo "$as_me:$LINENO: checking whether ql->discard_granularity is available" >&5 +$as_echo_n "checking whether ql->discard_granularity is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -35391,16 +38026,15 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include #include - int main (void) { - struct request_queue *q = NULL; - blk_queue_write_cache(q, true, true); + struct queue_limits ql __attribute__ ((unused)); + + ql.discard_granularity = 0; ; return 0; @@ -35419,7 +38053,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -35435,12 +38069,28 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BLK_QUEUE_WRITE_CACHE 1 +#define HAVE_DISCARD_GRANULARITY 1 _ACEOF - { $as_echo "$as_me:$LINENO: checking whether blk_queue_write_cache() is GPL-only" >&5 -$as_echo_n "checking whether blk_queue_write_cache() is GPL-only... " >&6; } +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether super_block uses const struct xattr_handler" >&5 +$as_echo_n "checking whether super_block uses const struct xattr_handler... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -35451,18 +38101,27 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include - #include + #include + #include - MODULE_LICENSE("$ZFS_META_LICENSE"); + const struct xattr_handler xattr_test_handler = { + .prefix = "test", + .get = NULL, + .set = NULL, + }; + + const struct xattr_handler *xattr_handlers[] = { + &xattr_test_handler, + }; + + const struct super_block sb __attribute__ ((unused)) = { + .s_xattr = xattr_handlers, + }; int main (void) { - struct request_queue *q = NULL; - blk_queue_write_cache(q, true, true); ; return 0; @@ -35481,7 +38140,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -35493,29 +38152,14 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY 1 +#define HAVE_CONST_XATTR_HANDLER 1 _ACEOF - - -fi - - rm -Rf build - - - else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -35531,13 +38175,9 @@ fi - EXTRA_KCFLAGS="$tmp_flags" - - { $as_echo "$as_me:$LINENO: checking whether blk_queue_max_hw_sectors() is available" >&5 -$as_echo_n "checking whether blk_queue_max_hw_sectors() is available... " >&6; } - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" + { $as_echo "$as_me:$LINENO: checking whether xattr_handler has name" >&5 +$as_echo_n "checking whether xattr_handler has name... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -35548,14 +38188,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + + static const struct xattr_handler + xops __attribute__ ((unused)) = { + .name = XATTR_NAME_POSIX_ACL_ACCESS, + }; int main (void) { - struct request_queue *q = NULL; - (void) blk_queue_max_hw_sectors(q, BLK_SAFE_MAX_SECTORS); ; return 0; @@ -35574,7 +38217,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -35590,7 +38233,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BLK_QUEUE_MAX_HW_SECTORS 1 +#define HAVE_XATTR_HANDLER_NAME 1 _ACEOF @@ -35608,13 +38251,10 @@ fi rm -Rf build - EXTRA_KCFLAGS="$tmp_flags" - { $as_echo "$as_me:$LINENO: checking whether blk_queue_max_segments() is available" >&5 -$as_echo_n "checking whether blk_queue_max_segments() is available... " >&6; } - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" + { $as_echo "$as_me:$LINENO: checking whether xattr_handler->get() wants both dentry and inode" >&5 +$as_echo_n "checking whether xattr_handler->get() wants both dentry and inode... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -35625,14 +38265,20 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + + int get(const struct xattr_handler *handler, + struct dentry *dentry, struct inode *inode, + const char *name, void *buffer, size_t size) { return 0; } + static const struct xattr_handler + xops __attribute__ ((unused)) = { + .get = get, + }; int main (void) { - struct request_queue *q = NULL; - (void) blk_queue_max_segments(q, BLK_MAX_SEGMENTS); ; return 0; @@ -35651,7 +38297,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -35667,7 +38313,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BLK_QUEUE_MAX_SEGMENTS 1 +#define HAVE_XATTR_GET_DENTRY_INODE 1 _ACEOF @@ -35675,23 +38321,10 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - - - -fi - - rm -Rf build - - - EXTRA_KCFLAGS="$tmp_flags" - - - { $as_echo "$as_me:$LINENO: checking whether the BIO_RW_UNPLUG enum is available" >&5 -$as_echo_n "checking whether the BIO_RW_UNPLUG enum is available... " >&6; } - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" + { $as_echo "$as_me:$LINENO: checking whether xattr_handler->get() wants xattr_handler" >&5 +$as_echo_n "checking whether xattr_handler->get() wants xattr_handler... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -35702,15 +38335,20 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + + int get(const struct xattr_handler *handler, + struct dentry *dentry, const char *name, + void *buffer, size_t size) { return 0; } + static const struct xattr_handler + xops __attribute__ ((unused)) = { + .get = get, + }; int main (void) { - extern enum bio_rw_flags rw; - - rw = BIO_RW_UNPLUG; ; return 0; @@ -35729,7 +38367,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -35741,11 +38379,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BLK_QUEUE_HAVE_BIO_RW_UNPLUG 1 +#define HAVE_XATTR_GET_HANDLER 1 _ACEOF @@ -35753,23 +38391,10 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - - - -fi - - rm -Rf build - - - EXTRA_KCFLAGS="$tmp_flags" - - - { $as_echo "$as_me:$LINENO: checking whether struct blk_plug is available" >&5 -$as_echo_n "checking whether struct blk_plug is available... " >&6; } - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" + { $as_echo "$as_me:$LINENO: checking whether xattr_handler->get() wants dentry" >&5 +$as_echo_n "checking whether xattr_handler->get() wants dentry... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -35780,16 +38405,20 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + + int get(struct dentry *dentry, const char *name, + void *buffer, size_t size, int handler_flags) + { return 0; } + static const struct xattr_handler + xops __attribute__ ((unused)) = { + .get = get, + }; int main (void) { - struct blk_plug plug; - - blk_start_plug(&plug); - blk_finish_plug(&plug); ; return 0; @@ -35808,7 +38437,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -35820,11 +38449,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BLK_QUEUE_HAVE_BLK_PLUG 1 +#define HAVE_XATTR_GET_DENTRY 1 _ACEOF @@ -35832,23 +38461,10 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - - - -fi - - rm -Rf build - - - EXTRA_KCFLAGS="$tmp_flags" - - - { $as_echo "$as_me:$LINENO: checking whether get_disk_ro() is available" >&5 -$as_echo_n "checking whether get_disk_ro() is available... " >&6; } - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" + { $as_echo "$as_me:$LINENO: checking whether xattr_handler->get() wants inode" >&5 +$as_echo_n "checking whether xattr_handler->get() wants inode... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -35859,14 +38475,19 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + + int get(struct inode *ip, const char *name, + void *buffer, size_t size) { return 0; } + static const struct xattr_handler + xops __attribute__ ((unused)) = { + .get = get, + }; int main (void) { - struct gendisk *disk = NULL; - (void) get_disk_ro(disk); ; return 0; @@ -35885,7 +38506,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -35897,11 +38518,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_GET_DISK_RO 1 +#define HAVE_XATTR_GET_INODE 1 _ACEOF @@ -35909,8 +38530,9 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: no; please file a bug report" >&5 +$as_echo "$as_me: error: no; please file a bug report" >&2;} + { (exit 1); exit 1; }; } @@ -35919,12 +38541,35 @@ fi rm -Rf build - EXTRA_KCFLAGS="$tmp_flags" - { $as_echo "$as_me:$LINENO: checking whether get_gendisk() is available" >&5 -$as_echo_n "checking whether get_gendisk() is available... " >&6; } +fi + + rm -Rf build + + + + + +fi + + rm -Rf build + + + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether xattr_handler->set() wants both dentry and inode" >&5 +$as_echo_n "checking whether xattr_handler->set() wants both dentry and inode... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.c /* confdefs.h. */ @@ -35934,13 +38579,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + + int set(const struct xattr_handler *handler, + struct dentry *dentry, struct inode *inode, + const char *name, const void *buffer, + size_t size, int flags) + { return 0; } + static const struct xattr_handler + xops __attribute__ ((unused)) = { + .set = set, + }; int main (void) { - get_gendisk(0, NULL); ; return 0; @@ -35959,7 +38613,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -35970,72 +38624,23 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 - - -fi - - rm -Rf build - - - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - else - if test "x$enable_linux_builtin" != xyes; then - - grep -q -E '[[:space:]]get_gendisk[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in block/genhd.c; do - grep -q -E "EXPORT_SYMBOL.*(get_gendisk)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - - fi - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - else : { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_GET_GENDISK 1 +#define HAVE_XATTR_SET_DENTRY_INODE 1 _ACEOF - fi - fi - - +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: checking whether bio_set_op_attrs is available" >&5 -$as_echo_n "checking whether bio_set_op_attrs is available... " >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: checking whether xattr_handler->set() wants xattr_handler" >&5 +$as_echo_n "checking whether xattr_handler->set() wants xattr_handler... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -36046,15 +38651,21 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + + int set(const struct xattr_handler *handler, + struct dentry *dentry, const char *name, + const void *buffer, size_t size, int flags) + { return 0; } + static const struct xattr_handler + xops __attribute__ ((unused)) = { + .set = set, + }; int main (void) { - struct bio *bio __attribute__ ((unused)) = NULL; - - bio_set_op_attrs(bio, 0, 0); ; return 0; @@ -36073,7 +38684,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -36085,11 +38696,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_BIO_SET_OP_ATTRS 1 +#define HAVE_XATTR_SET_HANDLER 1 _ACEOF @@ -36097,20 +38708,10 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - - - -fi - - rm -Rf build - - - - - { $as_echo "$as_me:$LINENO: checking whether generic_readlink is global" >&5 -$as_echo_n "checking whether generic_readlink is global... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether xattr_handler->set() wants dentry" >&5 +$as_echo_n "checking whether xattr_handler->set() wants dentry... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -36121,15 +38722,20 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + + int set(struct dentry *dentry, const char *name, + const void *buffer, size_t size, int flags, + int handler_flags) { return 0; } + static const struct xattr_handler + xops __attribute__ ((unused)) = { + .set = set, + }; int main (void) { - int i __attribute__ ((unused)); - - i = generic_readlink(NULL, NULL, 0); ; return 0; @@ -36148,7 +38754,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -36160,11 +38766,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_GENERIC_READLINK 1 +#define HAVE_XATTR_SET_DENTRY 1 _ACEOF @@ -36172,20 +38778,10 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - - - -fi - - rm -Rf build - - - - - { $as_echo "$as_me:$LINENO: checking whether ql->discard_granularity is available" >&5 -$as_echo_n "checking whether ql->discard_granularity is available... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether xattr_handler->set() wants inode" >&5 +$as_echo_n "checking whether xattr_handler->set() wants inode... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -36196,15 +38792,20 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + + int set(struct inode *ip, const char *name, + const void *buffer, size_t size, int flags) + { return 0; } + static const struct xattr_handler + xops __attribute__ ((unused)) = { + .set = set, + }; int main (void) { - struct queue_limits ql __attribute__ ((unused)); - - ql.discard_granularity = 0; ; return 0; @@ -36223,7 +38824,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -36235,11 +38836,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_DISCARD_GRANULARITY 1 +#define HAVE_XATTR_SET_INODE 1 _ACEOF @@ -36247,8 +38848,33 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: no; please file a bug report" >&5 +$as_echo "$as_me: error: no; please file a bug report" >&2;} + { (exit 1); exit 1; }; } + + + +fi + + rm -Rf build + + + + + +fi + + rm -Rf build + + + + + +fi + + rm -Rf build + + @@ -36259,8 +38885,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether super_block uses const struct xattr_handler" >&5 -$as_echo_n "checking whether super_block uses const struct xattr_handler... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether xattr_handler->list() wants simple" >&5 +$as_echo_n "checking whether xattr_handler->list() wants simple... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -36271,21 +38897,12 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include #include - const struct xattr_handler xattr_test_handler = { - .prefix = "test", - .get = NULL, - .set = NULL, - }; - - const struct xattr_handler *xattr_handlers[] = { - &xattr_test_handler, - }; - - const struct super_block sb __attribute__ ((unused)) = { - .s_xattr = xattr_handlers, + bool list(struct dentry *dentry) { return 0; } + static const struct xattr_handler + xops __attribute__ ((unused)) = { + .list = list, }; int @@ -36310,7 +38927,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -36326,7 +38943,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_CONST_XATTR_HANDLER 1 +#define HAVE_XATTR_LIST_SIMPLE 1 _ACEOF @@ -36334,20 +38951,10 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - - - -fi - - rm -Rf build - - - - - { $as_echo "$as_me:$LINENO: checking whether xattr_handler has name" >&5 -$as_echo_n "checking whether xattr_handler has name... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether xattr_handler->list() wants xattr_handler" >&5 +$as_echo_n "checking whether xattr_handler->list() wants xattr_handler... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -36358,12 +38965,15 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include - static const struct xattr_handler - xops __attribute__ ((unused)) = { - .name = XATTR_NAME_POSIX_ACL_ACCESS, - }; + size_t list(const struct xattr_handler *handler, + struct dentry *dentry, char *list, size_t list_size, + const char *name, size_t name_len) { return 0; } + static const struct xattr_handler + xops __attribute__ ((unused)) = { + .list = list, + }; int main (void) @@ -36387,7 +38997,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -36399,11 +39009,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_XATTR_HANDLER_NAME 1 +#define HAVE_XATTR_LIST_HANDLER 1 _ACEOF @@ -36411,20 +39021,10 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - - - -fi - - rm -Rf build - - - - - { $as_echo "$as_me:$LINENO: checking whether xattr_handler->get() wants both dentry and inode" >&5 -$as_echo_n "checking whether xattr_handler->get() wants both dentry and inode... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether xattr_handler->list() wants dentry" >&5 +$as_echo_n "checking whether xattr_handler->list() wants dentry... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -36435,15 +39035,16 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include - int get(const struct xattr_handler *handler, - struct dentry *dentry, struct inode *inode, - const char *name, void *buffer, size_t size) { return 0; } - static const struct xattr_handler - xops __attribute__ ((unused)) = { - .get = get, - }; + size_t list(struct dentry *dentry, + char *list, size_t list_size, + const char *name, size_t name_len, + int handler_flags) { return 0; } + static const struct xattr_handler + xops __attribute__ ((unused)) = { + .list = list, + }; int main (void) @@ -36467,7 +39068,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -36479,11 +39080,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_XATTR_GET_DENTRY_INODE 1 +#define HAVE_XATTR_LIST_DENTRY 1 _ACEOF @@ -36491,10 +39092,10 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether xattr_handler->get() wants xattr_handler" >&5 -$as_echo_n "checking whether xattr_handler->get() wants xattr_handler... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether xattr_handler->list() wants inode" >&5 +$as_echo_n "checking whether xattr_handler->list() wants inode... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -36505,15 +39106,15 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include - int get(const struct xattr_handler *handler, - struct dentry *dentry, const char *name, - void *buffer, size_t size) { return 0; } - static const struct xattr_handler - xops __attribute__ ((unused)) = { - .get = get, - }; + size_t list(struct inode *ip, char *lst, + size_t list_size, const char *name, + size_t name_len) { return 0; } + static const struct xattr_handler + xops __attribute__ ((unused)) = { + .list = list, + }; int main (void) @@ -36537,7 +39138,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -36549,11 +39150,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_XATTR_GET_HANDLER 1 +#define HAVE_XATTR_LIST_INODE 1 _ACEOF @@ -36561,10 +39162,45 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether xattr_handler->get() wants dentry" >&5 -$as_echo_n "checking whether xattr_handler->get() wants dentry... " >&6; } + { { $as_echo "$as_me:$LINENO: error: no; please file a bug report" >&5 +$as_echo "$as_me: error: no; please file a bug report" >&2;} + { (exit 1); exit 1; }; } + + + +fi + + rm -Rf build + + + + + +fi + + rm -Rf build + + + + + +fi + + rm -Rf build + + + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether inode_owner_or_capable() exists" >&5 +$as_echo_n "checking whether inode_owner_or_capable() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -36575,20 +39211,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - - int get(struct dentry *dentry, const char *name, - void *buffer, size_t size, int handler_flags) - { return 0; } - static const struct xattr_handler - xops __attribute__ ((unused)) = { - .get = get, - }; + #include int main (void) { + struct inode *ip = NULL; + (void) inode_owner_or_capable(ip); ; return 0; @@ -36607,7 +39237,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -36619,11 +39249,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_XATTR_GET_DENTRY 1 +#define HAVE_INODE_OWNER_OR_CAPABLE 1 _ACEOF @@ -36631,10 +39261,10 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether xattr_handler->get() wants inode" >&5 -$as_echo_n "checking whether xattr_handler->get() wants inode... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether is_owner_or_cap() exists" >&5 +$as_echo_n "checking whether is_owner_or_cap() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -36645,19 +39275,15 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - - int get(struct inode *ip, const char *name, - void *buffer, size_t size) { return 0; } - static const struct xattr_handler - xops __attribute__ ((unused)) = { - .get = get, - }; + #include + #include int main (void) { + struct inode *ip = NULL; + (void) is_owner_or_cap(ip); ; return 0; @@ -36676,7 +39302,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -36688,11 +39314,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_XATTR_GET_INODE 1 +#define HAVE_IS_OWNER_OR_CAP 1 _ACEOF @@ -36700,8 +39326,10 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { { $as_echo "$as_me:$LINENO: error: no; please file a bug report" >&5 -$as_echo "$as_me: error: no; please file a bug report" >&2;} + { { $as_echo "$as_me:$LINENO: error: no - Please file a bug report at + https://github.com/zfsonlinux/zfs/issues/new" >&5 +$as_echo "$as_me: error: no - Please file a bug report at + https://github.com/zfsonlinux/zfs/issues/new" >&2;} { (exit 1); exit 1; }; } @@ -36721,12 +39349,71 @@ fi + { $as_echo "$as_me:$LINENO: checking whether posix_acl_from_xattr() needs user_ns" >&5 +$as_echo_n "checking whether posix_acl_from_xattr() needs user_ns... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + -fi + #include + #include + #include - rm -Rf build +int +main (void) +{ + + posix_acl_from_xattr(&init_user_ns, NULL, 0); + + ; + return 0; +} + +_ACEOF + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_POSIX_ACL_FROM_XATTR_USERNS 1 +_ACEOF +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } @@ -36737,8 +39424,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether xattr_handler->set() wants both dentry and inode" >&5 -$as_echo_n "checking whether xattr_handler->set() wants both dentry and inode... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether posix_acl_release() is available" >&5 +$as_echo_n "checking whether posix_acl_release() is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -36749,22 +39436,16 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - - int set(const struct xattr_handler *handler, - struct dentry *dentry, struct inode *inode, - const char *name, const void *buffer, - size_t size, int flags) - { return 0; } - static const struct xattr_handler - xops __attribute__ ((unused)) = { - .set = set, - }; + #include + #include + #include int main (void) { + struct posix_acl* tmp = posix_acl_alloc(1, 0); + posix_acl_release(tmp); ; return 0; @@ -36783,7 +39464,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -36799,18 +39480,12 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_XATTR_SET_DENTRY_INODE 1 +#define HAVE_POSIX_ACL_RELEASE 1 _ACEOF -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether xattr_handler->set() wants xattr_handler" >&5 -$as_echo_n "checking whether xattr_handler->set() wants xattr_handler... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether posix_acl_release() is GPL-only" >&5 +$as_echo_n "checking whether posix_acl_release() is GPL-only... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -36821,21 +39496,19 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + #include + #include + #include - int set(const struct xattr_handler *handler, - struct dentry *dentry, const char *name, - const void *buffer, size_t size, int flags) - { return 0; } - static const struct xattr_handler - xops __attribute__ ((unused)) = { - .set = set, - }; + MODULE_LICENSE("$ZFS_META_LICENSE"); int main (void) { + struct posix_acl* tmp = posix_acl_alloc(1, 0); + posix_acl_release(tmp); ; return 0; @@ -36854,7 +39527,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -36866,22 +39539,47 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_XATTR_SET_HANDLER 1 +#define HAVE_POSIX_ACL_RELEASE_GPL_ONLY 1 _ACEOF + + +fi + + rm -Rf build + + + else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether xattr_handler->set() wants dentry" >&5 -$as_echo_n "checking whether xattr_handler->set() wants dentry... " >&6; } + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether set_cached_acl() is usable" >&5 +$as_echo_n "checking whether set_cached_acl() is usable... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -36892,20 +39590,21 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + #include + #include + #include - int set(struct dentry *dentry, const char *name, - const void *buffer, size_t size, int flags, - int handler_flags) { return 0; } - static const struct xattr_handler - xops __attribute__ ((unused)) = { - .set = set, - }; + MODULE_LICENSE("$ZFS_META_LICENSE"); int main (void) { + struct inode *ip = NULL; + struct posix_acl *acl = posix_acl_alloc(1, 0); + set_cached_acl(ip, ACL_TYPE_ACCESS, acl); + forget_cached_acl(ip, ACL_TYPE_ACCESS); ; return 0; @@ -36924,7 +39623,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -36936,11 +39635,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_XATTR_SET_DENTRY 1 +#define HAVE_SET_CACHED_ACL_USABLE 1 _ACEOF @@ -36948,10 +39647,20 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether xattr_handler->set() wants inode" >&5 -$as_echo_n "checking whether xattr_handler->set() wants inode... " >&6; } + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether posix_acl_chmod exists" >&5 +$as_echo_n "checking whether posix_acl_chmod exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -36962,20 +39671,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - - int set(struct inode *ip, const char *name, - const void *buffer, size_t size, int flags) - { return 0; } - static const struct xattr_handler - xops __attribute__ ((unused)) = { - .set = set, - }; + #include + #include int main (void) { + posix_acl_chmod(NULL, 0, 0) ; return 0; @@ -36994,7 +39697,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -37006,11 +39709,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_XATTR_SET_INODE 1 +#define HAVE_POSIX_ACL_CHMOD 1 _ACEOF @@ -37018,9 +39721,8 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { { $as_echo "$as_me:$LINENO: error: no; please file a bug report" >&5 -$as_echo "$as_me: error: no; please file a bug report" >&2;} - { (exit 1); exit 1; }; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } @@ -37030,21 +39732,70 @@ fi + { $as_echo "$as_me:$LINENO: checking whether __posix_acl_chmod exists" >&5 +$as_echo_n "checking whether __posix_acl_chmod exists... " >&6; } -fi +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - rm -Rf build + #include + #include + +int +main (void) +{ + + __posix_acl_chmod(NULL, 0, 0) + ; + return 0; +} +_ACEOF -fi - rm -Rf build +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE___POSIX_ACL_CHMOD 1 +_ACEOF + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } @@ -37055,8 +39806,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether xattr_handler->list() wants simple" >&5 -$as_echo_n "checking whether xattr_handler->list() wants simple... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether posix_acl_equiv_mode() wants umode_t" >&5 +$as_echo_n "checking whether posix_acl_equiv_mode() wants umode_t... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -37067,18 +39818,15 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - - bool list(struct dentry *dentry) { return 0; } - static const struct xattr_handler - xops __attribute__ ((unused)) = { - .list = list, - }; + #include + #include int main (void) { + umode_t tmp; + posix_acl_equiv_mode(NULL,&tmp); ; return 0; @@ -37097,7 +39845,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -37113,7 +39861,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_XATTR_LIST_SIMPLE 1 +#define HAVE_POSIX_ACL_EQUIV_MODE_UMODE_T 1 _ACEOF @@ -37121,10 +39869,20 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether xattr_handler->list() wants xattr_handler" >&5 -$as_echo_n "checking whether xattr_handler->list() wants xattr_handler... " >&6; } + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether posix_acl_valid() wants user namespace" >&5 +$as_echo_n "checking whether posix_acl_valid() wants user namespace... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -37135,20 +39893,18 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - - size_t list(const struct xattr_handler *handler, - struct dentry *dentry, char *list, size_t list_size, - const char *name, size_t name_len) { return 0; } - static const struct xattr_handler - xops __attribute__ ((unused)) = { - .list = list, - }; + #include + #include int main (void) { + struct user_namespace *user_ns = NULL; + const struct posix_acl *acl = NULL; + int error; + + error = posix_acl_valid(user_ns, acl); ; return 0; @@ -37167,7 +39923,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -37179,11 +39935,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_XATTR_LIST_HANDLER 1 +#define HAVE_POSIX_ACL_VALID_WITH_NS 1 _ACEOF @@ -37191,10 +39947,20 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether xattr_handler->list() wants dentry" >&5 -$as_echo_n "checking whether xattr_handler->list() wants dentry... " >&6; } + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether iops->permission() exists" >&5 +$as_echo_n "checking whether iops->permission() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -37205,16 +39971,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include - size_t list(struct dentry *dentry, - char *list, size_t list_size, - const char *name, size_t name_len, - int handler_flags) { return 0; } - static const struct xattr_handler - xops __attribute__ ((unused)) = { - .list = list, - }; + int permission_fn(struct inode *inode, int mask) { return 0; } + + static const struct inode_operations + iops __attribute__ ((unused)) = { + .permission = permission_fn, + }; int main (void) @@ -37238,7 +40002,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -37250,11 +40014,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_XATTR_LIST_DENTRY 1 +#define HAVE_PERMISSION 1 _ACEOF @@ -37262,10 +40026,20 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether xattr_handler->list() wants inode" >&5 -$as_echo_n "checking whether xattr_handler->list() wants inode... " >&6; } + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether iops->permission() wants nameidata" >&5 +$as_echo_n "checking whether iops->permission() wants nameidata... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -37276,15 +40050,16 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + #include - size_t list(struct inode *ip, char *lst, - size_t list_size, const char *name, - size_t name_len) { return 0; } - static const struct xattr_handler - xops __attribute__ ((unused)) = { - .list = list, - }; + int permission_fn(struct inode *inode, int mask, + struct nameidata *nd) { return 0; } + + static const struct inode_operations + iops __attribute__ ((unused)) = { + .permission = permission_fn, + }; int main (void) @@ -37308,7 +40083,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -37320,11 +40095,16 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_XATTR_LIST_INODE 1 +#define HAVE_PERMISSION 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_PERMISSION_WITH_NAMEIDATA 1 _ACEOF @@ -37332,33 +40112,8 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { { $as_echo "$as_me:$LINENO: error: no; please file a bug report" >&5 -$as_echo "$as_me: error: no; please file a bug report" >&2;} - { (exit 1); exit 1; }; } - - - -fi - - rm -Rf build - - - - - -fi - - rm -Rf build - - - - - -fi - - rm -Rf build - - + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } @@ -37369,8 +40124,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether inode_owner_or_capable() exists" >&5 -$as_echo_n "checking whether inode_owner_or_capable() exists... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether iops->check_acl() exists" >&5 +$as_echo_n "checking whether iops->check_acl() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -37383,12 +40138,17 @@ cat >>conftest.$ac_ext <<_ACEOF #include + int check_acl_fn(struct inode *inode, int mask) { return 0; } + + static const struct inode_operations + iops __attribute__ ((unused)) = { + .check_acl = check_acl_fn, + }; + int main (void) { - struct inode *ip = NULL; - (void) inode_owner_or_capable(ip); ; return 0; @@ -37407,7 +40167,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -37423,7 +40183,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_INODE_OWNER_OR_CAPABLE 1 +#define HAVE_CHECK_ACL 1 _ACEOF @@ -37433,8 +40193,18 @@ sed 's/^/| /' conftest.$ac_ext >&5 { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether is_owner_or_cap() exists" >&5 -$as_echo_n "checking whether is_owner_or_cap() exists... " >&6; } + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether iops->check_acl() wants flags" >&5 +$as_echo_n "checking whether iops->check_acl() wants flags... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -37445,15 +40215,20 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include + #include + + int check_acl_fn(struct inode *inode, int mask, + unsigned int flags) { return 0; } + + static const struct inode_operations + iops __attribute__ ((unused)) = { + .check_acl = check_acl_fn, + }; int main (void) { - struct inode *ip = NULL; - (void) is_owner_or_cap(ip); ; return 0; @@ -37472,7 +40247,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -37484,11 +40259,16 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_IS_OWNER_OR_CAP 1 +#define HAVE_CHECK_ACL 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_CHECK_ACL_WITH_FLAGS 1 _ACEOF @@ -37496,19 +40276,8 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { { $as_echo "$as_me:$LINENO: error: no - Please file a bug report at - https://github.com/zfsonlinux/zfs/issues/new" >&5 -$as_echo "$as_me: error: no - Please file a bug report at - https://github.com/zfsonlinux/zfs/issues/new" >&2;} - { (exit 1); exit 1; }; } - - - -fi - - rm -Rf build - - + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } @@ -37519,8 +40288,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether posix_acl_from_xattr() needs user_ns" >&5 -$as_echo_n "checking whether posix_acl_from_xattr() needs user_ns... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether iops->get_acl() exists" >&5 +$as_echo_n "checking whether iops->get_acl() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -37531,15 +40300,20 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include #include - #include + + struct posix_acl *get_acl_fn(struct inode *inode, int type) + { return NULL; } + + static const struct inode_operations + iops __attribute__ ((unused)) = { + .get_acl = get_acl_fn, + }; int main (void) { - posix_acl_from_xattr(&init_user_ns, NULL, 0); ; return 0; @@ -37558,7 +40332,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -37574,7 +40348,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_POSIX_ACL_FROM_XATTR_USERNS 1 +#define HAVE_GET_ACL 1 _ACEOF @@ -37594,8 +40368,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether posix_acl_release() is available" >&5 -$as_echo_n "checking whether posix_acl_release() is available... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether iops->set_acl() exists" >&5 +$as_echo_n "checking whether iops->set_acl() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -37606,16 +40380,20 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include #include - #include + + int set_acl_fn(struct inode *inode, struct posix_acl *acl, int type) + { return 0; } + + static const struct inode_operations + iops __attribute__ ((unused)) = { + .set_acl = set_acl_fn, + }; int main (void) { - struct posix_acl* tmp = posix_acl_alloc(1, 0); - posix_acl_release(tmp); ; return 0; @@ -37634,7 +40412,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -37650,12 +40428,29 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_POSIX_ACL_RELEASE 1 +#define HAVE_SET_ACL 1 _ACEOF - { $as_echo "$as_me:$LINENO: checking whether posix_acl_release() is GPL-only" >&5 -$as_echo_n "checking whether posix_acl_release() is GPL-only... " >&6; } +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + + +fi + + rm -Rf build + + + + + + { $as_echo "$as_me:$LINENO: checking whether iops->getattr() takes a path" >&5 +$as_echo_n "checking whether iops->getattr() takes a path... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -37666,19 +40461,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include - #include - #include + #include - MODULE_LICENSE("$ZFS_META_LICENSE"); + int test_getattr( + const struct path *p, struct kstat *k, + u32 request_mask, unsigned int query_flags) + { return 0; } + + static const struct inode_operations + iops __attribute__ ((unused)) = { + .getattr = test_getattr, + }; int main (void) { - struct posix_acl* tmp = posix_acl_alloc(1, 0); - posix_acl_release(tmp); ; return 0; @@ -37697,7 +40495,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -37709,29 +40507,14 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_POSIX_ACL_RELEASE_GPL_ONLY 1 +#define HAVE_PATH_IOPS_GETATTR 1 _ACEOF - - -fi - - rm -Rf build - - - else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -37748,8 +40531,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether set_cached_acl() is usable" >&5 -$as_echo_n "checking whether set_cached_acl() is usable... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether iops->getattr() takes a vfsmount" >&5 +$as_echo_n "checking whether iops->getattr() takes a vfsmount... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -37760,21 +40543,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include #include - #include - MODULE_LICENSE("$ZFS_META_LICENSE"); + int test_getattr( + struct vfsmount *mnt, struct dentry *d, + struct kstat *k) + { return 0; } + + static const struct inode_operations + iops __attribute__ ((unused)) = { + .getattr = test_getattr, + }; int main (void) { - struct inode *ip = NULL; - struct posix_acl *acl = posix_acl_alloc(1, 0); - set_cached_acl(ip, ACL_TYPE_ACCESS, acl); - forget_cached_acl(ip, ACL_TYPE_ACCESS); ; return 0; @@ -37793,7 +40577,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -37809,7 +40593,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_SET_CACHED_ACL_USABLE 1 +#define HAVE_VFSMOUNT_IOPS_GETATTR 1 _ACEOF @@ -37829,8 +40613,9 @@ fi - { $as_echo "$as_me:$LINENO: checking whether posix_acl_chmod exists" >&5 -$as_echo_n "checking whether posix_acl_chmod exists... " >&6; } + + { $as_echo "$as_me:$LINENO: checking whether inode_set_flags() exists" >&5 +$as_echo_n "checking whether inode_set_flags() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -37842,13 +40627,13 @@ cat >>conftest.$ac_ext <<_ACEOF #include - #include int main (void) { - posix_acl_chmod(NULL, 0, 0) + struct inode inode; + inode_set_flags(&inode, S_IMMUTABLE, S_IMMUTABLE); ; return 0; @@ -37867,7 +40652,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -37883,7 +40668,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_POSIX_ACL_CHMOD 1 +#define HAVE_INODE_SET_FLAGS 1 _ACEOF @@ -37902,8 +40687,9 @@ fi - { $as_echo "$as_me:$LINENO: checking whether __posix_acl_chmod exists" >&5 -$as_echo_n "checking whether __posix_acl_chmod exists... " >&6; } + + { $as_echo "$as_me:$LINENO: checking whether inode_set_iversion() exists" >&5 +$as_echo_n "checking whether inode_set_iversion() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -37914,14 +40700,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include + #include int main (void) { - __posix_acl_chmod(NULL, 0, 0) + struct inode inode; + inode_set_iversion(&inode, 1); ; return 0; @@ -37940,7 +40726,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -37956,7 +40742,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE___POSIX_ACL_CHMOD 1 +#define HAVE_INODE_SET_IVERSION 1 _ACEOF @@ -37976,8 +40762,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether posix_acl_equiv_mode() wants umode_t" >&5 -$as_echo_n "checking whether posix_acl_equiv_mode() wants umode_t... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether uncached_acl_sentinel() exists" >&5 +$as_echo_n "checking whether uncached_acl_sentinel() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -37989,14 +40775,12 @@ cat >>conftest.$ac_ext <<_ACEOF #include - #include int main (void) { - umode_t tmp; - posix_acl_equiv_mode(NULL,&tmp); + void *sentinel __attribute__ ((unused)) = uncached_acl_sentinel(NULL); ; return 0; @@ -38015,7 +40799,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -38031,7 +40815,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_POSIX_ACL_EQUIV_MODE_UMODE_T 1 +#define HAVE_KERNEL_GET_ACL_HANDLE_CACHE 1 _ACEOF @@ -38051,8 +40835,9 @@ fi - { $as_echo "$as_me:$LINENO: checking whether posix_acl_valid() wants user namespace" >&5 -$as_echo_n "checking whether posix_acl_valid() wants user namespace... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether sops->show_options() wants dentry" >&5 +$as_echo_n "checking whether sops->show_options() wants dentry... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.c @@ -38064,17 +40849,16 @@ cat >>conftest.$ac_ext <<_ACEOF #include - #include + + int show_options (struct seq_file * x, struct dentry * y) { return 0; }; + static struct super_operations sops __attribute__ ((unused)) = { + .show_options = show_options, + }; int main (void) { - struct user_namespace *user_ns = NULL; - const struct posix_acl *acl = NULL; - int error; - - error = posix_acl_valid(user_ns, acl); ; return 0; @@ -38093,7 +40877,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -38109,7 +40893,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_POSIX_ACL_VALID_WITH_NS 1 +#define HAVE_SHOW_OPTIONS_WITH_DENTRY 1 _ACEOF @@ -38129,8 +40913,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether iops->permission() exists" >&5 -$as_echo_n "checking whether iops->permission() exists... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether file_inode() is available" >&5 +$as_echo_n "checking whether file_inode() is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -38143,17 +40927,12 @@ cat >>conftest.$ac_ext <<_ACEOF #include - int permission_fn(struct inode *inode, int mask) { return 0; } - - static const struct inode_operations - iops __attribute__ ((unused)) = { - .permission = permission_fn, - }; - int main (void) { + struct file *f = NULL; + file_inode(f); ; return 0; @@ -38172,7 +40951,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -38188,7 +40967,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_PERMISSION 1 +#define HAVE_FILE_INODE 1 _ACEOF @@ -38208,8 +40987,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether iops->permission() wants nameidata" >&5 -$as_echo_n "checking whether iops->permission() wants nameidata... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether file_dentry() is available" >&5 +$as_echo_n "checking whether file_dentry() is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -38222,18 +41001,12 @@ cat >>conftest.$ac_ext <<_ACEOF #include - int permission_fn(struct inode *inode, int mask, - struct nameidata *nd) { return 0; } - - static const struct inode_operations - iops __attribute__ ((unused)) = { - .permission = permission_fn, - }; - int main (void) { + struct file *f = NULL; + file_dentry(f); ; return 0; @@ -38252,7 +41025,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -38268,12 +41041,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_PERMISSION 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_PERMISSION_WITH_NAMEIDATA 1 +#define HAVE_FILE_DENTRY 1 _ACEOF @@ -38293,8 +41061,9 @@ fi - { $as_echo "$as_me:$LINENO: checking whether iops->check_acl() exists" >&5 -$as_echo_n "checking whether iops->check_acl() exists... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether fops->fsync() wants" >&5 +$as_echo_n "checking whether fops->fsync() wants... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.c @@ -38307,11 +41076,12 @@ cat >>conftest.$ac_ext <<_ACEOF #include - int check_acl_fn(struct inode *inode, int mask) { return 0; } + int test_fsync(struct file *f, struct dentry *dentry, int x) + { return 0; } - static const struct inode_operations - iops __attribute__ ((unused)) = { - .check_acl = check_acl_fn, + static const struct file_operations + fops __attribute__ ((unused)) = { + .fsync = test_fsync, }; int @@ -38336,7 +41106,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -38348,11 +41118,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:$LINENO: result: dentry" >&5 +$as_echo "dentry" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_CHECK_ACL 1 +#define HAVE_FSYNC_WITH_DENTRY 1 _ACEOF @@ -38360,8 +41130,6 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } @@ -38372,8 +41140,6 @@ fi - { $as_echo "$as_me:$LINENO: checking whether iops->check_acl() wants flags" >&5 -$as_echo_n "checking whether iops->check_acl() wants flags... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -38386,12 +41152,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include - int check_acl_fn(struct inode *inode, int mask, - unsigned int flags) { return 0; } + int test_fsync(struct file *f, int x) { return 0; } - static const struct inode_operations - iops __attribute__ ((unused)) = { - .check_acl = check_acl_fn, + static const struct file_operations + fops __attribute__ ((unused)) = { + .fsync = test_fsync, }; int @@ -38416,7 +41181,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -38428,16 +41193,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CHECK_ACL 1 -_ACEOF - + { $as_echo "$as_me:$LINENO: result: no dentry" >&5 +$as_echo "no dentry" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_CHECK_ACL_WITH_FLAGS 1 +#define HAVE_FSYNC_WITHOUT_DENTRY 1 _ACEOF @@ -38445,8 +41205,6 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } @@ -38457,8 +41215,6 @@ fi - { $as_echo "$as_me:$LINENO: checking whether iops->get_acl() exists" >&5 -$as_echo_n "checking whether iops->get_acl() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -38471,12 +41227,12 @@ cat >>conftest.$ac_ext <<_ACEOF #include - struct posix_acl *get_acl_fn(struct inode *inode, int type) - { return NULL; } + int test_fsync(struct file *f, loff_t a, loff_t b, int c) + { return 0; } - static const struct inode_operations - iops __attribute__ ((unused)) = { - .get_acl = get_acl_fn, + static const struct file_operations + fops __attribute__ ((unused)) = { + .fsync = test_fsync, }; int @@ -38501,7 +41257,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -38513,11 +41269,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:$LINENO: result: range" >&5 +$as_echo "range" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_GET_ACL 1 +#define HAVE_FSYNC_RANGE 1 _ACEOF @@ -38525,8 +41281,6 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } @@ -38537,8 +41291,9 @@ fi - { $as_echo "$as_me:$LINENO: checking whether iops->set_acl() exists" >&5 -$as_echo_n "checking whether iops->set_acl() exists... " >&6; } + + { $as_echo "$as_me:$LINENO: checking whether sops->evict_inode() exists" >&5 +$as_echo_n "checking whether sops->evict_inode() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -38550,13 +41305,9 @@ cat >>conftest.$ac_ext <<_ACEOF #include - - int set_acl_fn(struct inode *inode, struct posix_acl *acl, int type) - { return 0; } - - static const struct inode_operations - iops __attribute__ ((unused)) = { - .set_acl = set_acl_fn, + void evict_inode (struct inode * t) { return; } + static struct super_operations sops __attribute__ ((unused)) = { + .evict_inode = evict_inode, }; int @@ -38581,7 +41332,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -38597,7 +41348,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_SET_ACL 1 +#define HAVE_EVICT_INODE 1 _ACEOF @@ -38617,9 +41368,8 @@ fi - - { $as_echo "$as_me:$LINENO: checking whether iops->getattr() takes a path" >&5 -$as_echo_n "checking whether iops->getattr() takes a path... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether sops->dirty_inode() wants flags" >&5 +$as_echo_n "checking whether sops->dirty_inode() wants flags... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -38632,14 +41382,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include - int test_getattr( - const struct path *p, struct kstat *k, - u32 request_mask, unsigned int query_flags) - { return 0; } + void dirty_inode(struct inode *a, int b) { return; } - static const struct inode_operations - iops __attribute__ ((unused)) = { - .getattr = test_getattr, + static const struct super_operations + sops __attribute__ ((unused)) = { + .dirty_inode = dirty_inode, }; int @@ -38664,7 +41411,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -38680,7 +41427,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_PATH_IOPS_GETATTR 1 +#define HAVE_DIRTY_INODE_WITH_FLAGS 1 _ACEOF @@ -38700,8 +41447,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether iops->getattr() takes a vfsmount" >&5 -$as_echo_n "checking whether iops->getattr() takes a vfsmount... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether sops->nr_cached_objects() exists" >&5 +$as_echo_n "checking whether sops->nr_cached_objects() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -38714,14 +41461,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include - int test_getattr( - struct vfsmount *mnt, struct dentry *d, - struct kstat *k) - { return 0; } + int nr_cached_objects(struct super_block *sb) { return 0; } - static const struct inode_operations - iops __attribute__ ((unused)) = { - .getattr = test_getattr, + static const struct super_operations + sops __attribute__ ((unused)) = { + .nr_cached_objects = nr_cached_objects, }; int @@ -38746,7 +41490,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -38762,7 +41506,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_VFSMOUNT_IOPS_GETATTR 1 +#define HAVE_NR_CACHED_OBJECTS 1 _ACEOF @@ -38782,9 +41526,8 @@ fi - - { $as_echo "$as_me:$LINENO: checking whether inode_set_flags() exists" >&5 -$as_echo_n "checking whether inode_set_flags() exists... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether sops->free_cached_objects() exists" >&5 +$as_echo_n "checking whether sops->free_cached_objects() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -38797,12 +41540,18 @@ cat >>conftest.$ac_ext <<_ACEOF #include + void free_cached_objects(struct super_block *sb, int x) + { return; } + + static const struct super_operations + sops __attribute__ ((unused)) = { + .free_cached_objects = free_cached_objects, + }; + int main (void) { - struct inode inode; - inode_set_flags(&inode, S_IMMUTABLE, S_IMMUTABLE); ; return 0; @@ -38821,7 +41570,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -38837,7 +41586,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_INODE_SET_FLAGS 1 +#define HAVE_FREE_CACHED_OBJECTS 1 _ACEOF @@ -38857,8 +41606,9 @@ fi - { $as_echo "$as_me:$LINENO: checking whether uncached_acl_sentinel() exists" >&5 -$as_echo_n "checking whether uncached_acl_sentinel() exists... " >&6; } + + { $as_echo "$as_me:$LINENO: checking whether fops->fallocate() exists" >&5 +$as_echo_n "checking whether fops->fallocate() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -38871,11 +41621,18 @@ cat >>conftest.$ac_ext <<_ACEOF #include + long test_fallocate(struct file *file, int mode, + loff_t offset, loff_t len) { return 0; } + + static const struct file_operations + fops __attribute__ ((unused)) = { + .fallocate = test_fallocate, + }; + int main (void) { - void *sentinel __attribute__ ((unused)) = uncached_acl_sentinel(NULL); ; return 0; @@ -38894,7 +41651,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -38910,7 +41667,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_KERNEL_GET_ACL_HANDLE_CACHE 1 +#define HAVE_FILE_FALLOCATE 1 _ACEOF @@ -38930,9 +41687,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether sops->show_options() wants dentry" >&5 -$as_echo_n "checking whether sops->show_options() wants dentry... " >&6; } - + { $as_echo "$as_me:$LINENO: checking whether iops->fallocate() exists" >&5 +$as_echo_n "checking whether iops->fallocate() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -38945,9 +41701,12 @@ cat >>conftest.$ac_ext <<_ACEOF #include - int show_options (struct seq_file * x, struct dentry * y) { return 0; }; - static struct super_operations sops __attribute__ ((unused)) = { - .show_options = show_options, + long test_fallocate(struct inode *inode, int mode, + loff_t offset, loff_t len) { return 0; } + + static const struct inode_operations + fops __attribute__ ((unused)) = { + .fallocate = test_fallocate, }; int @@ -38972,7 +41731,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -38988,7 +41747,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_SHOW_OPTIONS_WITH_DENTRY 1 +#define HAVE_INODE_FALLOCATE 1 _ACEOF @@ -39008,8 +41767,9 @@ fi - { $as_echo "$as_me:$LINENO: checking whether file_inode() is available" >&5 -$as_echo_n "checking whether file_inode() is available... " >&6; } + + { $as_echo "$as_me:$LINENO: checking whether fops->aio_fsync() exists" >&5 +$as_echo_n "checking whether fops->aio_fsync() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -39022,12 +41782,15 @@ cat >>conftest.$ac_ext <<_ACEOF #include + static const struct file_operations + fops __attribute__ ((unused)) = { + .aio_fsync = NULL, + }; + int main (void) { - struct file *f = NULL; - file_inode(f); ; return 0; @@ -39046,7 +41809,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -39062,7 +41825,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_FILE_INODE 1 +#define HAVE_FILE_AIO_FSYNC 1 _ACEOF @@ -39082,8 +41845,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether file_dentry() is available" >&5 -$as_echo_n "checking whether file_dentry() is available... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether iops->create()/mkdir()/mknod() take umode_t" >&5 +$as_echo_n "checking whether iops->create()/mkdir()/mknod() take umode_t... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -39096,12 +41859,18 @@ cat >>conftest.$ac_ext <<_ACEOF #include + int mkdir(struct inode *inode, struct dentry *dentry, + umode_t umode) { return 0; } + + static const struct inode_operations + iops __attribute__ ((unused)) = { + .mkdir = mkdir, + }; + int main (void) { - struct file *f = NULL; - file_dentry(f); ; return 0; @@ -39120,7 +41889,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -39136,7 +41905,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_FILE_DENTRY 1 +#define HAVE_MKDIR_UMODE_T 1 _ACEOF @@ -39156,9 +41925,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether fops->fsync() wants" >&5 -$as_echo_n "checking whether fops->fsync() wants... " >&6; } - + { $as_echo "$as_me:$LINENO: checking whether iops->lookup() passes nameidata" >&5 +$as_echo_n "checking whether iops->lookup() passes nameidata... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -39170,13 +41938,15 @@ cat >>conftest.$ac_ext <<_ACEOF #include + #include - int test_fsync(struct file *f, struct dentry *dentry, int x) - { return 0; } + struct dentry *inode_lookup(struct inode *inode, + struct dentry *dentry, struct nameidata *nidata) + { return NULL; } - static const struct file_operations - fops __attribute__ ((unused)) = { - .fsync = test_fsync, + static const struct inode_operations iops + __attribute__ ((unused)) = { + .lookup = inode_lookup, }; int @@ -39201,7 +41971,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -39213,11 +41983,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: dentry" >&5 -$as_echo "dentry" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_FSYNC_WITH_DENTRY 1 +#define HAVE_LOOKUP_NAMEIDATA 1 _ACEOF @@ -39225,6 +41995,8 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } @@ -39235,6 +42007,8 @@ fi + { $as_echo "$as_me:$LINENO: checking whether iops->create() passes nameidata" >&5 +$as_echo_n "checking whether iops->create() passes nameidata... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -39246,12 +42020,19 @@ cat >>conftest.$ac_ext <<_ACEOF #include + #include - int test_fsync(struct file *f, int x) { return 0; } + #ifdef HAVE_MKDIR_UMODE_T + int inode_create(struct inode *inode ,struct dentry *dentry, + umode_t umode, struct nameidata *nidata) { return 0; } + #else + int inode_create(struct inode *inode,struct dentry *dentry, + int umode, struct nameidata * nidata) { return 0; } + #endif - static const struct file_operations - fops __attribute__ ((unused)) = { - .fsync = test_fsync, + static const struct inode_operations + iops __attribute__ ((unused)) = { + .create = inode_create, }; int @@ -39276,7 +42057,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -39288,11 +42069,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: no dentry" >&5 -$as_echo "no dentry" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_FSYNC_WITHOUT_DENTRY 1 +#define HAVE_CREATE_NAMEIDATA 1 _ACEOF @@ -39300,6 +42081,8 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } @@ -39310,6 +42093,8 @@ fi + { $as_echo "$as_me:$LINENO: checking whether iops->get_link() passes delayed" >&5 +$as_echo_n "checking whether iops->get_link() passes delayed... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -39321,13 +42106,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include - - int test_fsync(struct file *f, loff_t a, loff_t b, int c) - { return 0; } - - static const struct file_operations - fops __attribute__ ((unused)) = { - .fsync = test_fsync, + const char *get_link(struct dentry *de, struct inode *ip, + struct delayed_call *done) { return "symlink"; } + static struct inode_operations + iops __attribute__ ((unused)) = { + .get_link = get_link, }; int @@ -39352,7 +42135,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -39364,11 +42147,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: range" >&5 -$as_echo "range" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_FSYNC_RANGE 1 +#define HAVE_GET_LINK_DELAYED 1 _ACEOF @@ -39376,19 +42159,10 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - - -fi - - rm -Rf build - - - - - - { $as_echo "$as_me:$LINENO: checking whether sops->evict_inode() exists" >&5 -$as_echo_n "checking whether sops->evict_inode() exists... " >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: checking whether iops->get_link() passes cookie" >&5 +$as_echo_n "checking whether iops->get_link() passes cookie... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -39399,11 +42173,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - void evict_inode (struct inode * t) { return; } - static struct super_operations sops __attribute__ ((unused)) = { - .evict_inode = evict_inode, - }; + #include + const char *get_link(struct dentry *de, struct + inode *ip, void **cookie) { return "symlink"; } + static struct inode_operations + iops __attribute__ ((unused)) = { + .get_link = get_link, + }; int main (void) @@ -39427,7 +42203,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -39439,11 +42215,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_EVICT_INODE 1 +#define HAVE_GET_LINK_COOKIE 1 _ACEOF @@ -39451,20 +42227,11 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - - -fi - - rm -Rf build - - - - - { $as_echo "$as_me:$LINENO: checking whether sops->dirty_inode() wants flags" >&5 -$as_echo_n "checking whether sops->dirty_inode() wants flags... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether iops->follow_link() passes cookie" >&5 +$as_echo_n "checking whether iops->follow_link() passes cookie... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -39476,12 +42243,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include - - void dirty_inode(struct inode *a, int b) { return; } - - static const struct super_operations - sops __attribute__ ((unused)) = { - .dirty_inode = dirty_inode, + const char *follow_link(struct dentry *de, + void **cookie) { return "symlink"; } + static struct inode_operations + iops __attribute__ ((unused)) = { + .follow_link = follow_link, }; int @@ -39506,7 +42272,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -39522,7 +42288,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_DIRTY_INODE_WITH_FLAGS 1 +#define HAVE_FOLLOW_LINK_COOKIE 1 _ACEOF @@ -39530,20 +42296,10 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - - - -fi - - rm -Rf build - - - - - { $as_echo "$as_me:$LINENO: checking whether sops->nr_cached_objects() exists" >&5 -$as_echo_n "checking whether sops->nr_cached_objects() exists... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether iops->follow_link() passes nameidata" >&5 +$as_echo_n "checking whether iops->follow_link() passes nameidata... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -39555,13 +42311,12 @@ cat >>conftest.$ac_ext <<_ACEOF #include - - int nr_cached_objects(struct super_block *sb) { return 0; } - - static const struct super_operations - sops __attribute__ ((unused)) = { - .nr_cached_objects = nr_cached_objects, - }; + void *follow_link(struct dentry *de, struct + nameidata *nd) { return (void *)NULL; } + static struct inode_operations + iops __attribute__ ((unused)) = { + .follow_link = follow_link, + }; int main (void) @@ -39585,7 +42340,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -39597,11 +42352,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_NR_CACHED_OBJECTS 1 +#define HAVE_FOLLOW_LINK_NAMEIDATA 1 _ACEOF @@ -39609,8 +42364,34 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: no; please file a bug report" >&5 +$as_echo "$as_me: error: no; please file a bug report" >&2;} + { (exit 1); exit 1; }; } + + + +fi + + rm -Rf build + + + + + +fi + + rm -Rf build + + + + + + +fi + + rm -Rf build + + @@ -39621,8 +42402,6 @@ fi - { $as_echo "$as_me:$LINENO: checking whether sops->free_cached_objects() exists" >&5 -$as_echo_n "checking whether sops->free_cached_objects() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -39633,15 +42412,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - - void free_cached_objects(struct super_block *sb, int x) - { return; } - - static const struct super_operations - sops __attribute__ ((unused)) = { - .free_cached_objects = free_cached_objects, - }; + #if !defined(HAVE_GET_LINK_DELAYED) + #error "Expecting get_link() delayed done" + #endif int main (void) @@ -39665,7 +42438,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -39677,11 +42450,9 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_FREE_CACHED_OBJECTS 1 +#define HAVE_PUT_LINK_DELAYED 1 _ACEOF @@ -39689,21 +42460,8 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - - -fi - - rm -Rf build - - - - - - { $as_echo "$as_me:$LINENO: checking whether fops->fallocate() exists" >&5 -$as_echo_n "checking whether fops->fallocate() exists... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether iops->put_link() passes cookie" >&5 +$as_echo_n "checking whether iops->put_link() passes cookie... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -39714,15 +42472,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - - long test_fallocate(struct file *file, int mode, - loff_t offset, loff_t len) { return 0; } - - static const struct file_operations - fops __attribute__ ((unused)) = { - .fallocate = test_fallocate, - }; + #include + void put_link(struct inode *ip, void *cookie) + { return; } + static struct inode_operations + iops __attribute__ ((unused)) = { + .put_link = put_link, + }; int main (void) @@ -39746,7 +42502,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -39758,11 +42514,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_FILE_FALLOCATE 1 +#define HAVE_PUT_LINK_COOKIE 1 _ACEOF @@ -39770,20 +42526,10 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - - - -fi - - rm -Rf build - - - - - { $as_echo "$as_me:$LINENO: checking whether iops->fallocate() exists" >&5 -$as_echo_n "checking whether iops->fallocate() exists... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether iops->put_link() passes nameidata" >&5 +$as_echo_n "checking whether iops->put_link() passes nameidata... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -39794,15 +42540,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - - long test_fallocate(struct inode *inode, int mode, - loff_t offset, loff_t len) { return 0; } - - static const struct inode_operations - fops __attribute__ ((unused)) = { - .fallocate = test_fallocate, - }; + #include + void put_link(struct dentry *de, struct + nameidata *nd, void *ptr) { return; } + static struct inode_operations + iops __attribute__ ((unused)) = { + .put_link = put_link, + }; int main (void) @@ -39826,7 +42570,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -39838,11 +42582,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_INODE_FALLOCATE 1 +#define HAVE_PUT_LINK_NAMEIDATA 1 _ACEOF @@ -39850,8 +42594,9 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: no; please file a bug report" >&5 +$as_echo "$as_me: error: no; please file a bug report" >&2;} + { (exit 1); exit 1; }; } @@ -39863,8 +42608,23 @@ fi - { $as_echo "$as_me:$LINENO: checking whether fops->aio_fsync() exists" >&5 -$as_echo_n "checking whether fops->aio_fsync() exists... " >&6; } +fi + + rm -Rf build + + + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether i_op->tmpfile() exists" >&5 +$as_echo_n "checking whether i_op->tmpfile() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -39876,10 +42636,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include - - static const struct file_operations - fops __attribute__ ((unused)) = { - .aio_fsync = NULL, + int tmpfile(struct inode *inode, struct dentry *dentry, + umode_t mode) { return 0; } + static struct inode_operations + iops __attribute__ ((unused)) = { + .tmpfile = tmpfile, }; int @@ -39904,7 +42665,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -39920,7 +42681,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_FILE_AIO_FSYNC 1 +#define HAVE_TMPFILE 1 _ACEOF @@ -39940,8 +42701,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether iops->create()/mkdir()/mknod() take umode_t" >&5 -$as_echo_n "checking whether iops->create()/mkdir()/mknod() take umode_t... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether iops->truncate_range() exists" >&5 +$as_echo_n "checking whether iops->truncate_range() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -39953,13 +42714,10 @@ cat >>conftest.$ac_ext <<_ACEOF #include - - int mkdir(struct inode *inode, struct dentry *dentry, - umode_t umode) { return 0; } - - static const struct inode_operations - iops __attribute__ ((unused)) = { - .mkdir = mkdir, + void truncate_range(struct inode *inode, loff_t start, + loff_t end) { return; } + static struct inode_operations iops __attribute__ ((unused)) = { + .truncate_range = truncate_range, }; int @@ -39984,7 +42742,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -40000,7 +42758,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_MKDIR_UMODE_T 1 +#define HAVE_INODE_TRUNCATE_RANGE 1 _ACEOF @@ -40020,8 +42778,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether iops->lookup() passes nameidata" >&5 -$as_echo_n "checking whether iops->lookup() passes nameidata... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether dops->d_automount() exists" >&5 +$as_echo_n "checking whether dops->d_automount() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -40032,15 +42790,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - - struct dentry *inode_lookup(struct inode *inode, - struct dentry *dentry, struct nameidata *nidata) - { return NULL; } - - static const struct inode_operations iops - __attribute__ ((unused)) = { - .lookup = inode_lookup, + #include + struct vfsmount *d_automount(struct path *p) { return NULL; } + struct dentry_operations dops __attribute__ ((unused)) = { + .d_automount = d_automount, }; int @@ -40065,7 +42818,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -40081,7 +42834,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_LOOKUP_NAMEIDATA 1 +#define HAVE_AUTOMOUNT 1 _ACEOF @@ -40101,8 +42854,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether iops->create() passes nameidata" >&5 -$as_echo_n "checking whether iops->create() passes nameidata... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether eops->encode_fh() wants inode" >&5 +$as_echo_n "checking whether eops->encode_fh() wants inode... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -40113,19 +42866,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - - #ifdef HAVE_MKDIR_UMODE_T - int inode_create(struct inode *inode ,struct dentry *dentry, - umode_t umode, struct nameidata *nidata) { return 0; } - #else - int inode_create(struct inode *inode,struct dentry *dentry, - int umode, struct nameidata * nidata) { return 0; } - #endif - - static const struct inode_operations - iops __attribute__ ((unused)) = { - .create = inode_create, + #include + int encode_fh(struct inode *inode, __u32 *fh, int *max_len, + struct inode *parent) { return 0; } + static struct export_operations eops __attribute__ ((unused))={ + .encode_fh = encode_fh, }; int @@ -40150,7 +42895,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -40166,7 +42911,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_CREATE_NAMEIDATA 1 +#define HAVE_ENCODE_FH_WITH_INODE 1 _ACEOF @@ -40186,8 +42931,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether iops->get_link() passes delayed" >&5 -$as_echo_n "checking whether iops->get_link() passes delayed... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether eops->commit_metadata() exists" >&5 +$as_echo_n "checking whether eops->commit_metadata() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -40198,12 +42943,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - const char *get_link(struct dentry *de, struct inode *ip, - struct delayed_call *done) { return "symlink"; } - static struct inode_operations - iops __attribute__ ((unused)) = { - .get_link = get_link, + #include + int commit_metadata(struct inode *inode) { return 0; } + static struct export_operations eops __attribute__ ((unused))={ + .commit_metadata = commit_metadata, }; int @@ -40228,7 +42971,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -40244,7 +42987,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_GET_LINK_DELAYED 1 +#define HAVE_COMMIT_METADATA 1 _ACEOF @@ -40252,10 +42995,20 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether iops->get_link() passes cookie" >&5 -$as_echo_n "checking whether iops->get_link() passes cookie... " >&6; } + + + +fi + + rm -Rf build + + + + { $as_echo "$as_me:$LINENO: checking whether clear_inode() is available" >&5 +$as_echo_n "checking whether clear_inode() is available... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.c @@ -40266,18 +43019,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - const char *get_link(struct dentry *de, struct - inode *ip, void **cookie) { return "symlink"; } - static struct inode_operations - iops __attribute__ ((unused)) = { - .get_link = get_link, - }; + #include int main (void) { + clear_inode(NULL); ; return 0; @@ -40296,7 +43044,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -40307,92 +43055,72 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GET_LINK_COOKIE 1 -_ACEOF - - + rc=0 else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - { $as_echo "$as_me:$LINENO: checking whether iops->follow_link() passes cookie" >&5 -$as_echo_n "checking whether iops->follow_link() passes cookie... " >&6; } - - -cat confdefs.h - <<_ACEOF >conftest.c -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + rc=1 - #include - const char *follow_link(struct dentry *de, - void **cookie) { return "symlink"; } - static struct inode_operations - iops __attribute__ ((unused)) = { - .follow_link = follow_link, - }; - -int -main (void) -{ +fi + rm -Rf build - ; - return 0; -} -_ACEOF + if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + else + if test "x$enable_linux_builtin" != xyes; then -cat - <<_ACEOF >conftest.h + grep -q -E '[[:space:]]clear_inode[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in fs/inode.c; do + grep -q -E "EXPORT_SYMBOL.*(clear_inode)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi -_ACEOF + fi + if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - rm -Rf build && mkdir -p build && touch build/conftest.mod.c - echo "obj-m := conftest.o" >build/Makefile - modpost_flag='' - test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + else : { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_FOLLOW_LINK_COOKIE 1 +#define HAVE_CLEAR_INODE 1 _ACEOF -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + fi + fi + + + { $as_echo "$as_me:$LINENO: checking whether setattr_prepare() is available" >&5 +$as_echo_n "checking whether setattr_prepare() is available... " >&6; } - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether iops->follow_link() passes nameidata" >&5 -$as_echo_n "checking whether iops->follow_link() passes nameidata... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -40404,17 +43132,16 @@ cat >>conftest.$ac_ext <<_ACEOF #include - void *follow_link(struct dentry *de, struct - nameidata *nd) { return (void *)NULL; } - static struct inode_operations - iops __attribute__ ((unused)) = { - .follow_link = follow_link, - }; int main (void) { + struct dentry *dentry = NULL; + struct iattr *attr = NULL; + int error; + + error = setattr_prepare(dentry, attr); ; return 0; @@ -40433,7 +43160,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -40444,31 +43171,11 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_FOLLOW_LINK_NAMEIDATA 1 -_ACEOF - - + rc=0 else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - { { $as_echo "$as_me:$LINENO: error: no; please file a bug report" >&5 -$as_echo "$as_me: error: no; please file a bug report" >&2;} - { (exit 1); exit 1; }; } - - - -fi - - rm -Rf build - - - + rc=1 fi @@ -40476,24 +43183,59 @@ fi rm -Rf build + if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + else + if test "x$enable_linux_builtin" != xyes; then + grep -q -E '[[:space:]]setattr_prepare[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in fs/attr.c; do + grep -q -E "EXPORT_SYMBOL.*(setattr_prepare)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi -fi - - rm -Rf build - + fi + if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + else : + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_SETATTR_PREPARE 1 +_ACEOF - rm -Rf build + fi + fi + { $as_echo "$as_me:$LINENO: checking whether insert_inode_locked() is available" >&5 +$as_echo_n "checking whether insert_inode_locked() is available... " >&6; } @@ -40505,14 +43247,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #if !defined(HAVE_GET_LINK_DELAYED) - #error "Expecting get_link() delayed done" - #endif + #include int main (void) { + insert_inode_locked(NULL); ; return 0; @@ -40531,7 +43272,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -40542,87 +43283,72 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_PUT_LINK_DELAYED 1 -_ACEOF - - + rc=0 else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + rc=1 - { $as_echo "$as_me:$LINENO: checking whether iops->put_link() passes cookie" >&5 -$as_echo_n "checking whether iops->put_link() passes cookie... " >&6; } - - -cat confdefs.h - <<_ACEOF >conftest.c -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - - #include - void put_link(struct inode *ip, void *cookie) - { return; } - static struct inode_operations - iops __attribute__ ((unused)) = { - .put_link = put_link, - }; -int -main (void) -{ +fi + rm -Rf build - ; - return 0; -} -_ACEOF + if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + else + if test "x$enable_linux_builtin" != xyes; then -cat - <<_ACEOF >conftest.h + grep -q -E '[[:space:]]insert_inode_locked[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in fs/inode.c; do + grep -q -E "EXPORT_SYMBOL.*(insert_inode_locked)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi -_ACEOF + fi + if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - rm -Rf build && mkdir -p build && touch build/conftest.mod.c - echo "obj-m := conftest.o" >build/Makefile - modpost_flag='' - test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + else : - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_PUT_LINK_COOKIE 1 +#define HAVE_INSERT_INODE_LOCKED 1 _ACEOF -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + fi + fi + + + { $as_echo "$as_me:$LINENO: checking whether d_make_root() is available" >&5 +$as_echo_n "checking whether d_make_root() is available... " >&6; } - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether iops->put_link() passes nameidata" >&5 -$as_echo_n "checking whether iops->put_link() passes nameidata... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -40633,18 +43359,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - void put_link(struct dentry *de, struct - nameidata *nd, void *ptr) { return; } - static struct inode_operations - iops __attribute__ ((unused)) = { - .put_link = put_link, - }; + #include int main (void) { + d_make_root(NULL); ; return 0; @@ -40663,7 +43384,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -40674,23 +43395,11 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_PUT_LINK_NAMEIDATA 1 -_ACEOF - - + rc=0 else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - { { $as_echo "$as_me:$LINENO: error: no; please file a bug report" >&5 -$as_echo "$as_me: error: no; please file a bug report" >&2;} - { (exit 1); exit 1; }; } - + rc=1 fi @@ -40698,26 +43407,60 @@ fi rm -Rf build + if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + else + if test "x$enable_linux_builtin" != xyes; then -fi - - rm -Rf build + grep -q -E '[[:space:]]d_make_root[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in fs/dcache.c; do + grep -q -E "EXPORT_SYMBOL.*(d_make_root)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi + fi + if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + else : + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_D_MAKE_ROOT 1 +_ACEOF - rm -Rf build + fi + fi + { $as_echo "$as_me:$LINENO: checking whether d_obtain_alias() is available" >&5 +$as_echo_n "checking whether d_obtain_alias() is available... " >&6; } - { $as_echo "$as_me:$LINENO: checking whether i_op->tmpfile() exists" >&5 -$as_echo_n "checking whether i_op->tmpfile() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -40728,18 +43471,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - int tmpfile(struct inode *inode, struct dentry *dentry, - umode_t mode) { return 0; } - static struct inode_operations - iops __attribute__ ((unused)) = { - .tmpfile = tmpfile, - }; + #include int main (void) { + d_obtain_alias(NULL); ; return 0; @@ -40758,7 +43496,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -40769,33 +43507,72 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + rc=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + rc=1 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_TMPFILE 1 -_ACEOF +fi + rm -Rf build -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + + if test $rc -ne 0; then : { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } + else + if test "x$enable_linux_builtin" != xyes; then + + grep -q -E '[[:space:]]d_obtain_alias[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in fs/dcache.c; do + grep -q -E "EXPORT_SYMBOL.*(d_obtain_alias)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi + + fi + if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } -fi + else : - rm -Rf build + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +cat >>confdefs.h <<\_ACEOF +#define HAVE_D_OBTAIN_ALIAS 1 +_ACEOF + fi + fi + + + { $as_echo "$as_me:$LINENO: checking whether d_prune_aliases() is available" >&5 +$as_echo_n "checking whether d_prune_aliases() is available... " >&6; } - { $as_echo "$as_me:$LINENO: checking whether iops->truncate_range() exists" >&5 -$as_echo_n "checking whether iops->truncate_range() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -40806,17 +43583,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - void truncate_range(struct inode *inode, loff_t start, - loff_t end) { return; } - static struct inode_operations iops __attribute__ ((unused)) = { - .truncate_range = truncate_range, - }; + #include int main (void) { + struct inode *ip = NULL; + d_prune_aliases(ip); ; return 0; @@ -40835,7 +43609,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -40846,33 +43620,72 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + rc=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + rc=1 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_INODE_TRUNCATE_RANGE 1 -_ACEOF +fi + rm -Rf build -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + + if test $rc -ne 0; then : { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } + else + if test "x$enable_linux_builtin" != xyes; then + grep -q -E '[[:space:]]d_prune_aliases[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in fs/dcache.c; do + grep -q -E "EXPORT_SYMBOL.*(d_prune_aliases)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi -fi + fi + if test $rc -ne 0; then : - rm -Rf build + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + else : + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +cat >>confdefs.h <<\_ACEOF +#define HAVE_D_PRUNE_ALIASES 1 +_ACEOF - { $as_echo "$as_me:$LINENO: checking whether dops->d_automount() exists" >&5 -$as_echo_n "checking whether dops->d_automount() exists... " >&6; } + fi + fi + + + { $as_echo "$as_me:$LINENO: checking whether d_set_d_op() is available" >&5 +$as_echo_n "checking whether d_set_d_op() is available... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.c @@ -40884,15 +43697,12 @@ cat >>conftest.$ac_ext <<_ACEOF #include - struct vfsmount *d_automount(struct path *p) { return NULL; } - struct dentry_operations dops __attribute__ ((unused)) = { - .d_automount = d_automount, - }; int main (void) { + d_set_d_op(NULL, NULL); ; return 0; @@ -40911,7 +43721,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -40922,33 +43732,72 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + rc=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + rc=1 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_AUTOMOUNT 1 -_ACEOF +fi + rm -Rf build -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + else + if test "x$enable_linux_builtin" != xyes; then + + grep -q -E '[[:space:]]d_set_d_op[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in fs/dcache.c; do + grep -q -E "EXPORT_SYMBOL.*(d_set_d_op)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi + + fi + if test $rc -ne 0; then : { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } + else : + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_D_SET_D_OP 1 +_ACEOF - rm -Rf build + fi + fi - { $as_echo "$as_me:$LINENO: checking whether eops->encode_fh() wants inode" >&5 -$as_echo_n "checking whether eops->encode_fh() wants inode... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether dops->d_revalidate() takes struct nameidata" >&5 +$as_echo_n "checking whether dops->d_revalidate() takes struct nameidata... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -40959,11 +43808,15 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - int encode_fh(struct inode *inode, __u32 *fh, int *max_len, - struct inode *parent) { return 0; } - static struct export_operations eops __attribute__ ((unused))={ - .encode_fh = encode_fh, + #include + #include + + int revalidate (struct dentry *dentry, + struct nameidata *nidata) { return 0; } + + static const struct dentry_operations + dops __attribute__ ((unused)) = { + .d_revalidate = revalidate, }; int @@ -40988,7 +43841,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -41004,7 +43857,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_ENCODE_FH_WITH_INODE 1 +#define HAVE_D_REVALIDATE_NAMEIDATA 1 _ACEOF @@ -41024,8 +43877,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether eops->commit_metadata() exists" >&5 -$as_echo_n "checking whether eops->commit_metadata() exists... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether dentry uses const struct dentry_operations" >&5 +$as_echo_n "checking whether dentry uses const struct dentry_operations... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -41036,16 +43889,19 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - int commit_metadata(struct inode *inode) { return 0; } - static struct export_operations eops __attribute__ ((unused))={ - .commit_metadata = commit_metadata, + #include + + const struct dentry_operations test_d_op = { + .d_revalidate = NULL, }; int main (void) { + struct dentry d __attribute__ ((unused)); + + d.d_op = &test_d_op; ; return 0; @@ -41064,7 +43920,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -41080,7 +43936,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_COMMIT_METADATA 1 +#define HAVE_CONST_DENTRY_OPERATIONS 1 _ACEOF @@ -41099,8 +43955,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether clear_inode() is available" >&5 -$as_echo_n "checking whether clear_inode() is available... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether truncate_setsize() is available" >&5 +$as_echo_n "checking whether truncate_setsize() is available... " >&6; } @@ -41112,13 +43968,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - clear_inode(NULL); + truncate_setsize(NULL, 0); ; return 0; @@ -41137,7 +43993,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -41168,13 +44024,13 @@ $as_echo "no" >&6; } else if test "x$enable_linux_builtin" != xyes; then - grep -q -E '[[:space:]]clear_inode[[:space:]]' \ + grep -q -E '[[:space:]]truncate_setsize[[:space:]]' \ $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null rc=$? if test $rc -ne 0; then export=0 - for file in fs/inode.c; do - grep -q -E "EXPORT_SYMBOL.*(clear_inode)" \ + for file in mm/truncate.c; do + grep -q -E "EXPORT_SYMBOL.*(truncate_setsize)" \ "$LINUX/$file" 2>/dev/null rc=$? if test $rc -eq 0; then @@ -41203,7 +44059,7 @@ $as_echo "no" >&6; } $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_CLEAR_INODE 1 +#define HAVE_TRUNCATE_SETSIZE 1 _ACEOF @@ -41211,9 +44067,9 @@ _ACEOF fi - { $as_echo "$as_me:$LINENO: checking whether setattr_prepare() is available" >&5 -$as_echo_n "checking whether setattr_prepare() is available... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether security_inode_init_security wants 6 args" >&5 +$as_echo_n "checking whether security_inode_init_security wants 6 args... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -41224,17 +44080,20 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - struct dentry *dentry = NULL; - struct iattr *attr = NULL; - int error; + struct inode *ip __attribute__ ((unused)) = NULL; + struct inode *dip __attribute__ ((unused)) = NULL; + const struct qstr *str __attribute__ ((unused)) = NULL; + char *name __attribute__ ((unused)) = NULL; + void *value __attribute__ ((unused)) = NULL; + size_t len __attribute__ ((unused)) = 0; - error = setattr_prepare(dentry, attr); + security_inode_init_security(ip, dip, str, &name, &value, &len); ; return 0; @@ -41253,7 +44112,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -41264,72 +44123,33 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -fi - - rm -Rf build - - - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - else - if test "x$enable_linux_builtin" != xyes; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_6ARGS_SECURITY_INODE_INIT_SECURITY 1 +_ACEOF - grep -q -E '[[:space:]]setattr_prepare[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in fs/attr.c; do - grep -q -E "EXPORT_SYMBOL.*(setattr_prepare)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - fi - if test $rc -ne 0; then : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - else : - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_SETATTR_PREPARE 1 -_ACEOF +fi + rm -Rf build - fi - fi - { $as_echo "$as_me:$LINENO: checking whether insert_inode_locked() is available" >&5 -$as_echo_n "checking whether insert_inode_locked() is available... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether security_inode_init_security wants callback" >&5 +$as_echo_n "checking whether security_inode_init_security wants callback... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -41340,13 +44160,18 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - insert_inode_locked(NULL); + struct inode *ip __attribute__ ((unused)) = NULL; + struct inode *dip __attribute__ ((unused)) = NULL; + const struct qstr *str __attribute__ ((unused)) = NULL; + initxattrs func __attribute__ ((unused)) = NULL; + + security_inode_init_security(ip, dip, str, func, NULL); ; return 0; @@ -41365,7 +44190,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -41376,72 +44201,33 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 - - -fi - - rm -Rf build - - - if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } - else - if test "x$enable_linux_builtin" != xyes; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_CALLBACK_SECURITY_INODE_INIT_SECURITY 1 +_ACEOF - grep -q -E '[[:space:]]insert_inode_locked[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in fs/inode.c; do - grep -q -E "EXPORT_SYMBOL.*(insert_inode_locked)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - fi - if test $rc -ne 0; then : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - else : - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_INSERT_INODE_LOCKED 1 -_ACEOF +fi + rm -Rf build - fi - fi - { $as_echo "$as_me:$LINENO: checking whether d_make_root() is available" >&5 -$as_echo_n "checking whether d_make_root() is available... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether fst->mount() exists" >&5 +$as_echo_n "checking whether fst->mount() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -41452,13 +44238,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + + static struct dentry * + mount(struct file_system_type *fs_type, int flags, + const char *osname, void *data) { + struct dentry *d = NULL; + return (d); + } + + static struct file_system_type fst __attribute__ ((unused)) = { + .mount = mount, + }; int main (void) { - d_make_root(NULL); ; return 0; @@ -41477,7 +44273,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -41488,72 +44284,33 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 - - -fi - - rm -Rf build - - - if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } - else - if test "x$enable_linux_builtin" != xyes; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_FST_MOUNT 1 +_ACEOF - grep -q -E '[[:space:]]d_make_root[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in fs/dcache.c; do - grep -q -E "EXPORT_SYMBOL.*(d_make_root)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - fi - if test $rc -ne 0; then : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - else : - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_D_MAKE_ROOT 1 -_ACEOF +fi + rm -Rf build - fi - fi - { $as_echo "$as_me:$LINENO: checking whether d_obtain_alias() is available" >&5 -$as_echo_n "checking whether d_obtain_alias() is available... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether super_block has s_shrink" >&5 +$as_echo_n "checking whether super_block has s_shrink... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -41564,13 +44321,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + + int shrink(struct shrinker *s, struct shrink_control *sc) + { return 0; } + + static const struct super_block + sb __attribute__ ((unused)) = { + .s_shrink.shrink = shrink, + .s_shrink.seeks = DEFAULT_SEEKS, + .s_shrink.batch = 0, + }; int main (void) { - d_obtain_alias(NULL); ; return 0; @@ -41589,7 +44355,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -41600,72 +44366,34 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 - - -fi - - rm -Rf build - - if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } +cat >>confdefs.h <<\_ACEOF +#define HAVE_SHRINK 1 +_ACEOF - else - if test "x$enable_linux_builtin" != xyes; then - grep -q -E '[[:space:]]d_obtain_alias[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in fs/dcache.c; do - grep -q -E "EXPORT_SYMBOL.*(d_obtain_alias)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - fi - if test $rc -ne 0; then : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - else : - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_D_OBTAIN_ALIAS 1 -_ACEOF +fi + rm -Rf build - fi - fi - { $as_echo "$as_me:$LINENO: checking whether d_prune_aliases() is available" >&5 -$as_echo_n "checking whether d_prune_aliases() is available... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether shrink_control has nid" >&5 +$as_echo_n "checking whether shrink_control has nid... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -41676,14 +44404,15 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - struct inode *ip = NULL; - d_prune_aliases(ip); + struct shrink_control sc __attribute__ ((unused)); + unsigned long scnidsize __attribute__ ((unused)) = + sizeof(sc.nid); ; return 0; @@ -41702,7 +44431,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -41713,11 +44442,22 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define SHRINK_CONTROL_HAS_NID 1 +_ACEOF + + else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + fi @@ -41725,62 +44465,86 @@ fi rm -Rf build - if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - else - if test "x$enable_linux_builtin" != xyes; then + { $as_echo "$as_me:$LINENO: checking whether super_block has s_instances list_head" >&5 +$as_echo_n "checking whether super_block has s_instances list_head... " >&6; } - grep -q -E '[[:space:]]d_prune_aliases[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in fs/dcache.c; do - grep -q -E "EXPORT_SYMBOL.*(d_prune_aliases)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - fi - if test $rc -ne 0; then : +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - else : + #include + +int +main (void) +{ + + struct super_block sb __attribute__ ((unused)); + + INIT_LIST_HEAD(&sb.s_instances); + + ; + return 0; +} + +_ACEOF + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_D_PRUNE_ALIASES 1 +#define HAVE_S_INSTANCES_LIST_HEAD 1 _ACEOF - fi - fi +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether d_set_d_op() is available" >&5 -$as_echo_n "checking whether d_set_d_op() is available... " >&6; } + +fi + + rm -Rf build + { $as_echo "$as_me:$LINENO: checking whether super_block has s_d_op" >&5 +$as_echo_n "checking whether super_block has s_d_op... " >&6; } + + cat confdefs.h - <<_ACEOF >conftest.c /* confdefs.h. */ _ACEOF @@ -41789,13 +44553,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - d_set_d_op(NULL, NULL); + struct super_block sb __attribute__ ((unused)); + sb.s_d_op = NULL; ; return 0; @@ -41814,7 +44579,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -41825,72 +44590,34 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -fi - - rm -Rf build +cat >>confdefs.h <<\_ACEOF +#define HAVE_S_D_OP 1 +_ACEOF - if test $rc -ne 0; then : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - else - if test "x$enable_linux_builtin" != xyes; then - - grep -q -E '[[:space:]]d_set_d_op[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in fs/dcache.c; do - grep -q -E "EXPORT_SYMBOL.*(d_set_d_op)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - - fi - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - else : - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } +fi -cat >>confdefs.h <<\_ACEOF -#define HAVE_D_SET_D_OP 1 -_ACEOF + rm -Rf build - fi - fi + { $as_echo "$as_me:$LINENO: checking whether super_setup_bdi_name() exists" >&5 +$as_echo_n "checking whether super_setup_bdi_name() exists... " >&6; } - { $as_echo "$as_me:$LINENO: checking whether dops->d_revalidate() takes struct nameidata" >&5 -$as_echo_n "checking whether dops->d_revalidate() takes struct nameidata... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -41901,20 +44628,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - - int revalidate (struct dentry *dentry, - struct nameidata *nidata) { return 0; } - - static const struct dentry_operations - dops __attribute__ ((unused)) = { - .d_revalidate = revalidate, - }; + #include + struct super_block sb; int main (void) { + char *name = "bdi"; + atomic_long_t zfs_bdi_seq; + int error __attribute__((unused)) = + super_setup_bdi_name(&sb, "%.28s-%ld", name, atomic_long_inc_return(&zfs_bdi_seq)); ; return 0; @@ -41933,7 +44657,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -41944,22 +44668,11 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_D_REVALIDATE_NAMEIDATA 1 -_ACEOF - - + rc=0 else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - + rc=1 fi @@ -41967,10 +44680,13 @@ fi rm -Rf build + if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: checking whether bdi_setup_and_register() wants 2 args" >&5 +$as_echo_n "checking whether bdi_setup_and_register() wants 2 args... " >&6; } - { $as_echo "$as_me:$LINENO: checking whether dentry uses const struct dentry_operations" >&5 -$as_echo_n "checking whether dentry uses const struct dentry_operations... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -41981,19 +44697,16 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - - const struct dentry_operations test_d_op = { - .d_revalidate = NULL, - }; + #include + struct backing_dev_info bdi; int main (void) { - struct dentry d __attribute__ ((unused)); - - d.d_op = &test_d_op; + char *name = "bdi"; + int error __attribute__((unused)) = + bdi_setup_and_register(&bdi, name); ; return 0; @@ -42012,7 +44725,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -42023,22 +44736,11 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CONST_DENTRY_OPERATIONS 1 -_ACEOF - - + rc=0 else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - + rc=1 fi @@ -42046,9 +44748,12 @@ fi rm -Rf build + if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: checking whether truncate_setsize() is available" >&5 -$as_echo_n "checking whether truncate_setsize() is available... " >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: checking whether bdi_setup_and_register() wants 3 args" >&5 +$as_echo_n "checking whether bdi_setup_and_register() wants 3 args... " >&6; } @@ -42060,13 +44765,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + struct backing_dev_info bdi; int main (void) { - truncate_setsize(NULL, 0); + char *name = "bdi"; + unsigned int cap = BDI_CAP_MAP_COPY; + int error __attribute__((unused)) = + bdi_setup_and_register(&bdi, name, cap); ; return 0; @@ -42085,7 +44794,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -42110,19 +44819,19 @@ fi if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } else if test "x$enable_linux_builtin" != xyes; then - grep -q -E '[[:space:]]truncate_setsize[[:space:]]' \ + grep -q -E '[[:space:]]bdi_setup_and_register[[:space:]]' \ $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null rc=$? if test $rc -ne 0; then export=0 - for file in mm/truncate.c; do - grep -q -E "EXPORT_SYMBOL.*(truncate_setsize)" \ + for file in mm/backing-dev.c; do + grep -q -E "EXPORT_SYMBOL.*(bdi_setup_and_register)" \ "$LINUX/$file" 2>/dev/null rc=$? if test $rc -eq 0; then @@ -42142,16 +44851,16 @@ $as_echo "no" >&6; } fi if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } else : - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_TRUNCATE_SETSIZE 1 +#define HAVE_3ARGS_BDI_SETUP_AND_REGISTER 1 _ACEOF @@ -42159,9 +44868,40 @@ _ACEOF fi + else + if test "x$enable_linux_builtin" != xyes; then + + grep -q -E '[[:space:]]bdi_setup_and_register[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in mm/backing-dev.c; do + grep -q -E "EXPORT_SYMBOL.*(bdi_setup_and_register)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi + + fi + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: checking whether bdi_setup_and_register() wants 3 args" >&5 +$as_echo_n "checking whether bdi_setup_and_register() wants 3 args... " >&6; } - { $as_echo "$as_me:$LINENO: checking whether security_inode_init_security wants 6 args" >&5 -$as_echo_n "checking whether security_inode_init_security wants 6 args... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -42172,20 +44912,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + struct backing_dev_info bdi; int main (void) { - struct inode *ip __attribute__ ((unused)) = NULL; - struct inode *dip __attribute__ ((unused)) = NULL; - const struct qstr *str __attribute__ ((unused)) = NULL; - char *name __attribute__ ((unused)) = NULL; - void *value __attribute__ ((unused)) = NULL; - size_t len __attribute__ ((unused)) = 0; - - security_inode_init_security(ip, dip, str, &name, &value, &len); + char *name = "bdi"; + unsigned int cap = BDI_CAP_MAP_COPY; + int error __attribute__((unused)) = + bdi_setup_and_register(&bdi, name, cap); ; return 0; @@ -42204,7 +44941,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -42215,33 +44952,117 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + rc=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + rc=1 - { $as_echo "$as_me:$LINENO: result: yes" >&5 + +fi + + rm -Rf build + + + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + else + if test "x$enable_linux_builtin" != xyes; then + + grep -q -E '[[:space:]]bdi_setup_and_register[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in mm/backing-dev.c; do + grep -q -E "EXPORT_SYMBOL.*(bdi_setup_and_register)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi + + fi + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + else : + + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_6ARGS_SECURITY_INODE_INIT_SECURITY 1 +#define HAVE_3ARGS_BDI_SETUP_AND_REGISTER 1 _ACEOF -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + fi + fi - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + else : + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_2ARGS_BDI_SETUP_AND_REGISTER 1 +_ACEOF + + + fi + fi - rm -Rf build + else + if test "x$enable_linux_builtin" != xyes; then + grep -q -E '[[:space:]]super_setup_bdi_name[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in fs/super.c; do + grep -q -E "EXPORT_SYMBOL.*(super_setup_bdi_name)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi + fi + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: checking whether bdi_setup_and_register() wants 2 args" >&5 +$as_echo_n "checking whether bdi_setup_and_register() wants 2 args... " >&6; } - { $as_echo "$as_me:$LINENO: checking whether security_inode_init_security wants callback" >&5 -$as_echo_n "checking whether security_inode_init_security wants callback... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -42252,18 +45073,16 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + struct backing_dev_info bdi; int main (void) { - struct inode *ip __attribute__ ((unused)) = NULL; - struct inode *dip __attribute__ ((unused)) = NULL; - const struct qstr *str __attribute__ ((unused)) = NULL; - initxattrs func __attribute__ ((unused)) = NULL; - - security_inode_init_security(ip, dip, str, func, NULL); + char *name = "bdi"; + int error __attribute__((unused)) = + bdi_setup_and_register(&bdi, name); ; return 0; @@ -42282,7 +45101,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -42293,22 +45112,11 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CALLBACK_SECURITY_INODE_INIT_SECURITY 1 -_ACEOF - - + rc=0 else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - + rc=1 fi @@ -42316,9 +45124,12 @@ fi rm -Rf build + if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: checking whether mount_nodev() is available" >&5 -$as_echo_n "checking whether mount_nodev() is available... " >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: checking whether bdi_setup_and_register() wants 3 args" >&5 +$as_echo_n "checking whether bdi_setup_and_register() wants 3 args... " >&6; } @@ -42330,13 +45141,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + struct backing_dev_info bdi; int main (void) { - mount_nodev(NULL, 0, NULL, NULL); + char *name = "bdi"; + unsigned int cap = BDI_CAP_MAP_COPY; + int error __attribute__((unused)) = + bdi_setup_and_register(&bdi, name, cap); ; return 0; @@ -42355,7 +45170,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -42380,19 +45195,19 @@ fi if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } else if test "x$enable_linux_builtin" != xyes; then - grep -q -E '[[:space:]]mount_nodev[[:space:]]' \ + grep -q -E '[[:space:]]bdi_setup_and_register[[:space:]]' \ $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null rc=$? if test $rc -ne 0; then export=0 - for file in fs/super.c; do - grep -q -E "EXPORT_SYMBOL.*(mount_nodev)" \ + for file in mm/backing-dev.c; do + grep -q -E "EXPORT_SYMBOL.*(bdi_setup_and_register)" \ "$LINUX/$file" 2>/dev/null rc=$? if test $rc -eq 0; then @@ -42412,16 +45227,16 @@ $as_echo "no" >&6; } fi if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } else : - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_MOUNT_NODEV 1 +#define HAVE_3ARGS_BDI_SETUP_AND_REGISTER 1 _ACEOF @@ -42429,9 +45244,40 @@ _ACEOF fi + else + if test "x$enable_linux_builtin" != xyes; then + + grep -q -E '[[:space:]]bdi_setup_and_register[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in mm/backing-dev.c; do + grep -q -E "EXPORT_SYMBOL.*(bdi_setup_and_register)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi + + fi + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: checking whether bdi_setup_and_register() wants 3 args" >&5 +$as_echo_n "checking whether bdi_setup_and_register() wants 3 args... " >&6; } - { $as_echo "$as_me:$LINENO: checking whether super_block has s_shrink" >&5 -$as_echo_n "checking whether super_block has s_shrink... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -42442,22 +45288,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - - int shrink(struct shrinker *s, struct shrink_control *sc) - { return 0; } - - static const struct super_block - sb __attribute__ ((unused)) = { - .s_shrink.shrink = shrink, - .s_shrink.seeks = DEFAULT_SEEKS, - .s_shrink.batch = 0, - }; + #include + struct backing_dev_info bdi; int main (void) { + char *name = "bdi"; + unsigned int cap = BDI_CAP_MAP_COPY; + int error __attribute__((unused)) = + bdi_setup_and_register(&bdi, name, cap); ; return 0; @@ -42476,7 +45317,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -42487,23 +45328,11 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_SHRINK 1 -_ACEOF - - - + rc=0 else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - + rc=1 fi @@ -42511,159 +45340,88 @@ fi rm -Rf build + if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether shrink_control has nid" >&5 -$as_echo_n "checking whether shrink_control has nid... " >&6; } - - -cat confdefs.h - <<_ACEOF >conftest.c -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - - #include - -int -main (void) -{ - - struct shrink_control sc __attribute__ ((unused)); - unsigned long scnidsize __attribute__ ((unused)) = - sizeof(sc.nid); - - ; - return 0; -} - -_ACEOF - - + else + if test "x$enable_linux_builtin" != xyes; then -cat - <<_ACEOF >conftest.h + grep -q -E '[[:space:]]bdi_setup_and_register[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in mm/backing-dev.c; do + grep -q -E "EXPORT_SYMBOL.*(bdi_setup_and_register)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi -_ACEOF + fi + if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - rm -Rf build && mkdir -p build && touch build/conftest.mod.c - echo "obj-m := conftest.o" >build/Makefile - modpost_flag='' - test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + else : - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define SHRINK_CONTROL_HAS_NID 1 -_ACEOF - - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - - -fi - - rm -Rf build - - - - - { $as_echo "$as_me:$LINENO: checking whether super_block has s_instances list_head" >&5 -$as_echo_n "checking whether super_block has s_instances list_head... " >&6; } - - -cat confdefs.h - <<_ACEOF >conftest.c -/* confdefs.h. */ +#define HAVE_3ARGS_BDI_SETUP_AND_REGISTER 1 _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - #include - -int -main (void) -{ + fi + fi - struct super_block sb __attribute__ ((unused)); - INIT_LIST_HEAD(&sb.s_instances); + else : - ; - return 0; -} + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +cat >>confdefs.h <<\_ACEOF +#define HAVE_2ARGS_BDI_SETUP_AND_REGISTER 1 _ACEOF - -cat - <<_ACEOF >conftest.h - -_ACEOF + fi + fi - rm -Rf build && mkdir -p build && touch build/conftest.mod.c - echo "obj-m := conftest.o" >build/Makefile - modpost_flag='' - test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + else : { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_S_INSTANCES_LIST_HEAD 1 +#define HAVE_SUPER_SETUP_BDI_NAME 1 _ACEOF -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - - -fi - - rm -Rf build + fi + fi - { $as_echo "$as_me:$LINENO: checking whether super_block has s_d_op" >&5 -$as_echo_n "checking whether super_block has s_d_op... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether set_nlink() is available" >&5 +$as_echo_n "checking whether set_nlink() is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -42680,8 +45438,9 @@ int main (void) { - struct super_block sb __attribute__ ((unused)); - sb.s_d_op = NULL; + struct inode node; + unsigned int link = 0; + (void) set_nlink(&node, link); ; return 0; @@ -42700,7 +45459,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -42716,7 +45475,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_S_D_OP 1 +#define HAVE_SET_NLINK 1 _ACEOF @@ -42736,9 +45495,10 @@ fi - { $as_echo "$as_me:$LINENO: checking whether super_setup_bdi_name() exists" >&5 -$as_echo_n "checking whether super_setup_bdi_name() exists... " >&6; } - + { $as_echo "$as_me:$LINENO: checking whether elevator_change() is available" >&5 +$as_echo_n "checking whether elevator_change() is available... " >&6; } + tmp_flags="$EXTRA_KCFLAGS" + EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" cat confdefs.h - <<_ACEOF >conftest.c @@ -42749,17 +45509,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - struct super_block sb; + #include + #include int main (void) { - char *name = "bdi"; - atomic_long_t zfs_bdi_seq; - int error __attribute__((unused)) = - super_setup_bdi_name(&sb, "%.28s-%ld", name, atomic_long_inc_return(&zfs_bdi_seq)); + int ret; + struct request_queue *q = NULL; + char *elevator = NULL; + ret = elevator_change(q, elevator); ; return 0; @@ -42778,7 +45538,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -42789,11 +45549,22 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_ELEVATOR_CHANGE 1 +_ACEOF + + else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + fi @@ -42801,13 +45572,10 @@ fi rm -Rf build - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether bdi_setup_and_register() wants 2 args" >&5 -$as_echo_n "checking whether bdi_setup_and_register() wants 2 args... " >&6; } + EXTRA_KCFLAGS="$tmp_flags" + { $as_echo "$as_me:$LINENO: checking whether sget() wants 5 args" >&5 +$as_echo_n "checking whether sget() wants 5 args... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -42818,16 +45586,18 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - struct backing_dev_info bdi; + #include int main (void) { - char *name = "bdi"; - int error __attribute__((unused)) = - bdi_setup_and_register(&bdi, name); + struct file_system_type *type = NULL; + int (*test)(struct super_block *,void *) = NULL; + int (*set)(struct super_block *,void *) = NULL; + int flags = 0; + void *data = NULL; + (void) sget(type, test, set, flags, data); ; return 0; @@ -42846,7 +45616,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -42857,11 +45627,22 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_5ARG_SGET 1 +_ACEOF + + else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + fi @@ -42869,12 +45650,9 @@ fi rm -Rf build - if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether bdi_setup_and_register() wants 3 args" >&5 -$as_echo_n "checking whether bdi_setup_and_register() wants 3 args... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether lseek_execute() is available" >&5 +$as_echo_n "checking whether lseek_execute() is available... " >&6; } @@ -42886,17 +45664,18 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - struct backing_dev_info bdi; + #include int main (void) { - char *name = "bdi"; - unsigned int cap = BDI_CAP_MAP_COPY; - int error __attribute__((unused)) = - bdi_setup_and_register(&bdi, name, cap); + struct file *fp __attribute__ ((unused)) = NULL; + struct inode *ip __attribute__ ((unused)) = NULL; + loff_t offset __attribute__ ((unused)) = 0; + loff_t maxsize __attribute__ ((unused)) = 0; + + lseek_execute(fp, ip, offset, maxsize); ; return 0; @@ -42915,7 +45694,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -42940,19 +45719,19 @@ fi if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } else if test "x$enable_linux_builtin" != xyes; then - grep -q -E '[[:space:]]bdi_setup_and_register[[:space:]]' \ + grep -q -E '[[:space:]]lseek_exclusive[[:space:]]' \ $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null rc=$? if test $rc -ne 0; then export=0 - for file in mm/backing-dev.c; do - grep -q -E "EXPORT_SYMBOL.*(bdi_setup_and_register)" \ + for file in fs/read_write.c; do + grep -q -E "EXPORT_SYMBOL.*(lseek_exclusive)" \ "$LINUX/$file" 2>/dev/null rc=$? if test $rc -eq 0; then @@ -42972,16 +45751,16 @@ $as_echo "no" >&6; } fi if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } else : - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_3ARGS_BDI_SETUP_AND_REGISTER 1 +#define HAVE_LSEEK_EXECUTE 1 _ACEOF @@ -42989,40 +45768,9 @@ _ACEOF fi - else - if test "x$enable_linux_builtin" != xyes; then - - grep -q -E '[[:space:]]bdi_setup_and_register[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in mm/backing-dev.c; do - grep -q -E "EXPORT_SYMBOL.*(bdi_setup_and_register)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - - fi - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether bdi_setup_and_register() wants 3 args" >&5 -$as_echo_n "checking whether bdi_setup_and_register() wants 3 args... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether fops->iterate_shared() is available" >&5 +$as_echo_n "checking whether fops->iterate_shared() is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -43033,17 +45781,19 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - struct backing_dev_info bdi; + #include + int iterate(struct file *filp, struct dir_context * context) + { return 0; } + + static const struct file_operations fops + __attribute__ ((unused)) = { + .iterate_shared = iterate, + }; int main (void) { - char *name = "bdi"; - unsigned int cap = BDI_CAP_MAP_COPY; - int error __attribute__((unused)) = - bdi_setup_and_register(&bdi, name, cap); ; return 0; @@ -43062,7 +45812,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -43073,117 +45823,24 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 - - -fi - - rm -Rf build - - - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - else - if test "x$enable_linux_builtin" != xyes; then - - grep -q -E '[[:space:]]bdi_setup_and_register[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in mm/backing-dev.c; do - grep -q -E "EXPORT_SYMBOL.*(bdi_setup_and_register)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - - fi - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - else : - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_3ARGS_BDI_SETUP_AND_REGISTER 1 -_ACEOF - - - fi - fi - - - else : - - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_2ARGS_BDI_SETUP_AND_REGISTER 1 +#define HAVE_VFS_ITERATE_SHARED 1 _ACEOF - fi - fi - - - else - if test "x$enable_linux_builtin" != xyes; then - - grep -q -E '[[:space:]]super_setup_bdi_name[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in fs/super.c; do - grep -q -E "EXPORT_SYMBOL.*(super_setup_bdi_name)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - - fi - if test $rc -ne 0; then : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether bdi_setup_and_register() wants 2 args" >&5 -$as_echo_n "checking whether bdi_setup_and_register() wants 2 args... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether fops->iterate() is available" >&5 +$as_echo_n "checking whether fops->iterate() is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -43194,16 +45851,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - struct backing_dev_info bdi; + #include + int iterate(struct file *filp, + struct dir_context *context) { return 0; } + + static const struct file_operations fops + __attribute__ ((unused)) = { + .iterate = iterate, + }; + + #if defined(FMODE_KABI_ITERATE) + #error "RHEL 7.5, FMODE_KABI_ITERATE interface" + #endif int main (void) { - char *name = "bdi"; - int error __attribute__((unused)) = - bdi_setup_and_register(&bdi, name); ; return 0; @@ -43222,7 +45886,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -43233,25 +45897,24 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 - -fi + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } - rm -Rf build +cat >>confdefs.h <<\_ACEOF +#define HAVE_VFS_ITERATE 1 +_ACEOF - if test $rc -ne 0; then : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether bdi_setup_and_register() wants 3 args" >&5 -$as_echo_n "checking whether bdi_setup_and_register() wants 3 args... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether fops->readdir() is available" >&5 +$as_echo_n "checking whether fops->readdir() is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -43262,17 +45925,19 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - struct backing_dev_info bdi; + #include + int readdir(struct file *filp, void *entry, + filldir_t func) { return 0; } + + static const struct file_operations fops + __attribute__ ((unused)) = { + .readdir = readdir, + }; int main (void) { - char *name = "bdi"; - unsigned int cap = BDI_CAP_MAP_COPY; - int error __attribute__((unused)) = - bdi_setup_and_register(&bdi, name, cap); ; return 0; @@ -43291,7 +45956,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -43302,103 +45967,49 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_VFS_READDIR 1 +_ACEOF + + else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 + { { $as_echo "$as_me:$LINENO: error: no; file a bug report with ZoL" >&5 +$as_echo "$as_me: error: no; file a bug report with ZoL" >&2;} + { (exit 1); exit 1; }; } -fi - - rm -Rf build - if test $rc -ne 0; then : +fi - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + rm -Rf build - else - if test "x$enable_linux_builtin" != xyes; then - grep -q -E '[[:space:]]bdi_setup_and_register[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in mm/backing-dev.c; do - grep -q -E "EXPORT_SYMBOL.*(bdi_setup_and_register)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - fi - if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - else : +fi - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + rm -Rf build -cat >>confdefs.h <<\_ACEOF -#define HAVE_3ARGS_BDI_SETUP_AND_REGISTER 1 -_ACEOF - fi - fi - else - if test "x$enable_linux_builtin" != xyes; then +fi - grep -q -E '[[:space:]]bdi_setup_and_register[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in mm/backing-dev.c; do - grep -q -E "EXPORT_SYMBOL.*(bdi_setup_and_register)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi + rm -Rf build - fi - if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether bdi_setup_and_register() wants 3 args" >&5 -$as_echo_n "checking whether bdi_setup_and_register() wants 3 args... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether fops->read/write_iter() are available" >&5 +$as_echo_n "checking whether fops->read/write_iter() are available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -43409,17 +46020,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - struct backing_dev_info bdi; + #include + + ssize_t test_read(struct kiocb *kiocb, struct iov_iter *to) + { return 0; } + ssize_t test_write(struct kiocb *kiocb, struct iov_iter *from) + { return 0; } + + static const struct file_operations + fops __attribute__ ((unused)) = { + .read_iter = test_read, + .write_iter = test_write, + }; int main (void) { - char *name = "bdi"; - unsigned int cap = BDI_CAP_MAP_COPY; - int error __attribute__((unused)) = - bdi_setup_and_register(&bdi, name, cap); ; return 0; @@ -43438,7 +46055,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -43449,100 +46066,113 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_VFS_RW_ITERATE 1 +_ACEOF - rm -Rf build + { $as_echo "$as_me:$LINENO: checking whether new_sync_read/write() are available" >&5 +$as_echo_n "checking whether new_sync_read/write() are available... " >&6; } - if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - else - if test "x$enable_linux_builtin" != xyes; then - grep -q -E '[[:space:]]bdi_setup_and_register[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in mm/backing-dev.c; do - grep -q -E "EXPORT_SYMBOL.*(bdi_setup_and_register)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi + #include - fi - if test $rc -ne 0; then : +int +main (void) +{ - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + ssize_t ret __attribute__ ((unused)); + struct file *filp = NULL; + char __user *rbuf = NULL; + const char __user *wbuf = NULL; + size_t len = 0; + loff_t ppos; - else : + ret = new_sync_read(filp, rbuf, len, &ppos); + ret = new_sync_write(filp, wbuf, len, &ppos); - { $as_echo "$as_me:$LINENO: result: yes" >&5 + ; + return 0; +} + +_ACEOF + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_3ARGS_BDI_SETUP_AND_REGISTER 1 +#define HAVE_NEW_SYNC_READ 1 _ACEOF - fi - fi +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - else : - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_2ARGS_BDI_SETUP_AND_REGISTER 1 -_ACEOF +fi + rm -Rf build - fi - fi - else : - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -cat >>confdefs.h <<\_ACEOF -#define HAVE_SUPER_SETUP_BDI_NAME 1 -_ACEOF + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - fi - fi +fi + rm -Rf build - { $as_echo "$as_me:$LINENO: checking whether set_nlink() is available" >&5 -$as_echo_n "checking whether set_nlink() is available... " >&6; } + + + { $as_echo "$as_me:$LINENO: checking whether generic_write_checks() takes kiocb" >&5 +$as_echo_n "checking whether generic_write_checks() takes kiocb... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -43555,13 +46185,14 @@ cat >>conftest.$ac_ext <<_ACEOF #include + int main (void) { - struct inode node; - unsigned int link = 0; - (void) set_nlink(&node, link); + struct kiocb *iocb = NULL; + struct iov_iter *iov = NULL; + generic_write_checks(iocb, iov); ; return 0; @@ -43580,7 +46211,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -43596,7 +46227,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_SET_NLINK 1 +#define HAVE_GENERIC_WRITE_CHECKS_KIOCB 1 _ACEOF @@ -43616,10 +46247,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether elevator_change() is available" >&5 -$as_echo_n "checking whether elevator_change() is available... " >&6; } - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" + { $as_echo "$as_me:$LINENO: checking whether kmap_atomic wants 1 args" >&5 +$as_echo_n "checking whether kmap_atomic wants 1 args... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -43630,17 +46259,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include + #include int main (void) { - int ret; - struct request_queue *q = NULL; - char *elevator = NULL; - ret = elevator_change(q, elevator); + struct page page; + kmap_atomic(&page); ; return 0; @@ -43659,7 +46285,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -43675,7 +46301,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_ELEVATOR_CHANGE 1 +#define HAVE_1ARG_KMAP_ATOMIC 1 _ACEOF @@ -43693,10 +46319,10 @@ fi rm -Rf build - EXTRA_KCFLAGS="$tmp_flags" - { $as_echo "$as_me:$LINENO: checking whether sget() wants 5 args" >&5 -$as_echo_n "checking whether sget() wants 5 args... " >&6; } + + { $as_echo "$as_me:$LINENO: checking whether follow_down_one() is available" >&5 +$as_echo_n "checking whether follow_down_one() is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -43707,18 +46333,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - struct file_system_type *type = NULL; - int (*test)(struct super_block *,void *) = NULL; - int (*set)(struct super_block *,void *) = NULL; - int flags = 0; - void *data = NULL; - (void) sget(type, test, set, flags, data); + struct path *p = NULL; + follow_down_one(p); ; return 0; @@ -43737,7 +46359,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -43753,7 +46375,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_5ARG_SGET 1 +#define HAVE_FOLLOW_DOWN_ONE 1 _ACEOF @@ -43772,9 +46394,9 @@ fi - { $as_echo "$as_me:$LINENO: checking whether lseek_execute() is available" >&5 -$as_echo_n "checking whether lseek_execute() is available... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether make_request_fn() returns int" >&5 +$as_echo_n "checking whether make_request_fn() returns int... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -43785,18 +46407,18 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + + int make_request(struct request_queue *q, struct bio *bio) + { + return (0); + } int main (void) { - struct file *fp __attribute__ ((unused)) = NULL; - struct inode *ip __attribute__ ((unused)) = NULL; - loff_t offset __attribute__ ((unused)) = 0; - loff_t maxsize __attribute__ ((unused)) = 0; - - lseek_execute(fp, ip, offset, maxsize); + blk_queue_make_request(NULL, &make_request); ; return 0; @@ -43815,7 +46437,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -43826,72 +46448,28 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 - - -fi - - rm -Rf build - - - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - else - if test "x$enable_linux_builtin" != xyes; then - - grep -q -E '[[:space:]]lseek_exclusive[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in fs/read_write.c; do - grep -q -E "EXPORT_SYMBOL.*(lseek_exclusive)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - - fi - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - else : { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_LSEEK_EXECUTE 1 +#define MAKE_REQUEST_FN_RET int _ACEOF - fi - fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_MAKE_REQUEST_FN_RET_INT 1 +_ACEOF +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: checking whether fops->iterate_shared() is available" >&5 -$as_echo_n "checking whether fops->iterate_shared() is available... " >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: checking whether make_request_fn() returns void" >&5 +$as_echo_n "checking whether make_request_fn() returns void... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -43902,19 +46480,18 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - int iterate(struct file *filp, struct dir_context * context) - { return 0; } + #include - static const struct file_operations fops - __attribute__ ((unused)) = { - .iterate_shared = iterate, - }; + void make_request(struct request_queue *q, struct bio *bio) + { + return; + } int main (void) { + blk_queue_make_request(NULL, &make_request); ; return 0; @@ -43933,7 +46510,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -43945,11 +46522,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_VFS_ITERATE_SHARED 1 +#define MAKE_REQUEST_FN_RET void _ACEOF @@ -43957,11 +46534,10 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - - { $as_echo "$as_me:$LINENO: checking whether fops->iterate() is available" >&5 -$as_echo_n "checking whether fops->iterate() is available... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether make_request_fn() returns blk_qc_t" >&5 +$as_echo_n "checking whether make_request_fn() returns blk_qc_t... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -43972,19 +46548,18 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - int iterate(struct file *filp, struct dir_context * context) - { return 0; } + #include - static const struct file_operations fops - __attribute__ ((unused)) = { - .iterate = iterate, - }; + blk_qc_t make_request(struct request_queue *q, struct bio *bio) + { + return (BLK_QC_T_NONE); + } int main (void) { + blk_queue_make_request(NULL, &make_request); ; return 0; @@ -44003,7 +46578,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -44015,11 +46590,16 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_VFS_ITERATE 1 +#define MAKE_REQUEST_FN_RET blk_qc_t +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_MAKE_REQUEST_FN_RET_QC 1 _ACEOF @@ -44027,11 +46607,40 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: no - Please file a bug report at + https://github.com/zfsonlinux/zfs/issues/new" >&5 +$as_echo "$as_me: error: no - Please file a bug report at + https://github.com/zfsonlinux/zfs/issues/new" >&2;} + { (exit 1); exit 1; }; } + + + +fi + + rm -Rf build + + + + + +fi + + rm -Rf build + + + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether 3 arg generic IO accounting symbols are available" >&5 +$as_echo_n "checking whether 3 arg generic IO accounting symbols are available... " >&6; } - { $as_echo "$as_me:$LINENO: checking whether fops->readdir() is available" >&5 -$as_echo_n "checking whether fops->readdir() is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -44042,19 +46651,19 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - int readdir(struct file *filp, void *entry, filldir_t func) - { return 0; } + #include - static const struct file_operations fops - __attribute__ ((unused)) = { - .readdir = readdir, - }; + void (*generic_start_io_acct_f)(int, unsigned long, + struct hd_struct *) = &generic_start_io_acct; + void (*generic_end_io_acct_f)(int, struct hd_struct *, + unsigned long) = &generic_end_io_acct; int main (void) { + generic_start_io_acct(0, 0, NULL); + generic_end_io_acct(0, NULL, 0); ; return 0; @@ -44073,7 +46682,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -44084,23 +46693,11 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_VFS_READDIR 1 -_ACEOF - - + rc=0 else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - { { $as_echo "$as_me:$LINENO: error: no; file a bug report with ZFSOnLinux" >&5 -$as_echo "$as_me: error: no; file a bug report with ZFSOnLinux" >&2;} - { (exit 1); exit 1; }; } - + rc=1 fi @@ -44108,25 +46705,61 @@ fi rm -Rf build + if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + else + if test "x$enable_linux_builtin" != xyes; then -fi + grep -q -E '[[:space:]]generic_start_io_acct[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in block/bio.c; do + grep -q -E "EXPORT_SYMBOL.*(generic_start_io_acct)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi - rm -Rf build + fi + if test $rc -ne 0; then : + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + else : + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +cat >>confdefs.h <<\_ACEOF +#define HAVE_GENERIC_IO_ACCT_3ARG 1 +_ACEOF -fi - rm -Rf build + fi + fi - { $as_echo "$as_me:$LINENO: checking whether fops->read/write_iter() are available" >&5 -$as_echo_n "checking whether fops->read/write_iter() are available... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether 4 arg generic IO accounting symbols are available" >&5 +$as_echo_n "checking whether 4 arg generic IO accounting symbols are available... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.c @@ -44137,23 +46770,19 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - - ssize_t test_read(struct kiocb *kiocb, struct iov_iter *to) - { return 0; } - ssize_t test_write(struct kiocb *kiocb, struct iov_iter *from) - { return 0; } + #include - static const struct file_operations - fops __attribute__ ((unused)) = { - .read_iter = test_read, - .write_iter = test_write, - }; + void (*generic_start_io_acct_f)(struct request_queue *, int, + unsigned long, struct hd_struct *) = &generic_start_io_acct; + void (*generic_end_io_acct_f)(struct request_queue *, int, + struct hd_struct *, unsigned long) = &generic_end_io_acct; int main (void) { + generic_start_io_acct(NULL, 0, 0, NULL); + generic_end_io_acct(NULL, 0, NULL, 0); ; return 0; @@ -44172,7 +46801,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -44183,17 +46812,72 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + rc=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + rc=1 + + +fi + + rm -Rf build + + + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + else + if test "x$enable_linux_builtin" != xyes; then + + grep -q -E '[[:space:]]generic_start_io_acct[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in block/bio.c; do + grep -q -E "EXPORT_SYMBOL.*(generic_start_io_acct)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi + + fi + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + else : { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_VFS_RW_ITERATE 1 +#define HAVE_GENERIC_IO_ACCT_4ARG 1 _ACEOF - { $as_echo "$as_me:$LINENO: checking whether new_sync_read/write() are available" >&5 -$as_echo_n "checking whether new_sync_read/write() are available... " >&6; } + fi + fi + + + + { $as_echo "$as_me:$LINENO: checking whether asm/fpu/api.h exists" >&5 +$as_echo_n "checking whether asm/fpu/api.h exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -44204,21 +46888,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + #include int main (void) { - ssize_t ret __attribute__ ((unused)); - struct file *filp = NULL; - char __user *rbuf = NULL; - const char __user *wbuf = NULL; - size_t len = 0; - loff_t ppos; - - ret = new_sync_read(filp, rbuf, len, &ppos); - ret = new_sync_write(filp, wbuf, len, &ppos); + __kernel_fpu_begin(); ; return 0; @@ -44237,7 +46914,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -44253,7 +46930,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_NEW_SYNC_READ 1 +#define HAVE_FPU_API_H 1 _ACEOF @@ -44273,6 +46950,64 @@ fi + { $as_echo "$as_me:$LINENO: checking whether i_(uid|gid)_(read|write) exist" >&5 +$as_echo_n "checking whether i_(uid|gid)_(read|write) exist... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + +int +main (void) +{ + + struct inode *ip = NULL; + (void) i_uid_read(ip); + + ; + return 0; +} + +_ACEOF + + + +cat - <<_ACEOF >conftest.h + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_KUID_HELPERS 1 +_ACEOF + + else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -44288,8 +47023,9 @@ fi - { $as_echo "$as_me:$LINENO: checking whether generic_write_checks() takes kiocb" >&5 -$as_echo_n "checking whether generic_write_checks() takes kiocb... " >&6; } + + { $as_echo "$as_me:$LINENO: checking whether module_param_call() is hardened" >&5 +$as_echo_n "checking whether module_param_call() is hardened... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -44300,16 +47036,25 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + #include + + int param_get(char *b, const struct kernel_param *kp) + { + return (0); + } + + int param_set(const char *b, const struct kernel_param *kp) + { + return (0); + } + module_param_call(p, param_set, param_get, NULL, 0644); int main (void) { - struct kiocb *iocb = NULL; - struct iov_iter *iov = NULL; - generic_write_checks(iocb, iov); ; return 0; @@ -44328,7 +47073,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -44344,7 +47089,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_GENERIC_WRITE_CHECKS_KIOCB 1 +#define MODULE_PARAM_CALL_CONST 1 _ACEOF @@ -44364,8 +47109,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether kmap_atomic wants 1 args" >&5 -$as_echo_n "checking whether kmap_atomic wants 1 args... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether iops->rename() wants flags" >&5 +$as_echo_n "checking whether iops->rename() wants flags... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -44376,14 +47121,20 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + int rename_fn(struct inode *sip, struct dentry *sdp, + struct inode *tip, struct dentry *tdp, + unsigned int flags) { return 0; } + + static const struct inode_operations + iops __attribute__ ((unused)) = { + .rename = rename_fn, + }; int main (void) { - struct page page; - kmap_atomic(&page); ; return 0; @@ -44402,7 +47153,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -44418,7 +47169,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_1ARG_KMAP_ATOMIC 1 +#define HAVE_RENAME_WANTS_FLAGS 1 _ACEOF @@ -44438,8 +47189,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether follow_down_one() is available" >&5 -$as_echo_n "checking whether follow_down_one() is available... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether generic_setxattr() exists" >&5 +$as_echo_n "checking whether generic_setxattr() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -44450,14 +47201,18 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + #include + + static const struct inode_operations + iops __attribute__ ((unused)) = { + .setxattr = generic_setxattr + }; int main (void) { - struct path *p = NULL; - follow_down_one(p); ; return 0; @@ -44476,7 +47231,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -44492,7 +47247,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_FOLLOW_DOWN_ONE 1 +#define HAVE_GENERIC_SETXATTR 1 _ACEOF @@ -44511,9 +47266,9 @@ fi + { $as_echo "$as_me:$LINENO: checking whether current_time() exists" >&5 +$as_echo_n "checking whether current_time() exists... " >&6; } - { $as_echo "$as_me:$LINENO: checking whether make_request_fn() returns int" >&5 -$as_echo_n "checking whether make_request_fn() returns int... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -44524,18 +47279,16 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - - int make_request(struct request_queue *q, struct bio *bio) - { - return (0); - } + #include int main (void) { - blk_queue_make_request(NULL, &make_request); + struct inode ip; + struct timespec now __attribute__ ((unused)); + + now = current_time(&ip); ; return 0; @@ -44554,7 +47307,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -44565,28 +47318,73 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + rc=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + rc=1 + + +fi + + rm -Rf build + + + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + else + if test "x$enable_linux_builtin" != xyes; then + + grep -q -E '[[:space:]]current_time[[:space:]]' \ + $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null + rc=$? + if test $rc -ne 0; then + export=0 + for file in fs/inode.c; do + grep -q -E "EXPORT_SYMBOL.*(current_time)" \ + "$LINUX/$file" 2>/dev/null + rc=$? + if test $rc -eq 0; then + export=1 + break; + fi + done + if test $export -eq 0; then : + rc=1 + else : + rc=0 + fi + else : + rc=0 + fi + + fi + if test $rc -ne 0; then : + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + else : { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define MAKE_REQUEST_FN_RET int +#define HAVE_CURRENT_TIME 1 _ACEOF -cat >>confdefs.h <<\_ACEOF -#define HAVE_MAKE_REQUEST_FN_RET_INT 1 -_ACEOF + fi + fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether make_request_fn() returns void" >&5 -$as_echo_n "checking whether make_request_fn() returns void... " >&6; } + + { $as_echo "$as_me:$LINENO: checking whether global_node_page_state() exists" >&5 +$as_echo_n "checking whether global_node_page_state() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -44597,18 +47395,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - - void make_request(struct request_queue *q, struct bio *bio) - { - return; - } + #include + #include int main (void) { - blk_queue_make_request(NULL, &make_request); + (void) global_node_page_state(0); ; return 0; @@ -44627,7 +47421,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -44639,11 +47433,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define MAKE_REQUEST_FN_RET void +#define ZFS_GLOBAL_NODE_PAGE_STATE 1 _ACEOF @@ -44651,10 +47445,20 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: checking whether make_request_fn() returns blk_qc_t" >&5 -$as_echo_n "checking whether make_request_fn() returns blk_qc_t... " >&6; } + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether global_zone_page_state() exists" >&5 +$as_echo_n "checking whether global_zone_page_state() exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -44665,18 +47469,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - - blk_qc_t make_request(struct request_queue *q, struct bio *bio) - { - return (BLK_QC_T_NONE); - } + #include + #include int main (void) { - blk_queue_make_request(NULL, &make_request); + (void) global_zone_page_state(0); ; return 0; @@ -44695,7 +47495,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -44707,16 +47507,11 @@ _ACEOF $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define MAKE_REQUEST_FN_RET blk_qc_t -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_MAKE_REQUEST_FN_RET_QC 1 +#define ZFS_GLOBAL_ZONE_PAGE_STATE 1 _ACEOF @@ -44724,11 +47519,8 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { { $as_echo "$as_me:$LINENO: error: no - Please file a bug report at - https://github.com/zfsonlinux/zfs/issues/new" >&5 -$as_echo "$as_me: error: no - Please file a bug report at - https://github.com/zfsonlinux/zfs/issues/new" >&2;} - { (exit 1); exit 1; }; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } @@ -44740,335 +47532,411 @@ fi -fi + { $as_echo "$as_me:$LINENO: checking whether enum node_stat_item contains NR_FILE_PAGES" >&5 +$as_echo_n "checking whether enum node_stat_item contains NR_FILE_PAGES... " >&6; } + if { ac_try='"${srcdir}/scripts/enum-extract.pl" "node_stat_item" "$LINUX/include/linux/mmzone.h" | egrep -qx NR_FILE_PAGES' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then - rm -Rf build + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +cat >>confdefs.h <<\_ACEOF +#define ZFS_ENUM_NODE_STAT_ITEM_NR_FILE_PAGES 1 +_ACEOF + ZFS_ENUM_NODE_STAT_ITEM_NR_FILE_PAGES=1 +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - rm -Rf build - + { $as_echo "$as_me:$LINENO: checking whether enum node_stat_item contains NR_INACTIVE_ANON" >&5 +$as_echo_n "checking whether enum node_stat_item contains NR_INACTIVE_ANON... " >&6; } + if { ac_try='"${srcdir}/scripts/enum-extract.pl" "node_stat_item" "$LINUX/include/linux/mmzone.h" | egrep -qx NR_INACTIVE_ANON' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: checking whether 3 arg generic IO accounting symbols are available" >&5 -$as_echo_n "checking whether 3 arg generic IO accounting symbols are available... " >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +cat >>confdefs.h <<\_ACEOF +#define ZFS_ENUM_NODE_STAT_ITEM_NR_INACTIVE_ANON 1 +_ACEOF + ZFS_ENUM_NODE_STAT_ITEM_NR_INACTIVE_ANON=1 -cat confdefs.h - <<_ACEOF >conftest.c -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } - #include +fi - void (*generic_start_io_acct_f)(int, unsigned long, - struct hd_struct *) = &generic_start_io_acct; - void (*generic_end_io_acct_f)(int, struct hd_struct *, - unsigned long) = &generic_end_io_acct; -int -main (void) -{ - generic_start_io_acct(0, 0, NULL); - generic_end_io_acct(0, NULL, 0); + { $as_echo "$as_me:$LINENO: checking whether enum node_stat_item contains NR_INACTIVE_FILE" >&5 +$as_echo_n "checking whether enum node_stat_item contains NR_INACTIVE_FILE... " >&6; } + if { ac_try='"${srcdir}/scripts/enum-extract.pl" "node_stat_item" "$LINUX/include/linux/mmzone.h" | egrep -qx NR_INACTIVE_FILE' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then - ; - return 0; -} + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +cat >>confdefs.h <<\_ACEOF +#define ZFS_ENUM_NODE_STAT_ITEM_NR_INACTIVE_FILE 1 _ACEOF + ZFS_ENUM_NODE_STAT_ITEM_NR_INACTIVE_FILE=1 +else -cat - <<_ACEOF >conftest.h + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } -_ACEOF +fi - rm -Rf build && mkdir -p build && touch build/conftest.mod.c - echo "obj-m := conftest.o" >build/Makefile - modpost_flag='' - test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + + { $as_echo "$as_me:$LINENO: checking whether enum node_stat_item contains NR_SLAB_RECLAIMABLE" >&5 +$as_echo_n "checking whether enum node_stat_item contains NR_SLAB_RECLAIMABLE... " >&6; } + if { ac_try='"${srcdir}/scripts/enum-extract.pl" "node_stat_item" "$LINUX/include/linux/mmzone.h" | egrep -qx NR_SLAB_RECLAIMABLE' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 - -fi + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } - rm -Rf build +cat >>confdefs.h <<\_ACEOF +#define ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE 1 +_ACEOF + ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE=1 - if test $rc -ne 0; then : +else { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - else - if test "x$enable_linux_builtin" != xyes; then +fi - grep -q -E '[[:space:]]generic_start_io_acct[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in block/bio.c; do - grep -q -E "EXPORT_SYMBOL.*(generic_start_io_acct)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - fi - if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - else : + { $as_echo "$as_me:$LINENO: checking whether enum zone_stat_item contains NR_FILE_PAGES" >&5 +$as_echo_n "checking whether enum zone_stat_item contains NR_FILE_PAGES... " >&6; } + if { ac_try='"${srcdir}/scripts/enum-extract.pl" "zone_stat_item" "$LINUX/include/linux/mmzone.h" | egrep -qx NR_FILE_PAGES' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_GENERIC_IO_ACCT_3ARG 1 +#define ZFS_ENUM_ZONE_STAT_ITEM_NR_FILE_PAGES 1 _ACEOF + ZFS_ENUM_ZONE_STAT_ITEM_NR_FILE_PAGES=1 - fi - fi +else + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi - { $as_echo "$as_me:$LINENO: checking whether 4 arg generic IO accounting symbols are available" >&5 -$as_echo_n "checking whether 4 arg generic IO accounting symbols are available... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether enum zone_stat_item contains NR_INACTIVE_ANON" >&5 +$as_echo_n "checking whether enum zone_stat_item contains NR_INACTIVE_ANON... " >&6; } + if { ac_try='"${srcdir}/scripts/enum-extract.pl" "zone_stat_item" "$LINUX/include/linux/mmzone.h" | egrep -qx NR_INACTIVE_ANON' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -cat confdefs.h - <<_ACEOF >conftest.c -/* confdefs.h. */ +cat >>confdefs.h <<\_ACEOF +#define ZFS_ENUM_ZONE_STAT_ITEM_NR_INACTIVE_ANON 1 _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + ZFS_ENUM_ZONE_STAT_ITEM_NR_INACTIVE_ANON=1 - #include +else - void (*generic_start_io_acct_f)(struct request_queue *, int, - unsigned long, struct hd_struct *) = &generic_start_io_acct; - void (*generic_end_io_acct_f)(struct request_queue *, int, - struct hd_struct *, unsigned long) = &generic_end_io_acct; + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } -int -main (void) -{ +fi - generic_start_io_acct(NULL, 0, 0, NULL); - generic_end_io_acct(NULL, 0, NULL, 0); - ; - return 0; -} + { $as_echo "$as_me:$LINENO: checking whether enum zone_stat_item contains NR_INACTIVE_FILE" >&5 +$as_echo_n "checking whether enum zone_stat_item contains NR_INACTIVE_FILE... " >&6; } + if { ac_try='"${srcdir}/scripts/enum-extract.pl" "zone_stat_item" "$LINUX/include/linux/mmzone.h" | egrep -qx NR_INACTIVE_FILE' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define ZFS_ENUM_ZONE_STAT_ITEM_NR_INACTIVE_FILE 1 _ACEOF + ZFS_ENUM_ZONE_STAT_ITEM_NR_INACTIVE_FILE=1 +else -cat - <<_ACEOF >conftest.h + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } -_ACEOF +fi - rm -Rf build && mkdir -p build && touch build/conftest.mod.c - echo "obj-m := conftest.o" >build/Makefile - modpost_flag='' - test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + + { $as_echo "$as_me:$LINENO: checking whether enum zone_stat_item contains NR_SLAB_RECLAIMABLE" >&5 +$as_echo_n "checking whether enum zone_stat_item contains NR_SLAB_RECLAIMABLE... " >&6; } + if { ac_try='"${srcdir}/scripts/enum-extract.pl" "zone_stat_item" "$LINUX/include/linux/mmzone.h" | egrep -qx NR_SLAB_RECLAIMABLE' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define ZFS_ENUM_ZONE_STAT_ITEM_NR_SLAB_RECLAIMABLE 1 +_ACEOF + + ZFS_ENUM_ZONE_STAT_ITEM_NR_SLAB_RECLAIMABLE=1 + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - rm -Rf build - if test $rc -ne 0; then : - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: checking global_page_state enums are sane" >&5 +$as_echo_n "checking global_page_state enums are sane... " >&6; } + + + enum_check_a="$ZFS_ENUM_NODE_STAT_ITEM_NR_FILE_PAGES" + enum_check_b="$ZFS_ENUM_ZONE_STAT_ITEM_NR_FILE_PAGES" + if test -n "$enum_check_a" -a -n "$enum_check_b"; then + + + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: NR_FILE_PAGES in either node_stat_item or zone_stat_item: DUPLICATE" >&5 +$as_echo "NR_FILE_PAGES in either node_stat_item or zone_stat_item: DUPLICATE" >&6; } + { $as_echo "$as_me:$LINENO: result: configure needs updating, see: config/kernel-global_page_state.m4" >&5 +$as_echo "configure needs updating, see: config/kernel-global_page_state.m4" >&6; } + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } - else - if test "x$enable_linux_builtin" != xyes; then - grep -q -E '[[:space:]]generic_start_io_acct[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in block/bio.c; do - grep -q -E "EXPORT_SYMBOL.*(generic_start_io_acct)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi +fi - fi - if test $rc -ne 0; then : + if test -z "$enum_check_a" -a -z "$enum_check_b"; then - { $as_echo "$as_me:$LINENO: result: no" >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: NR_FILE_PAGES in either node_stat_item or zone_stat_item: NOT FOUND" >&5 +$as_echo "NR_FILE_PAGES in either node_stat_item or zone_stat_item: NOT FOUND" >&6; } + { $as_echo "$as_me:$LINENO: result: configure needs updating, see: config/kernel-global_page_state.m4" >&5 +$as_echo "configure needs updating, see: config/kernel-global_page_state.m4" >&6; } + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } - else : - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } +fi -cat >>confdefs.h <<\_ACEOF -#define HAVE_GENERIC_IO_ACCT_4ARG 1 -_ACEOF - fi - fi + enum_check_a="$ZFS_ENUM_NODE_STAT_ITEM_NR_INACTIVE_ANON" + enum_check_b="$ZFS_ENUM_ZONE_STAT_ITEM_NR_INACTIVE_ANON" + if test -n "$enum_check_a" -a -n "$enum_check_b"; then + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: NR_INACTIVE_ANON in either node_stat_item or zone_stat_item: DUPLICATE" >&5 +$as_echo "NR_INACTIVE_ANON in either node_stat_item or zone_stat_item: DUPLICATE" >&6; } + { $as_echo "$as_me:$LINENO: result: configure needs updating, see: config/kernel-global_page_state.m4" >&5 +$as_echo "configure needs updating, see: config/kernel-global_page_state.m4" >&6; } + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } - { $as_echo "$as_me:$LINENO: checking whether asm/fpu/api.h exists" >&5 -$as_echo_n "checking whether asm/fpu/api.h exists... " >&6; } +fi -cat confdefs.h - <<_ACEOF >conftest.c -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + if test -z "$enum_check_a" -a -z "$enum_check_b"; then - #include - #include + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: NR_INACTIVE_ANON in either node_stat_item or zone_stat_item: NOT FOUND" >&5 +$as_echo "NR_INACTIVE_ANON in either node_stat_item or zone_stat_item: NOT FOUND" >&6; } + { $as_echo "$as_me:$LINENO: result: configure needs updating, see: config/kernel-global_page_state.m4" >&5 +$as_echo "configure needs updating, see: config/kernel-global_page_state.m4" >&6; } + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } -int -main (void) -{ - __kernel_fpu_begin(); +fi - ; - return 0; -} -_ACEOF + enum_check_a="$ZFS_ENUM_NODE_STAT_ITEM_NR_INACTIVE_FILE" + enum_check_b="$ZFS_ENUM_ZONE_STAT_ITEM_NR_INACTIVE_FILE" + if test -n "$enum_check_a" -a -n "$enum_check_b"; then -cat - <<_ACEOF >conftest.h + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: NR_INACTIVE_FILE in either node_stat_item or zone_stat_item: DUPLICATE" >&5 +$as_echo "NR_INACTIVE_FILE in either node_stat_item or zone_stat_item: DUPLICATE" >&6; } + { $as_echo "$as_me:$LINENO: result: configure needs updating, see: config/kernel-global_page_state.m4" >&5 +$as_echo "configure needs updating, see: config/kernel-global_page_state.m4" >&6; } + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } -_ACEOF +fi - rm -Rf build && mkdir -p build && touch build/conftest.mod.c - echo "obj-m := conftest.o" >build/Makefile - modpost_flag='' - test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + if test -z "$enum_check_a" -a -z "$enum_check_b"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_FPU_API_H 1 -_ACEOF + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: NR_INACTIVE_FILE in either node_stat_item or zone_stat_item: NOT FOUND" >&5 +$as_echo "NR_INACTIVE_FILE in either node_stat_item or zone_stat_item: NOT FOUND" >&6; } + { $as_echo "$as_me:$LINENO: result: configure needs updating, see: config/kernel-global_page_state.m4" >&5 +$as_echo "configure needs updating, see: config/kernel-global_page_state.m4" >&6; } + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +fi - { $as_echo "$as_me:$LINENO: result: no" >&5 + + + enum_check_a="$ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE" + enum_check_b="$ZFS_ENUM_ZONE_STAT_ITEM_NR_SLAB_RECLAIMABLE" + if test -n "$enum_check_a" -a -n "$enum_check_b"; then + + + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: NR_SLAB_RECLAIMABLE in either node_stat_item or zone_stat_item: DUPLICATE" >&5 +$as_echo "NR_SLAB_RECLAIMABLE in either node_stat_item or zone_stat_item: DUPLICATE" >&6; } + { $as_echo "$as_me:$LINENO: result: configure needs updating, see: config/kernel-global_page_state.m4" >&5 +$as_echo "configure needs updating, see: config/kernel-global_page_state.m4" >&6; } + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + + +fi + + if test -z "$enum_check_a" -a -z "$enum_check_b"; then + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: NR_SLAB_RECLAIMABLE in either node_stat_item or zone_stat_item: NOT FOUND" >&5 +$as_echo "NR_SLAB_RECLAIMABLE in either node_stat_item or zone_stat_item: NOT FOUND" >&6; } + { $as_echo "$as_me:$LINENO: result: configure needs updating, see: config/kernel-global_page_state.m4" >&5 +$as_echo "configure needs updating, see: config/kernel-global_page_state.m4" >&6; } + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: SHUT 'ER DOWN CLANCY, SHE'S PUMPIN' MUD! +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + fi - rm -Rf build + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } - { $as_echo "$as_me:$LINENO: checking whether i_(uid|gid)_(read|write) exist" >&5 -$as_echo_n "checking whether i_(uid|gid)_(read|write) exist... " >&6; } + + { $as_echo "$as_me:$LINENO: checking whether posix_acl has refcount_t" >&5 +$as_echo_n "checking whether posix_acl has refcount_t... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -45079,14 +47947,16 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + #include + #include int main (void) { - struct inode *ip = NULL; - (void) i_uid_read(ip); + struct posix_acl acl; + refcount_t *r __attribute__ ((unused)) = &acl.a_refcount; ; return 0; @@ -45105,7 +47975,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -45121,7 +47991,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_KUID_HELPERS 1 +#define HAVE_ACL_REFCOUNT 1 _ACEOF @@ -45141,93 +48011,9 @@ fi - { $as_echo "$as_me:$LINENO: checking whether module_param_call() is hardened" >&5 -$as_echo_n "checking whether module_param_call() is hardened... " >&6; } - - -cat confdefs.h - <<_ACEOF >conftest.c -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - - #include - #include - - int param_get(char *b, const struct kernel_param *kp) - { - return (0); - } - - int param_set(const char *b, const struct kernel_param *kp) - { - return (0); - } - - module_param_call(p, param_set, param_get, NULL, 0644); - -int -main (void) -{ - - - ; - return 0; -} - -_ACEOF - - - -cat - <<_ACEOF >conftest.h - -_ACEOF - - - rm -Rf build && mkdir -p build && touch build/conftest.mod.c - echo "obj-m := conftest.o" >build/Makefile - modpost_flag='' - test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define MODULE_PARAM_CALL_CONST 1 -_ACEOF - - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - - -fi - - rm -Rf build - - - - { $as_echo "$as_me:$LINENO: checking whether iops->rename() wants flags" >&5 -$as_echo_n "checking whether iops->rename() wants flags... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether ns_capable exists" >&5 +$as_echo_n "checking whether ns_capable exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -45238,20 +48024,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - int rename_fn(struct inode *sip, struct dentry *sdp, - struct inode *tip, struct dentry *tdp, - unsigned int flags) { return 0; } - - static const struct inode_operations - iops __attribute__ ((unused)) = { - .rename = rename_fn, - }; + #include int main (void) { + ns_capable((struct user_namespace *)NULL, CAP_SYS_ADMIN); ; return 0; @@ -45270,7 +48049,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -45286,7 +48065,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_RENAME_WANTS_FLAGS 1 +#define HAVE_NS_CAPABLE 1 _ACEOF @@ -45306,8 +48085,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether generic_setxattr() exists" >&5 -$as_echo_n "checking whether generic_setxattr() exists... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether cred_t->user_ns exists" >&5 +$as_echo_n "checking whether cred_t->user_ns exists... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -45318,18 +48097,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include - - static const struct inode_operations - iops __attribute__ ((unused)) = { - .setxattr = generic_setxattr - }; + #include int main (void) { + struct cred cr; + cr.user_ns = (struct user_namespace *)NULL; ; return 0; @@ -45348,7 +48123,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -45364,7 +48139,7 @@ _ACEOF $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_GENERIC_SETXATTR 1 +#define HAVE_CRED_USER_NS 1 _ACEOF @@ -45383,9 +48158,9 @@ fi - { $as_echo "$as_me:$LINENO: checking whether current_time() exists" >&5 -$as_echo_n "checking whether current_time() exists... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether kuid_has_mapping/kgid_has_mapping exist" >&5 +$as_echo_n "checking whether kuid_has_mapping/kgid_has_mapping exist... " >&6; } cat confdefs.h - <<_ACEOF >conftest.c @@ -45396,16 +48171,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main (void) { - struct inode ip; - struct timespec now __attribute__ ((unused)); - - now = current_time(&ip); + kuid_has_mapping((struct user_namespace *)NULL, KUIDT_INIT(0)); + kgid_has_mapping((struct user_namespace *)NULL, KGIDT_INIT(0)); ; return 0; @@ -45424,7 +48197,7 @@ _ACEOF echo "obj-m := conftest.o" >build/Makefile modpost_flag='' test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $FRAME_LARGER_THAN $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -45435,128 +48208,12 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rc=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - rc=1 - - -fi - - rm -Rf build - - - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - else - if test "x$enable_linux_builtin" != xyes; then - - grep -q -E '[[:space:]]current_time[[:space:]]' \ - $LINUX_OBJ/$LINUX_SYMBOLS 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in fs/inode.c; do - grep -q -E "EXPORT_SYMBOL.*(current_time)" \ - "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then : - rc=1 - else : - rc=0 - fi - else : - rc=0 - fi - - fi - if test $rc -ne 0; then : - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - - else : { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_CURRENT_TIME 1 -_ACEOF - - - fi - fi - - - - { $as_echo "$as_me:$LINENO: checking whether to use vm_node_stat based fn's" >&5 -$as_echo_n "checking whether to use vm_node_stat based fn's... " >&6; } - - -cat confdefs.h - <<_ACEOF >conftest.c -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - - #include - #include - -int -main (void) -{ - - int a __attribute__ ((unused)) = NR_VM_NODE_STAT_ITEMS; - long x __attribute__ ((unused)) = - atomic_long_read(&vm_node_stat[0]); - (void) global_node_page_state(0); - - ; - return 0; -} - -_ACEOF - - - -cat - <<_ACEOF >conftest.h - -_ACEOF - - - rm -Rf build && mkdir -p build && touch build/conftest.mod.c - echo "obj-m := conftest.o" >build/Makefile - modpost_flag='' - test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage - if { ac_try='cp conftest.c conftest.h build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define ZFS_GLOBAL_NODE_PAGE_STATE 1 +#define HAVE_KUID_HAS_MAPPING 1 _ACEOF @@ -45576,6 +48233,7 @@ fi + if test "$LINUX_OBJ" != "$LINUX"; then KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ" @@ -45622,6 +48280,15 @@ else CONFIG_KERNEL_FALSE= fi + if test "$ZFS_CONFIG" = kernel -o "$ZFS_CONFIG" = all && + test "x$qatsrc" != x ; then + CONFIG_QAT_TRUE= + CONFIG_QAT_FALSE='#' +else + CONFIG_QAT_TRUE='#' + CONFIG_QAT_FALSE= +fi + if test "x$user_libudev" = xyes ; then WANT_DEVNAME2DEVID_TRUE= WANT_DEVNAME2DEVID_FALSE='#' @@ -45630,19 +48297,18 @@ else WANT_DEVNAME2DEVID_FALSE= fi - if test "$ZFS_CONFIG" = kernel -o "$ZFS_CONFIG" = all && - test "x$qatsrc" != x ; then - CONFIG_QAT_TRUE= - CONFIG_QAT_FALSE='#' + if test "x$user_libaio" = xyes ; then + WANT_MMAP_LIBAIO_TRUE= + WANT_MMAP_LIBAIO_FALSE='#' else - CONFIG_QAT_TRUE='#' - CONFIG_QAT_FALSE= + WANT_MMAP_LIBAIO_TRUE='#' + WANT_MMAP_LIBAIO_FALSE= fi - { $as_echo "$as_me:$LINENO: checking whether debugging is enabled" >&5 -$as_echo_n "checking whether debugging is enabled... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether assertion support will be enabled" >&5 +$as_echo_n "checking whether assertion support will be enabled... " >&6; } # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then enableval=$enable_debug; @@ -45651,38 +48317,75 @@ else fi - if test "x$enable_debug" = xyes; then - - KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror" - HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG -Werror" - DEBUG_CFLAGS="-DDEBUG -Werror" - DEBUG_STACKFLAGS="-fstack-check" - DEBUG_ZFS="_with_debug" + case "x$enable_debug" in + "xyes") + KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror" + HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG -Werror" + DEBUG_CFLAGS="-DDEBUG -Werror" + DEBUG_ZFS="_with_debug" cat >>confdefs.h <<\_ACEOF #define ZFS_DEBUG 1 _ACEOF + ;; + "xno") + KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG " + HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG " + DEBUG_CFLAGS="-DNDEBUG" + DEBUG_STACKFLAGS="" + DEBUG_ZFS="_without_debug" + ;; + *) { { $as_echo "$as_me:$LINENO: error: Unknown option $enable_debug" >&5 +$as_echo "$as_me: error: Unknown option $enable_debug" >&2;} + { (exit 1); exit 1; }; } ;; +esac -else - KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG " - HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG " - DEBUG_CFLAGS="-DNDEBUG" - DEBUG_STACKFLAGS="" - DEBUG_ZFS="_without_debug" + + { $as_echo "$as_me:$LINENO: result: $enable_debug" >&5 +$as_echo "$enable_debug" >&6; } + + + { $as_echo "$as_me:$LINENO: checking whether debuginfo support will be forced" >&5 +$as_echo_n "checking whether debuginfo support will be forced... " >&6; } + # Check whether --enable-debuginfo was given. +if test "${enable_debuginfo+set}" = set; then + enableval=$enable_debuginfo; +else + enable_debuginfo=no fi + case "x$enable_debuginfo" in + "xyes") + KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS CONFIG_DEBUG_INFO=y" + KERNELCPPFLAGS="${KERNELCPPFLAGS} -fno-inline" + DEBUG_CFLAGS="${DEBUG_CFLAGS} -g -fno-inline" + ;; + "xkernel") + KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS CONFIG_DEBUG_INFO=y" + KERNELCPPFLAGS="${KERNELCPPFLAGS} -fno-inline" + ;; + "xuser") + DEBUG_CFLAGS="${DEBUG_CFLAGS} -g -fno-inline" + ;; + "xno") : ;; + *) { { $as_echo "$as_me:$LINENO: error: Unknown option $enable_debug" >&5 +$as_echo "$as_me: error: Unknown option $enable_debug" >&2;} + { (exit 1); exit 1; }; } ;; +esac - { $as_echo "$as_me:$LINENO: result: $enable_debug" >&5 -$as_echo "$enable_debug" >&6; } -ac_config_files="$ac_config_files Makefile udev/Makefile udev/rules.d/Makefile etc/Makefile etc/init.d/Makefile etc/zfs/Makefile etc/systemd/Makefile etc/systemd/system/Makefile etc/sudoers.d/Makefile etc/modules-load.d/Makefile man/Makefile man/man1/Makefile man/man5/Makefile man/man8/Makefile lib/Makefile lib/libspl/Makefile lib/libspl/asm-generic/Makefile lib/libspl/asm-i386/Makefile lib/libspl/asm-x86_64/Makefile lib/libspl/include/Makefile lib/libspl/include/ia32/Makefile lib/libspl/include/ia32/sys/Makefile lib/libspl/include/rpc/Makefile lib/libspl/include/sys/Makefile lib/libspl/include/sys/dktp/Makefile lib/libspl/include/util/Makefile lib/libavl/Makefile lib/libefi/Makefile lib/libicp/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzfs/libzfs.pc lib/libzfs/libzfs_core.pc lib/libzfs/Makefile lib/libzfs_core/Makefile lib/libshare/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zhack/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/zstreamdump/Makefile cmd/ztest/Makefile cmd/zpios/Makefile cmd/mount_zfs/Makefile cmd/fsck_zfs/Makefile cmd/zvol_id/Makefile cmd/vdev_id/Makefile cmd/arcstat/Makefile cmd/dbufstat/Makefile cmd/arc_summary/Makefile cmd/zed/Makefile cmd/raidz_test/Makefile cmd/zgenhostid/Makefile contrib/Makefile contrib/bash_completion.d/Makefile contrib/dracut/Makefile contrib/dracut/02zfsexpandknowledge/Makefile contrib/dracut/90zfs/Makefile contrib/initramfs/Makefile module/Makefile module/avl/Makefile module/nvpair/Makefile module/unicode/Makefile module/zcommon/Makefile module/zfs/Makefile module/zpios/Makefile module/icp/Makefile include/Makefile include/linux/Makefile include/sys/Makefile include/sys/fs/Makefile include/sys/fm/Makefile include/sys/fm/fs/Makefile include/sys/crypto/Makefile include/sys/sysevent/Makefile scripts/Makefile scripts/zpios-profile/Makefile scripts/zpios-test/Makefile scripts/zpool-config/Makefile scripts/common.sh tests/Makefile tests/test-runner/Makefile tests/test-runner/cmd/Makefile tests/test-runner/include/Makefile tests/test-runner/man/Makefile tests/runfiles/Makefile tests/zfs-tests/Makefile tests/zfs-tests/callbacks/Makefile tests/zfs-tests/cmd/Makefile tests/zfs-tests/cmd/chg_usr_exec/Makefile tests/zfs-tests/cmd/devname2devid/Makefile tests/zfs-tests/cmd/dir_rd_update/Makefile tests/zfs-tests/cmd/file_check/Makefile tests/zfs-tests/cmd/file_trunc/Makefile tests/zfs-tests/cmd/file_write/Makefile tests/zfs-tests/cmd/largest_file/Makefile tests/zfs-tests/cmd/mkbusy/Makefile tests/zfs-tests/cmd/mkfile/Makefile tests/zfs-tests/cmd/mkfiles/Makefile tests/zfs-tests/cmd/mktree/Makefile tests/zfs-tests/cmd/mmap_exec/Makefile tests/zfs-tests/cmd/mmapwrite/Makefile tests/zfs-tests/cmd/randfree_file/Makefile tests/zfs-tests/cmd/readmmap/Makefile tests/zfs-tests/cmd/rename_dir/Makefile tests/zfs-tests/cmd/rm_lnkcnt_zero_file/Makefile tests/zfs-tests/cmd/threadsappend/Makefile tests/zfs-tests/cmd/xattrtest/Makefile tests/zfs-tests/include/Makefile tests/zfs-tests/include/default.cfg tests/zfs-tests/tests/Makefile tests/zfs-tests/tests/functional/Makefile tests/zfs-tests/tests/functional/acl/Makefile tests/zfs-tests/tests/functional/acl/posix/Makefile tests/zfs-tests/tests/functional/atime/Makefile tests/zfs-tests/tests/functional/bootfs/Makefile tests/zfs-tests/tests/functional/cache/Makefile tests/zfs-tests/tests/functional/cachefile/Makefile tests/zfs-tests/tests/functional/casenorm/Makefile tests/zfs-tests/tests/functional/checksum/Makefile tests/zfs-tests/tests/functional/chattr/Makefile tests/zfs-tests/tests/functional/clean_mirror/Makefile tests/zfs-tests/tests/functional/cli_root/Makefile tests/zfs-tests/tests/functional/cli_root/zdb/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_clone/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_copies/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_create/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_destroy/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_get/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_inherit/Makefile tests/zfs-tests/tests/functional/cli_root/zfs/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_promote/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_property/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_reservation/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_rollback/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_set/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_share/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_unmount/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_unshare/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_add/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_attach/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_destroy/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_detach/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_expand/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_export/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_get/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_history/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_import/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/Makefile tests/zfs-tests/tests/functional/cli_root/zpool/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_offline/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_online/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_remove/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_replace/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_scrub/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_set/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_status/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_sync/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile tests/zfs-tests/tests/functional/cli_user/Makefile tests/zfs-tests/tests/functional/cli_user/misc/Makefile tests/zfs-tests/tests/functional/cli_user/zfs_list/Makefile tests/zfs-tests/tests/functional/cli_user/zpool_iostat/Makefile tests/zfs-tests/tests/functional/cli_user/zpool_list/Makefile tests/zfs-tests/tests/functional/compression/Makefile tests/zfs-tests/tests/functional/ctime/Makefile tests/zfs-tests/tests/functional/delegate/Makefile tests/zfs-tests/tests/functional/devices/Makefile tests/zfs-tests/tests/functional/events/Makefile tests/zfs-tests/tests/functional/exec/Makefile tests/zfs-tests/tests/functional/fault/Makefile tests/zfs-tests/tests/functional/features/async_destroy/Makefile tests/zfs-tests/tests/functional/features/large_dnode/Makefile tests/zfs-tests/tests/functional/features/Makefile tests/zfs-tests/tests/functional/grow_pool/Makefile tests/zfs-tests/tests/functional/grow_replicas/Makefile tests/zfs-tests/tests/functional/history/Makefile tests/zfs-tests/tests/functional/inheritance/Makefile tests/zfs-tests/tests/functional/inuse/Makefile tests/zfs-tests/tests/functional/large_files/Makefile tests/zfs-tests/tests/functional/largest_pool/Makefile tests/zfs-tests/tests/functional/link_count/Makefile tests/zfs-tests/tests/functional/libzfs/Makefile tests/zfs-tests/tests/functional/migration/Makefile tests/zfs-tests/tests/functional/mmap/Makefile tests/zfs-tests/tests/functional/mmp/Makefile tests/zfs-tests/tests/functional/mount/Makefile tests/zfs-tests/tests/functional/mv_files/Makefile tests/zfs-tests/tests/functional/nestedfs/Makefile tests/zfs-tests/tests/functional/no_space/Makefile tests/zfs-tests/tests/functional/nopwrite/Makefile tests/zfs-tests/tests/functional/online_offline/Makefile tests/zfs-tests/tests/functional/pool_names/Makefile tests/zfs-tests/tests/functional/poolversion/Makefile tests/zfs-tests/tests/functional/privilege/Makefile tests/zfs-tests/tests/functional/quota/Makefile tests/zfs-tests/tests/functional/raidz/Makefile tests/zfs-tests/tests/functional/redundancy/Makefile tests/zfs-tests/tests/functional/refquota/Makefile tests/zfs-tests/tests/functional/refreserv/Makefile tests/zfs-tests/tests/functional/rename_dirs/Makefile tests/zfs-tests/tests/functional/replacement/Makefile tests/zfs-tests/tests/functional/reservation/Makefile tests/zfs-tests/tests/functional/rootpool/Makefile tests/zfs-tests/tests/functional/rsend/Makefile tests/zfs-tests/tests/functional/scrub_mirror/Makefile tests/zfs-tests/tests/functional/slog/Makefile tests/zfs-tests/tests/functional/snapshot/Makefile tests/zfs-tests/tests/functional/snapused/Makefile tests/zfs-tests/tests/functional/sparse/Makefile tests/zfs-tests/tests/functional/threadsappend/Makefile tests/zfs-tests/tests/functional/tmpfile/Makefile tests/zfs-tests/tests/functional/truncate/Makefile tests/zfs-tests/tests/functional/userquota/Makefile tests/zfs-tests/tests/functional/upgrade/Makefile tests/zfs-tests/tests/functional/vdev_zaps/Makefile tests/zfs-tests/tests/functional/write_dirs/Makefile tests/zfs-tests/tests/functional/xattr/Makefile tests/zfs-tests/tests/functional/zvol/Makefile tests/zfs-tests/tests/functional/zvol/zvol_cli/Makefile tests/zfs-tests/tests/functional/zvol/zvol_ENOSPC/Makefile tests/zfs-tests/tests/functional/zvol/zvol_misc/Makefile tests/zfs-tests/tests/functional/zvol/zvol_swap/Makefile tests/zfs-tests/tests/perf/Makefile tests/zfs-tests/tests/perf/fio/Makefile tests/zfs-tests/tests/perf/regression/Makefile tests/zfs-tests/tests/perf/scripts/Makefile tests/zfs-tests/tests/stress/Makefile rpm/Makefile rpm/redhat/Makefile rpm/redhat/zfs.spec rpm/redhat/zfs-kmod.spec rpm/redhat/zfs-dkms.spec rpm/generic/Makefile rpm/generic/zfs.spec rpm/generic/zfs-kmod.spec rpm/generic/zfs-dkms.spec zfs-script-config.sh zfs.release" + { $as_echo "$as_me:$LINENO: result: $enable_debuginfo" >&5 +$as_echo "$enable_debuginfo" >&6; } + + +ac_config_files="$ac_config_files Makefile udev/Makefile udev/rules.d/Makefile etc/Makefile etc/init.d/Makefile etc/zfs/Makefile etc/systemd/Makefile etc/systemd/system/Makefile etc/sudoers.d/Makefile etc/modules-load.d/Makefile man/Makefile man/man1/Makefile man/man5/Makefile man/man8/Makefile lib/Makefile lib/libspl/Makefile lib/libspl/asm-generic/Makefile lib/libspl/asm-i386/Makefile lib/libspl/asm-x86_64/Makefile lib/libspl/include/Makefile lib/libspl/include/ia32/Makefile lib/libspl/include/ia32/sys/Makefile lib/libspl/include/rpc/Makefile lib/libspl/include/sys/Makefile lib/libspl/include/sys/dktp/Makefile lib/libspl/include/util/Makefile lib/libavl/Makefile lib/libefi/Makefile lib/libicp/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzfs/libzfs.pc lib/libzfs/libzfs_core.pc lib/libzfs/Makefile lib/libzfs_core/Makefile lib/libshare/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zhack/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/zstreamdump/Makefile cmd/ztest/Makefile cmd/zpios/Makefile cmd/mount_zfs/Makefile cmd/fsck_zfs/Makefile cmd/zvol_id/Makefile cmd/vdev_id/Makefile cmd/arcstat/Makefile cmd/dbufstat/Makefile cmd/arc_summary/Makefile cmd/zed/Makefile cmd/raidz_test/Makefile cmd/zgenhostid/Makefile contrib/Makefile contrib/bash_completion.d/Makefile contrib/dracut/Makefile contrib/dracut/02zfsexpandknowledge/Makefile contrib/dracut/90zfs/Makefile contrib/initramfs/Makefile module/Makefile module/avl/Makefile module/nvpair/Makefile module/unicode/Makefile module/zcommon/Makefile module/zfs/Makefile module/zpios/Makefile module/icp/Makefile include/Makefile include/linux/Makefile include/sys/Makefile include/sys/fs/Makefile include/sys/fm/Makefile include/sys/fm/fs/Makefile include/sys/crypto/Makefile include/sys/sysevent/Makefile scripts/Makefile scripts/zpios-profile/Makefile scripts/zpios-test/Makefile scripts/zpool-config/Makefile scripts/common.sh tests/Makefile tests/test-runner/Makefile tests/test-runner/cmd/Makefile tests/test-runner/include/Makefile tests/test-runner/man/Makefile tests/runfiles/Makefile tests/zfs-tests/Makefile tests/zfs-tests/callbacks/Makefile tests/zfs-tests/cmd/Makefile tests/zfs-tests/cmd/chg_usr_exec/Makefile tests/zfs-tests/cmd/user_ns_exec/Makefile tests/zfs-tests/cmd/devname2devid/Makefile tests/zfs-tests/cmd/dir_rd_update/Makefile tests/zfs-tests/cmd/file_check/Makefile tests/zfs-tests/cmd/file_trunc/Makefile tests/zfs-tests/cmd/file_write/Makefile tests/zfs-tests/cmd/largest_file/Makefile tests/zfs-tests/cmd/mkbusy/Makefile tests/zfs-tests/cmd/mkfile/Makefile tests/zfs-tests/cmd/mkfiles/Makefile tests/zfs-tests/cmd/mktree/Makefile tests/zfs-tests/cmd/mmap_exec/Makefile tests/zfs-tests/cmd/mmap_libaio/Makefile tests/zfs-tests/cmd/mmapwrite/Makefile tests/zfs-tests/cmd/randfree_file/Makefile tests/zfs-tests/cmd/readmmap/Makefile tests/zfs-tests/cmd/rename_dir/Makefile tests/zfs-tests/cmd/rm_lnkcnt_zero_file/Makefile tests/zfs-tests/cmd/threadsappend/Makefile tests/zfs-tests/cmd/xattrtest/Makefile tests/zfs-tests/include/Makefile tests/zfs-tests/include/default.cfg tests/zfs-tests/tests/Makefile tests/zfs-tests/tests/functional/Makefile tests/zfs-tests/tests/functional/acl/Makefile tests/zfs-tests/tests/functional/acl/posix/Makefile tests/zfs-tests/tests/functional/atime/Makefile tests/zfs-tests/tests/functional/bootfs/Makefile tests/zfs-tests/tests/functional/cache/Makefile tests/zfs-tests/tests/functional/cachefile/Makefile tests/zfs-tests/tests/functional/casenorm/Makefile tests/zfs-tests/tests/functional/checksum/Makefile tests/zfs-tests/tests/functional/chattr/Makefile tests/zfs-tests/tests/functional/clean_mirror/Makefile tests/zfs-tests/tests/functional/cli_root/Makefile tests/zfs-tests/tests/functional/cli_root/zdb/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_clone/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_copies/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_create/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_destroy/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_get/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_inherit/Makefile tests/zfs-tests/tests/functional/cli_root/zfs/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_promote/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_property/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_reservation/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_rollback/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_set/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_share/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_unmount/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_unshare/Makefile tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_add/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_attach/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_destroy/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_detach/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_expand/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_export/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_get/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_history/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_import/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/Makefile tests/zfs-tests/tests/functional/cli_root/zpool/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_offline/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_online/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_remove/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_replace/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_scrub/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_set/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_status/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_sync/Makefile tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile tests/zfs-tests/tests/functional/cli_user/Makefile tests/zfs-tests/tests/functional/cli_user/misc/Makefile tests/zfs-tests/tests/functional/cli_user/zfs_list/Makefile tests/zfs-tests/tests/functional/cli_user/zpool_iostat/Makefile tests/zfs-tests/tests/functional/cli_user/zpool_list/Makefile tests/zfs-tests/tests/functional/compression/Makefile tests/zfs-tests/tests/functional/ctime/Makefile tests/zfs-tests/tests/functional/delegate/Makefile tests/zfs-tests/tests/functional/devices/Makefile tests/zfs-tests/tests/functional/events/Makefile tests/zfs-tests/tests/functional/exec/Makefile tests/zfs-tests/tests/functional/fault/Makefile tests/zfs-tests/tests/functional/features/async_destroy/Makefile tests/zfs-tests/tests/functional/features/large_dnode/Makefile tests/zfs-tests/tests/functional/features/Makefile tests/zfs-tests/tests/functional/grow_pool/Makefile tests/zfs-tests/tests/functional/grow_replicas/Makefile tests/zfs-tests/tests/functional/history/Makefile tests/zfs-tests/tests/functional/inheritance/Makefile tests/zfs-tests/tests/functional/inuse/Makefile tests/zfs-tests/tests/functional/large_files/Makefile tests/zfs-tests/tests/functional/largest_pool/Makefile tests/zfs-tests/tests/functional/link_count/Makefile tests/zfs-tests/tests/functional/libzfs/Makefile tests/zfs-tests/tests/functional/migration/Makefile tests/zfs-tests/tests/functional/mmap/Makefile tests/zfs-tests/tests/functional/mmp/Makefile tests/zfs-tests/tests/functional/mount/Makefile tests/zfs-tests/tests/functional/mv_files/Makefile tests/zfs-tests/tests/functional/nestedfs/Makefile tests/zfs-tests/tests/functional/no_space/Makefile tests/zfs-tests/tests/functional/nopwrite/Makefile tests/zfs-tests/tests/functional/online_offline/Makefile tests/zfs-tests/tests/functional/pool_names/Makefile tests/zfs-tests/tests/functional/poolversion/Makefile tests/zfs-tests/tests/functional/privilege/Makefile tests/zfs-tests/tests/functional/quota/Makefile tests/zfs-tests/tests/functional/raidz/Makefile tests/zfs-tests/tests/functional/redundancy/Makefile tests/zfs-tests/tests/functional/refquota/Makefile tests/zfs-tests/tests/functional/refreserv/Makefile tests/zfs-tests/tests/functional/rename_dirs/Makefile tests/zfs-tests/tests/functional/replacement/Makefile tests/zfs-tests/tests/functional/reservation/Makefile tests/zfs-tests/tests/functional/rootpool/Makefile tests/zfs-tests/tests/functional/rsend/Makefile tests/zfs-tests/tests/functional/scrub_mirror/Makefile tests/zfs-tests/tests/functional/slog/Makefile tests/zfs-tests/tests/functional/snapshot/Makefile tests/zfs-tests/tests/functional/snapused/Makefile tests/zfs-tests/tests/functional/sparse/Makefile tests/zfs-tests/tests/functional/threadsappend/Makefile tests/zfs-tests/tests/functional/tmpfile/Makefile tests/zfs-tests/tests/functional/truncate/Makefile tests/zfs-tests/tests/functional/user_namespace/Makefile tests/zfs-tests/tests/functional/userquota/Makefile tests/zfs-tests/tests/functional/upgrade/Makefile tests/zfs-tests/tests/functional/vdev_zaps/Makefile tests/zfs-tests/tests/functional/write_dirs/Makefile tests/zfs-tests/tests/functional/xattr/Makefile tests/zfs-tests/tests/functional/zvol/Makefile tests/zfs-tests/tests/functional/zvol/zvol_cli/Makefile tests/zfs-tests/tests/functional/zvol/zvol_ENOSPC/Makefile tests/zfs-tests/tests/functional/zvol/zvol_misc/Makefile tests/zfs-tests/tests/functional/zvol/zvol_swap/Makefile tests/zfs-tests/tests/perf/Makefile tests/zfs-tests/tests/perf/fio/Makefile tests/zfs-tests/tests/perf/regression/Makefile tests/zfs-tests/tests/perf/scripts/Makefile tests/zfs-tests/tests/stress/Makefile rpm/Makefile rpm/redhat/Makefile rpm/redhat/zfs.spec rpm/redhat/zfs-kmod.spec rpm/redhat/zfs-dkms.spec rpm/generic/Makefile rpm/generic/zfs.spec rpm/generic/zfs-kmod.spec rpm/generic/zfs-dkms.spec zfs-script-config.sh zfs.release" @@ -45819,6 +48522,13 @@ $as_echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${CODE_COVERAGE_ENABLED_TRUE}" && test -z "${CODE_COVERAGE_ENABLED_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"CODE_COVERAGE_ENABLED\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"CODE_COVERAGE_ENABLED\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${TARGET_ASM_X86_64_TRUE}" && test -z "${TARGET_ASM_X86_64_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"TARGET_ASM_X86_64\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -45854,6 +48564,13 @@ $as_echo "$as_me: error: conditional \"CONFIG_KERNEL\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${CONFIG_QAT_TRUE}" && test -z "${CONFIG_QAT_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"CONFIG_QAT\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"CONFIG_QAT\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${WANT_DEVNAME2DEVID_TRUE}" && test -z "${WANT_DEVNAME2DEVID_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"WANT_DEVNAME2DEVID\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -45861,10 +48578,10 @@ $as_echo "$as_me: error: conditional \"WANT_DEVNAME2DEVID\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${CONFIG_QAT_TRUE}" && test -z "${CONFIG_QAT_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"CONFIG_QAT\" was never defined. +if test -z "${WANT_MMAP_LIBAIO_TRUE}" && test -z "${WANT_MMAP_LIBAIO_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"WANT_MMAP_LIBAIO\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"CONFIG_QAT\" was never defined. +$as_echo "$as_me: error: conditional \"WANT_MMAP_LIBAIO\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -46190,7 +48907,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by zfs $as_me 0.7.6, which was +This file was extended by zfs $as_me 0.7.9, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -46253,7 +48970,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -zfs config.status 0.7.6 +zfs config.status 0.7.9 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -46728,6 +49445,7 @@ do "tests/zfs-tests/callbacks/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/callbacks/Makefile" ;; "tests/zfs-tests/cmd/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/cmd/Makefile" ;; "tests/zfs-tests/cmd/chg_usr_exec/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/cmd/chg_usr_exec/Makefile" ;; + "tests/zfs-tests/cmd/user_ns_exec/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/cmd/user_ns_exec/Makefile" ;; "tests/zfs-tests/cmd/devname2devid/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/cmd/devname2devid/Makefile" ;; "tests/zfs-tests/cmd/dir_rd_update/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/cmd/dir_rd_update/Makefile" ;; "tests/zfs-tests/cmd/file_check/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/cmd/file_check/Makefile" ;; @@ -46739,6 +49457,7 @@ do "tests/zfs-tests/cmd/mkfiles/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/cmd/mkfiles/Makefile" ;; "tests/zfs-tests/cmd/mktree/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/cmd/mktree/Makefile" ;; "tests/zfs-tests/cmd/mmap_exec/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/cmd/mmap_exec/Makefile" ;; + "tests/zfs-tests/cmd/mmap_libaio/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/cmd/mmap_libaio/Makefile" ;; "tests/zfs-tests/cmd/mmapwrite/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/cmd/mmapwrite/Makefile" ;; "tests/zfs-tests/cmd/randfree_file/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/cmd/randfree_file/Makefile" ;; "tests/zfs-tests/cmd/readmmap/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/cmd/readmmap/Makefile" ;; @@ -46859,6 +49578,7 @@ do "tests/zfs-tests/tests/functional/threadsappend/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/tests/functional/threadsappend/Makefile" ;; "tests/zfs-tests/tests/functional/tmpfile/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/tests/functional/tmpfile/Makefile" ;; "tests/zfs-tests/tests/functional/truncate/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/tests/functional/truncate/Makefile" ;; + "tests/zfs-tests/tests/functional/user_namespace/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/tests/functional/user_namespace/Makefile" ;; "tests/zfs-tests/tests/functional/userquota/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/tests/functional/userquota/Makefile" ;; "tests/zfs-tests/tests/functional/upgrade/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/tests/functional/upgrade/Makefile" ;; "tests/zfs-tests/tests/functional/vdev_zaps/Makefile") CONFIG_FILES="$CONFIG_FILES tests/zfs-tests/tests/functional/vdev_zaps/Makefile" ;; diff --git a/configure.ac b/configure.ac index 0c7977ef..d9441a0f 100644 --- a/configure.ac +++ b/configure.ac @@ -50,11 +50,13 @@ AC_PROG_CC AC_PROG_LIBTOOL AM_PROG_AS AM_PROG_CC_C_O +AX_CODE_COVERAGE ZFS_AC_LICENSE ZFS_AC_PACKAGE ZFS_AC_CONFIG ZFS_AC_DEBUG +ZFS_AC_DEBUGINFO AC_CONFIG_FILES([ Makefile @@ -151,6 +153,7 @@ AC_CONFIG_FILES([ tests/zfs-tests/callbacks/Makefile tests/zfs-tests/cmd/Makefile tests/zfs-tests/cmd/chg_usr_exec/Makefile + tests/zfs-tests/cmd/user_ns_exec/Makefile tests/zfs-tests/cmd/devname2devid/Makefile tests/zfs-tests/cmd/dir_rd_update/Makefile tests/zfs-tests/cmd/file_check/Makefile @@ -162,6 +165,7 @@ AC_CONFIG_FILES([ tests/zfs-tests/cmd/mkfiles/Makefile tests/zfs-tests/cmd/mktree/Makefile tests/zfs-tests/cmd/mmap_exec/Makefile + tests/zfs-tests/cmd/mmap_libaio/Makefile tests/zfs-tests/cmd/mmapwrite/Makefile tests/zfs-tests/cmd/randfree_file/Makefile tests/zfs-tests/cmd/readmmap/Makefile @@ -282,6 +286,7 @@ AC_CONFIG_FILES([ tests/zfs-tests/tests/functional/threadsappend/Makefile tests/zfs-tests/tests/functional/tmpfile/Makefile tests/zfs-tests/tests/functional/truncate/Makefile + tests/zfs-tests/tests/functional/user_namespace/Makefile tests/zfs-tests/tests/functional/userquota/Makefile tests/zfs-tests/tests/functional/upgrade/Makefile tests/zfs-tests/tests/functional/vdev_zaps/Makefile diff --git a/contrib/Makefile.in b/contrib/Makefile.in index 938274f5..4152bc25 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -40,6 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -55,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -83,14 +86,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -102,7 +109,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -118,9 +124,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -131,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -215,6 +221,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -226,6 +238,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -241,6 +254,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -254,9 +269,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -275,6 +291,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/contrib/bash_completion.d/Makefile.in b/contrib/bash_completion.d/Makefile.in index c0126dc2..c699fde7 100644 --- a/contrib/bash_completion.d/Makefile.in +++ b/contrib/bash_completion.d/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -178,6 +184,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -189,6 +201,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -204,6 +217,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -217,9 +232,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -238,6 +254,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/contrib/dracut/02zfsexpandknowledge/Makefile.in b/contrib/dracut/02zfsexpandknowledge/Makefile.in index 522527ae..136630fd 100644 --- a/contrib/dracut/02zfsexpandknowledge/Makefile.in +++ b/contrib/dracut/02zfsexpandknowledge/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -200,6 +206,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -211,6 +223,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -226,6 +239,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -239,9 +254,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -260,6 +276,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/contrib/dracut/90zfs/Makefile.in b/contrib/dracut/90zfs/Makefile.in index 8cb99185..bf080358 100644 --- a/contrib/dracut/90zfs/Makefile.in +++ b/contrib/dracut/90zfs/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -200,6 +206,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -211,6 +223,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -226,6 +239,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -239,9 +254,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -260,6 +276,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/contrib/dracut/90zfs/mount-zfs.sh.in b/contrib/dracut/90zfs/mount-zfs.sh.in index e7f21773..2c6020a4 100755 --- a/contrib/dracut/90zfs/mount-zfs.sh.in +++ b/contrib/dracut/90zfs/mount-zfs.sh.in @@ -34,6 +34,7 @@ info "ZFS: No sysroot.mount exists or zfs-generator did not extend it." info "ZFS: Mounting root with the traditional mount-zfs.sh instead." # Delay until all required block devices are present. +modprobe zfs 2>/dev/null udevadm settle if [ "${root}" = "zfs:AUTO" ] ; then diff --git a/contrib/dracut/Makefile.in b/contrib/dracut/Makefile.in index 05eca630..84650bb8 100644 --- a/contrib/dracut/Makefile.in +++ b/contrib/dracut/Makefile.in @@ -40,6 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -55,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -83,14 +86,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -102,7 +109,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -118,9 +124,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -131,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -216,6 +222,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -227,6 +239,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -242,6 +255,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -255,9 +270,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -276,6 +292,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am index 998e588a..b2294082 100644 --- a/contrib/initramfs/Makefile.am +++ b/contrib/initramfs/Makefile.am @@ -1,8 +1,10 @@ initrddir = $(datarootdir)/initramfs-tools -initrd_SCRIPTS = conf-hooks.d/zfs hooks/zfs scripts/zfs scripts/local-top/zfs +initrd_SCRIPTS = \ + conf.d/zfs conf-hooks.d/zfs hooks/zfs scripts/zfs scripts/local-top/zfs EXTRA_DIST = \ + $(top_srcdir)/contrib/initramfs/conf.d/zfs \ $(top_srcdir)/contrib/initramfs/conf-hooks.d/zfs \ $(top_srcdir)/contrib/initramfs/hooks/zfs \ $(top_srcdir)/contrib/initramfs/scripts/zfs \ @@ -10,7 +12,7 @@ EXTRA_DIST = \ $(top_srcdir)/contrib/initramfs/README.initramfs.markdown install-initrdSCRIPTS: $(EXTRA_DIST) - for d in conf-hooks.d hooks scripts scripts/local-top; do \ + for d in conf.d conf-hooks.d hooks scripts scripts/local-top; do \ $(MKDIR_P) $(DESTDIR)$(initrddir)/$$d; \ cp $(top_srcdir)/contrib/initramfs/$$d/zfs \ $(DESTDIR)$(initrddir)/$$d/; \ diff --git a/contrib/initramfs/Makefile.in b/contrib/initramfs/Makefile.in index 890eb931..707c12e1 100644 --- a/contrib/initramfs/Makefile.in +++ b/contrib/initramfs/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -200,6 +206,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -211,6 +223,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -226,6 +239,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -239,9 +254,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -260,6 +276,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -387,8 +404,11 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ initrddir = $(datarootdir)/initramfs-tools -initrd_SCRIPTS = conf-hooks.d/zfs hooks/zfs scripts/zfs scripts/local-top/zfs +initrd_SCRIPTS = \ + conf.d/zfs conf-hooks.d/zfs hooks/zfs scripts/zfs scripts/local-top/zfs + EXTRA_DIST = \ + $(top_srcdir)/contrib/initramfs/conf.d/zfs \ $(top_srcdir)/contrib/initramfs/conf-hooks.d/zfs \ $(top_srcdir)/contrib/initramfs/hooks/zfs \ $(top_srcdir)/contrib/initramfs/scripts/zfs \ @@ -594,7 +614,7 @@ uninstall-am: uninstall-initrdSCRIPTS install-initrdSCRIPTS: $(EXTRA_DIST) - for d in conf-hooks.d hooks scripts scripts/local-top; do \ + for d in conf.d conf-hooks.d hooks scripts scripts/local-top; do \ $(MKDIR_P) $(DESTDIR)$(initrddir)/$$d; \ cp $(top_srcdir)/contrib/initramfs/$$d/zfs \ $(DESTDIR)$(initrddir)/$$d/; \ diff --git a/contrib/initramfs/conf.d/zfs b/contrib/initramfs/conf.d/zfs new file mode 100644 index 00000000..c67d75ba --- /dev/null +++ b/contrib/initramfs/conf.d/zfs @@ -0,0 +1,8 @@ +for x in $(cat /proc/cmdline) +do + case $x in + root=ZFS=*|root=zfs:*) + BOOT=zfs + ;; + esac +done diff --git a/contrib/initramfs/scripts/zfs b/contrib/initramfs/scripts/zfs index 8770a2e8..86329e76 100644 --- a/contrib/initramfs/scripts/zfs +++ b/contrib/initramfs/scripts/zfs @@ -478,7 +478,7 @@ destroy_fs() echo "Message: $ZFS_STDERR" echo "Error: $ZFS_ERROR" echo "" - echo "Failed to destroy '$fs'. Please make sure that '$fs' is not availible." + echo "Failed to destroy '$fs'. Please make sure that '$fs' is not available." echo "Hint: Try: zfs destroy -Rfn $fs" echo "If this dryrun looks good, then remove the 'n' from '-Rfn' and try again." /bin/sh diff --git a/etc/Makefile.in b/etc/Makefile.in index 5341767d..68c0f6ed 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -40,6 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -55,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -83,14 +86,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -102,7 +109,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -118,9 +124,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -131,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -215,6 +221,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -226,6 +238,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -241,6 +254,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -254,9 +269,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -275,6 +291,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/etc/init.d/Makefile.in b/etc/init.d/Makefile.in index 4c48dbc5..2da83465 100644 --- a/etc/init.d/Makefile.in +++ b/etc/init.d/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/etc/init.d/zfs-import.in b/etc/init.d/zfs-import.in old mode 100755 new mode 100644 diff --git a/etc/init.d/zfs-mount.in b/etc/init.d/zfs-mount.in old mode 100755 new mode 100644 diff --git a/etc/init.d/zfs-share.in b/etc/init.d/zfs-share.in old mode 100755 new mode 100644 diff --git a/etc/init.d/zfs-zed.in b/etc/init.d/zfs-zed.in old mode 100755 new mode 100644 diff --git a/etc/modules-load.d/Makefile.in b/etc/modules-load.d/Makefile.in index 6a000a16..0c4bffd8 100644 --- a/etc/modules-load.d/Makefile.in +++ b/etc/modules-load.d/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -200,6 +206,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -211,6 +223,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -226,6 +239,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -239,9 +254,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -260,6 +276,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/etc/sudoers.d/Makefile.in b/etc/sudoers.d/Makefile.in index 6d2a81d3..8f7db870 100644 --- a/etc/sudoers.d/Makefile.in +++ b/etc/sudoers.d/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -200,6 +206,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -211,6 +223,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -226,6 +239,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -239,9 +254,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -260,6 +276,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/etc/systemd/Makefile.in b/etc/systemd/Makefile.in index 99e88be8..8717f233 100644 --- a/etc/systemd/Makefile.in +++ b/etc/systemd/Makefile.in @@ -40,6 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -55,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -83,14 +86,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -102,7 +109,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -118,9 +124,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -131,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -216,6 +222,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -227,6 +239,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -242,6 +255,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -255,9 +270,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -276,6 +292,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/etc/systemd/system/Makefile.in b/etc/systemd/system/Makefile.in index f6528c77..f4561cbc 100644 --- a/etc/systemd/system/Makefile.in +++ b/etc/systemd/system/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/etc/systemd/system/zfs-import-cache.service.in b/etc/systemd/system/zfs-import-cache.service.in index 9d677f8d..726c468c 100644 --- a/etc/systemd/system/zfs-import-cache.service.in +++ b/etc/systemd/system/zfs-import-cache.service.in @@ -12,7 +12,7 @@ ConditionPathExists=@sysconfdir@/zfs/zpool.cache [Service] Type=oneshot RemainAfterExit=yes -ExecStartPre=/sbin/modprobe zfs +ExecStartPre=-/sbin/modprobe zfs ExecStart=@sbindir@/zpool import -c @sysconfdir@/zfs/zpool.cache -aN [Install] diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in index 227f5b74..abc8e8e6 100644 --- a/etc/systemd/system/zfs-import-scan.service.in +++ b/etc/systemd/system/zfs-import-scan.service.in @@ -11,7 +11,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache [Service] Type=oneshot RemainAfterExit=yes -ExecStartPre=/sbin/modprobe zfs +ExecStartPre=-/sbin/modprobe zfs ExecStart=@sbindir@/zpool import -aN -o cachefile=none [Install] diff --git a/etc/zfs/Makefile.in b/etc/zfs/Makefile.in index 6babfb7a..0a5edcbe 100644 --- a/etc/zfs/Makefile.in +++ b/etc/zfs/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -200,6 +206,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -211,6 +223,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -226,6 +239,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -239,9 +254,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -260,6 +276,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/include/Makefile.in b/include/Makefile.in index b87e28e7..38fffc73 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -263,6 +269,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -274,6 +286,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -289,6 +302,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -302,9 +317,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -323,6 +339,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/include/libzfs.h b/include/libzfs.h index 147589bb..945bd5b8 100644 --- a/include/libzfs.h +++ b/include/libzfs.h @@ -331,6 +331,7 @@ typedef enum { ZPOOL_STATUS_HOSTID_REQUIRED, /* multihost=on and hostid=0 */ ZPOOL_STATUS_IO_FAILURE_WAIT, /* failed I/O, failmode 'wait' */ ZPOOL_STATUS_IO_FAILURE_CONTINUE, /* failed I/O, failmode 'continue' */ + ZPOOL_STATUS_IO_FAILURE_MMP, /* failed MMP, failmode not 'panic' */ ZPOOL_STATUS_BAD_LOG, /* cannot read log chain(s) */ ZPOOL_STATUS_ERRATA, /* informational errata available */ diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am index 9bb0b349..89c2689f 100644 --- a/include/linux/Makefile.am +++ b/include/linux/Makefile.am @@ -9,7 +9,8 @@ KERNEL_H = \ $(top_srcdir)/include/linux/kmap_compat.h \ $(top_srcdir)/include/linux/simd_x86.h \ $(top_srcdir)/include/linux/simd_aarch64.h \ - $(top_srcdir)/include/linux/mod_compat.h + $(top_srcdir)/include/linux/mod_compat.h \ + $(top_srcdir)/include/linux/page_compat.h USER_H = diff --git a/include/linux/Makefile.in b/include/linux/Makefile.in index 04d50ec8..c6be1a7b 100644 --- a/include/linux/Makefile.in +++ b/include/linux/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -169,7 +175,8 @@ am__kernel_HEADERS_DIST = $(top_srcdir)/include/linux/dcache_compat.h \ $(top_srcdir)/include/linux/kmap_compat.h \ $(top_srcdir)/include/linux/simd_x86.h \ $(top_srcdir)/include/linux/simd_aarch64.h \ - $(top_srcdir)/include/linux/mod_compat.h + $(top_srcdir)/include/linux/mod_compat.h \ + $(top_srcdir)/include/linux/page_compat.h am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -212,6 +219,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -223,6 +236,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -238,6 +252,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -251,9 +267,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -272,6 +289,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -408,7 +426,8 @@ KERNEL_H = \ $(top_srcdir)/include/linux/kmap_compat.h \ $(top_srcdir)/include/linux/simd_x86.h \ $(top_srcdir)/include/linux/simd_aarch64.h \ - $(top_srcdir)/include/linux/mod_compat.h + $(top_srcdir)/include/linux/mod_compat.h \ + $(top_srcdir)/include/linux/page_compat.h USER_H = EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) diff --git a/include/linux/blkdev_compat.h b/include/linux/blkdev_compat.h index c8a8e856..f99980ab 100644 --- a/include/linux/blkdev_compat.h +++ b/include/linux/blkdev_compat.h @@ -37,6 +37,22 @@ typedef unsigned __bitwise__ fmode_t; #endif /* HAVE_FMODE_T */ +#ifndef HAVE_BLK_QUEUE_FLAG_SET +static inline void +blk_queue_flag_set(unsigned int flag, struct request_queue *q) +{ + queue_flag_set(flag, q); +} +#endif + +#ifndef HAVE_BLK_QUEUE_FLAG_CLEAR +static inline void +blk_queue_flag_clear(unsigned int flag, struct request_queue *q) +{ + queue_flag_clear(flag, q); +} +#endif + /* * 4.7 - 4.x API, * The blk_queue_write_cache() interface has replaced blk_queue_flush() @@ -56,16 +72,14 @@ static inline void blk_queue_set_write_cache(struct request_queue *q, bool wc, bool fua) { #if defined(HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY) - spin_lock_irq(q->queue_lock); if (wc) - queue_flag_set(QUEUE_FLAG_WC, q); + blk_queue_flag_set(QUEUE_FLAG_WC, q); else - queue_flag_clear(QUEUE_FLAG_WC, q); + blk_queue_flag_clear(QUEUE_FLAG_WC, q); if (fua) - queue_flag_set(QUEUE_FLAG_FUA, q); + blk_queue_flag_set(QUEUE_FLAG_FUA, q); else - queue_flag_clear(QUEUE_FLAG_FUA, q); - spin_unlock_irq(q->queue_lock); + blk_queue_flag_clear(QUEUE_FLAG_FUA, q); #elif defined(HAVE_BLK_QUEUE_WRITE_CACHE) blk_queue_write_cache(q, wc, fua); #elif defined(HAVE_BLK_QUEUE_FLUSH_GPL_ONLY) @@ -139,6 +153,14 @@ blk_queue_set_read_ahead(struct request_queue *q, unsigned long ra_pages) #endif } +#ifndef HAVE_GET_DISK_AND_MODULE +static inline struct kobject * +get_disk_and_module(struct gendisk *disk) +{ + return (get_disk(disk)); +} +#endif + #ifndef HAVE_GET_DISK_RO static inline int get_disk_ro(struct gendisk *disk) diff --git a/include/linux/page_compat.h b/include/linux/page_compat.h new file mode 100644 index 00000000..95acb7d5 --- /dev/null +++ b/include/linux/page_compat.h @@ -0,0 +1,78 @@ +#ifndef _ZFS_PAGE_COMPAT_H +#define _ZFS_PAGE_COMPAT_H + +/* + * We have various enum members moving between two separate enum types, + * and accessed by different functions at various times. Centralise the + * insanity. + * + * < v4.8: all enums in zone_stat_item, via global_page_state() + * v4.8: some enums moved to node_stat_item, global_node_page_state() introduced + * v4.13: some enums moved from zone_stat_item to node_state_item + * v4.14: global_page_state() rename to global_zone_page_state() + * + * The defines used here are created by config/kernel-global_page_state.m4 + */ + +/* + * Create our own accessor functions to follow the Linux API changes + */ +#if defined(ZFS_GLOBAL_ZONE_PAGE_STATE) + +/* global_zone_page_state() introduced */ +#if defined(ZFS_ENUM_NODE_STAT_ITEM_NR_FILE_PAGES) +#define nr_file_pages() global_node_page_state(NR_FILE_PAGES) +#else +#define nr_file_pages() global_zone_page_state(NR_FILE_PAGES) +#endif +#if defined(ZFS_ENUM_NODE_STAT_ITEM_NR_INACTIVE_ANON) +#define nr_inactive_anon_pages() global_node_page_state(NR_INACTIVE_ANON) +#else +#define nr_inactive_anon_pages() global_zone_page_state(NR_INACTIVE_ANON) +#endif +#if defined(ZFS_ENUM_NODE_STAT_ITEM_NR_INACTIVE_FILE) +#define nr_inactive_file_pages() global_node_page_state(NR_INACTIVE_FILE) +#else +#define nr_inactive_file_pages() global_zone_page_state(NR_INACTIVE_FILE) +#endif +#if defined(ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE) +#define nr_slab_reclaimable_pages() global_node_page_state(NR_SLAB_RECLAIMABLE) +#else +#define nr_slab_reclaimable_pages() global_zone_page_state(NR_SLAB_RECLAIMABLE) +#endif + +#elif defined(ZFS_GLOBAL_NODE_PAGE_STATE) + +/* global_node_page_state() introduced */ +#if defined(ZFS_ENUM_NODE_STAT_ITEM_NR_FILE_PAGES) +#define nr_file_pages() global_node_page_state(NR_FILE_PAGES) +#else +#define nr_file_pages() global_page_state(NR_FILE_PAGES) +#endif +#if defined(ZFS_ENUM_NODE_STAT_ITEM_NR_INACTIVE_ANON) +#define nr_inactive_anon_pages() global_node_page_state(NR_INACTIVE_ANON) +#else +#define nr_inactive_anon_pages() global_page_state(NR_INACTIVE_ANON) +#endif +#if defined(ZFS_ENUM_NODE_STAT_ITEM_NR_INACTIVE_FILE) +#define nr_inactive_file_pages() global_node_page_state(NR_INACTIVE_FILE) +#else +#define nr_inactive_file_pages() global_page_state(NR_INACTIVE_FILE) +#endif +#if defined(ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE) +#define nr_slab_reclaimable_pages() global_node_page_state(NR_SLAB_RECLAIMABLE) +#else +#define nr_slab_reclaimable_pages() global_page_state(NR_SLAB_RECLAIMABLE) +#endif + +#else + +/* global_page_state() only */ +#define nr_file_pages() global_page_state(NR_FILE_PAGES) +#define nr_inactive_anon_pages() global_page_state(NR_INACTIVE_ANON) +#define nr_inactive_file_pages() global_page_state(NR_INACTIVE_FILE) +#define nr_slab_reclaimable_pages() global_page_state(NR_SLAB_RECLAIMABLE) + +#endif /* ZFS_GLOBAL_ZONE_PAGE_STATE */ + +#endif /* _ZFS_PAGE_COMPAT_H */ diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h index 6111f0af..c8203bd5 100644 --- a/include/linux/vfs_compat.h +++ b/include/linux/vfs_compat.h @@ -182,6 +182,30 @@ zpl_bdi_destroy(struct super_block *sb) } #endif +/* + * 4.14 adds SB_* flag definitions, define them to MS_* equivalents + * if not set. + */ +#ifndef SB_RDONLY +#define SB_RDONLY MS_RDONLY +#endif + +#ifndef SB_SILENT +#define SB_SILENT MS_SILENT +#endif + +#ifndef SB_ACTIVE +#define SB_ACTIVE MS_ACTIVE +#endif + +#ifndef SB_POSIXACL +#define SB_POSIXACL MS_POSIXACL +#endif + +#ifndef SB_MANDLOCK +#define SB_MANDLOCK MS_MANDLOCK +#endif + /* * 2.6.38 API change, * LOOKUP_RCU flag introduced to distinguish rcu-walk from ref-walk cases. @@ -272,6 +296,10 @@ lseek_execute( * This is several orders of magnitude larger than expected grace period. * At 60 seconds the kernel will also begin issuing RCU stall warnings. */ +#ifdef refcount_t +#undef refcount_t +#endif + #include #if defined(HAVE_POSIX_ACL_RELEASE) && !defined(HAVE_POSIX_ACL_RELEASE_GPL_ONLY) @@ -284,9 +312,13 @@ zpl_posix_acl_release(struct posix_acl *acl) { if ((acl == NULL) || (acl == ACL_NOT_CACHED)) return; - +#ifdef HAVE_ACL_REFCOUNT + if (refcount_dec_and_test(&acl->a_refcount)) + zpl_posix_acl_release_impl(acl); +#else if (atomic_dec_and_test(&acl->a_refcount)) zpl_posix_acl_release_impl(acl); +#endif } #endif /* HAVE_POSIX_ACL_RELEASE */ @@ -397,6 +429,8 @@ typedef mode_t zpl_equivmode_t; #define zpl_posix_acl_valid(ip, acl) posix_acl_valid(acl) #endif +#define refcount_t zfs_refcount_t + #endif /* CONFIG_FS_POSIX_ACL */ /* @@ -578,4 +612,18 @@ current_time(struct inode *ip) } #endif +/* + * 4.16 API change + * Added iversion interface for managing inode version field. + */ +#ifdef HAVE_INODE_SET_IVERSION +#include +#else +static inline void +inode_set_iversion(struct inode *ip, u64 val) +{ + ip->i_version = val; +} +#endif + #endif /* _ZFS_VFS_H */ diff --git a/include/sys/Makefile.in b/include/sys/Makefile.in index ad33cf68..477307ef 100644 --- a/include/sys/Makefile.in +++ b/include/sys/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -469,6 +475,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -480,6 +492,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -495,6 +508,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -508,9 +523,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -529,6 +545,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/include/sys/crypto/Makefile.in b/include/sys/crypto/Makefile.in index 1e11ce5b..c709bdbe 100644 --- a/include/sys/crypto/Makefile.in +++ b/include/sys/crypto/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -209,6 +215,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -220,6 +232,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -235,6 +248,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -248,9 +263,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -269,6 +285,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/include/sys/fm/Makefile.in b/include/sys/fm/Makefile.in index 20e67780..84311950 100644 --- a/include/sys/fm/Makefile.in +++ b/include/sys/fm/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -245,6 +251,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -256,6 +268,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -271,6 +284,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -284,9 +299,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -305,6 +321,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/include/sys/fm/fs/Makefile.in b/include/sys/fm/fs/Makefile.in index 5bcd0363..4d921627 100644 --- a/include/sys/fm/fs/Makefile.in +++ b/include/sys/fm/fs/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -205,6 +211,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -216,6 +228,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -231,6 +244,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -244,9 +259,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -265,6 +281,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/include/sys/fs/Makefile.in b/include/sys/fs/Makefile.in index b035b010..3566cad5 100644 --- a/include/sys/fs/Makefile.in +++ b/include/sys/fs/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -205,6 +211,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -216,6 +228,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -231,6 +244,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -244,9 +259,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -265,6 +281,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h index 13b25a69..b7912313 100644 --- a/include/sys/fs/zfs.h +++ b/include/sys/fs/zfs.h @@ -638,6 +638,7 @@ typedef struct zpool_rewind_policy { #define ZPOOL_CONFIG_RESILVER_TXG "resilver_txg" #define ZPOOL_CONFIG_COMMENT "comment" #define ZPOOL_CONFIG_SUSPENDED "suspended" /* not stored on disk */ +#define ZPOOL_CONFIG_SUSPENDED_REASON "suspended_reason" /* not stored */ #define ZPOOL_CONFIG_TIMESTAMP "timestamp" /* not stored on disk */ #define ZPOOL_CONFIG_BOOTFS "bootfs" /* not stored on disk */ #define ZPOOL_CONFIG_MISSING_DEVICES "missing_vdevs" /* not stored on disk */ diff --git a/include/sys/mmp.h b/include/sys/mmp.h index 5b2fea1a..c99c124e 100644 --- a/include/sys/mmp.h +++ b/include/sys/mmp.h @@ -42,6 +42,8 @@ typedef struct mmp_thread { uint64_t mmp_delay; /* decaying avg ns between MMP writes */ uberblock_t mmp_ub; /* last ub written by sync */ zio_t *mmp_zio_root; /* root of mmp write zios */ + uint64_t mmp_kstat_id; /* unique id for next MMP write kstat */ + int mmp_skip_error; /* reason for last skipped write */ } mmp_thread_t; diff --git a/include/sys/spa.h b/include/sys/spa.h index 67235871..3b268419 100644 --- a/include/sys/spa.h +++ b/include/sys/spa.h @@ -759,8 +759,12 @@ extern txg_stat_t *spa_txg_history_init_io(spa_t *, uint64_t, struct dsl_pool *); extern void spa_txg_history_fini_io(spa_t *, txg_stat_t *); extern void spa_tx_assign_add_nsecs(spa_t *spa, uint64_t nsecs); -extern void spa_mmp_history_add(uint64_t txg, uint64_t timestamp, - uint64_t mmp_delay, vdev_t *vd, int label); +extern int spa_mmp_history_set_skip(spa_t *spa, uint64_t mmp_kstat_id); +extern int spa_mmp_history_set(spa_t *spa, uint64_t mmp_kstat_id, int io_error, + hrtime_t duration); +extern void *spa_mmp_history_add(spa_t *spa, uint64_t txg, uint64_t timestamp, + uint64_t mmp_delay, vdev_t *vd, int label, uint64_t mmp_kstat_id, + int error); /* Pool configuration locks */ extern int spa_config_tryenter(spa_t *spa, int locks, void *tag, krw_t rw); diff --git a/include/sys/spa_impl.h b/include/sys/spa_impl.h index 06de2442..b1e78c1d 100644 --- a/include/sys/spa_impl.h +++ b/include/sys/spa_impl.h @@ -233,7 +233,7 @@ struct spa { zio_t *spa_suspend_zio_root; /* root of all suspended I/O */ kmutex_t spa_suspend_lock; /* protects suspend_zio_root */ kcondvar_t spa_suspend_cv; /* notification of resume */ - uint8_t spa_suspended; /* pool is suspended */ + zio_suspend_reason_t spa_suspended; /* pool is suspended */ uint8_t spa_claiming; /* pool is doing zil_claim() */ boolean_t spa_debug; /* debug enabled? */ boolean_t spa_is_root; /* pool is root */ @@ -275,6 +275,7 @@ struct spa { spa_stats_t spa_stats; /* assorted spa statistics */ hrtime_t spa_ccw_fail_time; /* Conf cache write fail time */ taskq_t *spa_zvol_taskq; /* Taskq for minor management */ + taskq_t *spa_prefetch_taskq; /* Taskq for prefetch threads */ uint64_t spa_multihost; /* multihost aware (mmp) */ mmp_thread_t spa_mmp; /* multihost mmp thread */ diff --git a/include/sys/sysevent/Makefile.in b/include/sys/sysevent/Makefile.in index 005659a5..685890b0 100644 --- a/include/sys/sysevent/Makefile.in +++ b/include/sys/sysevent/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -209,6 +215,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -220,6 +232,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -235,6 +248,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -248,9 +263,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -269,6 +285,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/include/sys/trace_acl.h b/include/sys/trace_acl.h index 1057e560..610bbe29 100644 --- a/include/sys/trace_acl.h +++ b/include/sys/trace_acl.h @@ -68,7 +68,6 @@ DECLARE_EVENT_CLASS(zfs_ace_class, __field(uint32_t, i_gid) __field(unsigned long, i_ino) __field(unsigned int, i_nlink) - __field(u64, i_version) __field(loff_t, i_size) __field(unsigned int, i_blkbits) __field(unsigned short, i_bytes) @@ -103,7 +102,6 @@ DECLARE_EVENT_CLASS(zfs_ace_class, __entry->i_gid = KGID_TO_SGID(ZTOI(zn)->i_gid); __entry->i_ino = zn->z_inode.i_ino; __entry->i_nlink = zn->z_inode.i_nlink; - __entry->i_version = zn->z_inode.i_version; __entry->i_size = zn->z_inode.i_size; __entry->i_blkbits = zn->z_inode.i_blkbits; __entry->i_bytes = zn->z_inode.i_bytes; @@ -121,7 +119,7 @@ DECLARE_EVENT_CLASS(zfs_ace_class, "mapcnt %llu size %llu pflags %llu " "sync_cnt %u mode 0x%x is_sa %d " "is_mapped %d is_ctldir %d is_stale %d inode { " - "uid %u gid %u ino %lu nlink %u version %llu size %lli " + "uid %u gid %u ino %lu nlink %u size %lli " "blkbits %u bytes %u mode 0x%x generation %x } } " "ace { type %u flags %u access_mask %u } mask_matched %u", __entry->z_id, __entry->z_unlinked, __entry->z_atime_dirty, @@ -131,7 +129,7 @@ DECLARE_EVENT_CLASS(zfs_ace_class, __entry->z_is_sa, __entry->z_is_mapped, __entry->z_is_ctldir, __entry->z_is_stale, __entry->i_uid, __entry->i_gid, __entry->i_ino, __entry->i_nlink, - __entry->i_version, __entry->i_size, __entry->i_blkbits, + __entry->i_size, __entry->i_blkbits, __entry->i_bytes, __entry->i_mode, __entry->i_generation, __entry->z_type, __entry->z_flags, __entry->z_access_mask, __entry->mask_matched) diff --git a/include/sys/vdev_impl.h b/include/sys/vdev_impl.h index 4c2e3cd2..4f9f1a90 100644 --- a/include/sys/vdev_impl.h +++ b/include/sys/vdev_impl.h @@ -238,6 +238,7 @@ struct vdev { vdev_aux_t vdev_label_aux; /* on-disk aux state */ uint64_t vdev_leaf_zap; hrtime_t vdev_mmp_pending; /* 0 if write finished */ + uint64_t vdev_mmp_kstat_id; /* to find kstat entry */ /* * For DTrace to work in userland (libzpool) context, these fields must @@ -254,8 +255,6 @@ struct vdev { * We rate limit ZIO delay and ZIO checksum events, since they * can flood ZED with tons of events when a drive is acting up. */ -#define DELAYS_PER_SECOND 5 -#define CHECKSUMS_PER_SECOND 5 zfs_ratelimit_t vdev_delay_rl; zfs_ratelimit_t vdev_checksum_rl; }; diff --git a/include/sys/zfs_ratelimit.h b/include/sys/zfs_ratelimit.h index f36e0784..012825fa 100644 --- a/include/sys/zfs_ratelimit.h +++ b/include/sys/zfs_ratelimit.h @@ -25,13 +25,19 @@ typedef struct { hrtime_t start; unsigned int count; - unsigned int burst; /* Number to allow per interval */ - unsigned int interval; /* Interval length in seconds */ + + /* + * Pointer to number of events per interval. We do this to + * allow the burst to be a (changeable) module parameter. + */ + unsigned int *burst; + + unsigned int interval; /* Interval length in seconds */ kmutex_t lock; } zfs_ratelimit_t; int zfs_ratelimit(zfs_ratelimit_t *rl); -void zfs_ratelimit_init(zfs_ratelimit_t *rl, unsigned int burst, +void zfs_ratelimit_init(zfs_ratelimit_t *rl, unsigned int *burst, unsigned int interval); void zfs_ratelimit_fini(zfs_ratelimit_t *rl); diff --git a/include/sys/zfs_vnops.h b/include/sys/zfs_vnops.h index f2f4d13f..767cba10 100644 --- a/include/sys/zfs_vnops.h +++ b/include/sys/zfs_vnops.h @@ -54,7 +54,7 @@ extern int zfs_mkdir(struct inode *dip, char *dirname, vattr_t *vap, struct inode **ipp, cred_t *cr, int flags, vsecattr_t *vsecp); extern int zfs_rmdir(struct inode *dip, char *name, struct inode *cwd, cred_t *cr, int flags); -extern int zfs_readdir(struct inode *ip, struct dir_context *ctx, cred_t *cr); +extern int zfs_readdir(struct inode *ip, zpl_dir_context_t *ctx, cred_t *cr); extern int zfs_fsync(struct inode *ip, int syncflag, cred_t *cr); extern int zfs_getattr(struct inode *ip, vattr_t *vap, int flag, cred_t *cr); extern int zfs_getattr_fast(struct inode *ip, struct kstat *sp); diff --git a/include/sys/zio.h b/include/sys/zio.h index 4eaabc38..4b0eecc2 100644 --- a/include/sys/zio.h +++ b/include/sys/zio.h @@ -144,6 +144,12 @@ enum zio_checksum { #define ZIO_FAILURE_MODE_CONTINUE 1 #define ZIO_FAILURE_MODE_PANIC 2 +typedef enum zio_suspend_reason { + ZIO_SUSPEND_NONE = 0, + ZIO_SUSPEND_IOERR, + ZIO_SUSPEND_MMP, +} zio_suspend_reason_t; + enum zio_flag { /* * Flags inherited by gang, ddt, and vdev children, @@ -215,6 +221,9 @@ enum zio_flag { (((zio)->io_flags & ZIO_FLAG_VDEV_INHERIT) | \ ZIO_FLAG_CANFAIL) +#define ZIO_CHILD_BIT(x) (1 << (x)) +#define ZIO_CHILD_BIT_IS_SET(val, x) ((val) & (1 << (x))) + enum zio_child { ZIO_CHILD_VDEV = 0, ZIO_CHILD_GANG, @@ -223,6 +232,14 @@ enum zio_child { ZIO_CHILD_TYPES }; +#define ZIO_CHILD_VDEV_BIT ZIO_CHILD_BIT(ZIO_CHILD_VDEV) +#define ZIO_CHILD_GANG_BIT ZIO_CHILD_BIT(ZIO_CHILD_GANG) +#define ZIO_CHILD_DDT_BIT ZIO_CHILD_BIT(ZIO_CHILD_DDT) +#define ZIO_CHILD_LOGICAL_BIT ZIO_CHILD_BIT(ZIO_CHILD_LOGICAL) +#define ZIO_CHILD_ALL_BITS \ + (ZIO_CHILD_VDEV_BIT | ZIO_CHILD_GANG_BIT | \ + ZIO_CHILD_DDT_BIT | ZIO_CHILD_LOGICAL_BIT) + enum zio_wait_type { ZIO_WAIT_READY = 0, ZIO_WAIT_DONE, @@ -566,7 +583,7 @@ extern enum zio_checksum zio_checksum_dedup_select(spa_t *spa, extern enum zio_compress zio_compress_select(spa_t *spa, enum zio_compress child, enum zio_compress parent); -extern void zio_suspend(spa_t *spa, zio_t *zio); +extern void zio_suspend(spa_t *spa, zio_t *zio, zio_suspend_reason_t); extern int zio_resume(spa_t *spa); extern void zio_resume_wait(spa_t *spa); diff --git a/include/sys/zpl.h b/include/sys/zpl.h index 1f97f251..65ed4313 100644 --- a/include/sys/zpl.h +++ b/include/sys/zpl.h @@ -125,56 +125,63 @@ extern const struct inode_operations zpl_ops_shares; #if defined(HAVE_VFS_ITERATE) || defined(HAVE_VFS_ITERATE_SHARED) -#define DIR_CONTEXT_INIT(_dirent, _actor, _pos) { \ +#define ZPL_DIR_CONTEXT_INIT(_dirent, _actor, _pos) { \ .actor = _actor, \ .pos = _pos, \ } +typedef struct dir_context zpl_dir_context_t; + +#define zpl_dir_emit dir_emit +#define zpl_dir_emit_dot dir_emit_dot +#define zpl_dir_emit_dotdot dir_emit_dotdot +#define zpl_dir_emit_dots dir_emit_dots + #else -typedef struct dir_context { +typedef struct zpl_dir_context { void *dirent; const filldir_t actor; loff_t pos; -} dir_context_t; +} zpl_dir_context_t; -#define DIR_CONTEXT_INIT(_dirent, _actor, _pos) { \ +#define ZPL_DIR_CONTEXT_INIT(_dirent, _actor, _pos) { \ .dirent = _dirent, \ .actor = _actor, \ .pos = _pos, \ } static inline bool -dir_emit(struct dir_context *ctx, const char *name, int namelen, +zpl_dir_emit(zpl_dir_context_t *ctx, const char *name, int namelen, uint64_t ino, unsigned type) { return (!ctx->actor(ctx->dirent, name, namelen, ctx->pos, ino, type)); } static inline bool -dir_emit_dot(struct file *file, struct dir_context *ctx) +zpl_dir_emit_dot(struct file *file, zpl_dir_context_t *ctx) { return (ctx->actor(ctx->dirent, ".", 1, ctx->pos, file_inode(file)->i_ino, DT_DIR) == 0); } static inline bool -dir_emit_dotdot(struct file *file, struct dir_context *ctx) +zpl_dir_emit_dotdot(struct file *file, zpl_dir_context_t *ctx) { return (ctx->actor(ctx->dirent, "..", 2, ctx->pos, parent_ino(file_dentry(file)), DT_DIR) == 0); } static inline bool -dir_emit_dots(struct file *file, struct dir_context *ctx) +zpl_dir_emit_dots(struct file *file, zpl_dir_context_t *ctx) { if (ctx->pos == 0) { - if (!dir_emit_dot(file, ctx)) + if (!zpl_dir_emit_dot(file, ctx)) return (false); ctx->pos = 1; } if (ctx->pos == 1) { - if (!dir_emit_dotdot(file, ctx)) + if (!zpl_dir_emit_dotdot(file, ctx)) return (false); ctx->pos = 2; } diff --git a/lib/Makefile.in b/lib/Makefile.in index 41361f73..0b9611d2 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -40,6 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -55,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -83,14 +86,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -102,7 +109,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -118,9 +124,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -131,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -216,6 +222,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -227,6 +239,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -242,6 +255,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -255,9 +270,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -276,6 +292,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/lib/libavl/Makefile.in b/lib/libavl/Makefile.in index 715e8bd4..8d4c0e00 100644 --- a/lib/libavl/Makefile.in +++ b/lib/libavl/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -399,15 +416,15 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 $(DEBUG_STACKFLAGS) \ - $(FRAME_LARGER_THAN) + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) \ + $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) noinst_LTLIBRARIES = libavl.la USER_C = KERNEL_C = \ diff --git a/lib/libefi/Makefile.in b/lib/libefi/Makefile.in index 438f6ced..2afede48 100644 --- a/lib/libefi/Makefile.in +++ b/lib/libefi/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -209,6 +215,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -220,6 +232,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -235,6 +248,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -248,9 +263,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -269,6 +285,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -400,15 +417,15 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 $(DEBUG_STACKFLAGS) \ - $(FRAME_LARGER_THAN) + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) \ + $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) noinst_LTLIBRARIES = libefi.la USER_C = \ rdwr_efi.c diff --git a/lib/libefi/rdwr_efi.c b/lib/libefi/rdwr_efi.c index e9fb15ee..7935047e 100644 --- a/lib/libefi/rdwr_efi.c +++ b/lib/libefi/rdwr_efi.c @@ -300,6 +300,20 @@ efi_get_info(int fd, struct dk_cinfo *dki_info) rval = sscanf(dev_path, "/dev/loop%[0-9]p%hu", dki_info->dki_dname + 4, &dki_info->dki_partition); + } else if ((strncmp(dev_path, "/dev/nvme", 9) == 0)) { + strcpy(dki_info->dki_cname, "nvme"); + dki_info->dki_ctype = DKC_SCSI_CCS; + strcpy(dki_info->dki_dname, "nvme"); + (void) sscanf(dev_path, "/dev/nvme%[0-9]", + dki_info->dki_dname + 4); + size_t controller_length = strlen( + dki_info->dki_dname); + strcpy(dki_info->dki_dname + controller_length, + "n"); + rval = sscanf(dev_path, + "/dev/nvme%*[0-9]n%[0-9]p%hu", + dki_info->dki_dname + controller_length + 1, + &dki_info->dki_partition); } else { strcpy(dki_info->dki_dname, "unknown"); strcpy(dki_info->dki_cname, "unknown"); diff --git a/lib/libicp/Makefile.in b/lib/libicp/Makefile.in index 8a202555..1838c76f 100644 --- a/lib/libicp/Makefile.in +++ b/lib/libicp/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -240,6 +246,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -251,6 +263,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -266,6 +279,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -279,9 +294,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -300,6 +316,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -432,15 +449,15 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 $(DEBUG_STACKFLAGS) \ - $(FRAME_LARGER_THAN) + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) \ + $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) noinst_LTLIBRARIES = libicp.la @TARGET_ASM_GENERIC_TRUE@ASM_SOURCES_C = @TARGET_ASM_I386_TRUE@ASM_SOURCES_C = diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in index e3df9000..a027d176 100644 --- a/lib/libnvpair/Makefile.in +++ b/lib/libnvpair/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -238,6 +244,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -249,6 +261,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -264,6 +277,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -277,9 +292,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -298,6 +314,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -429,15 +446,15 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 $(DEBUG_STACKFLAGS) \ - $(FRAME_LARGER_THAN) $(LIBTIRPC_CFLAGS) + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) \ + $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN) $(LIBTIRPC_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) lib_LTLIBRARIES = libnvpair.la USER_C = \ libnvpair.c \ diff --git a/lib/libshare/Makefile.in b/lib/libshare/Makefile.in index 5605b3de..934146e1 100644 --- a/lib/libshare/Makefile.in +++ b/lib/libshare/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -207,6 +213,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -218,6 +230,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -233,6 +246,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -246,9 +261,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -267,6 +283,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -398,14 +415,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) noinst_LTLIBRARIES = libshare.la USER_C = \ libshare_impl.h \ diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in index 6fd079b0..96314282 100644 --- a/lib/libspl/Makefile.in +++ b/lib/libspl/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -261,6 +267,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -272,6 +284,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -287,6 +300,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -300,9 +315,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -321,6 +337,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -452,15 +469,15 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 $(DEBUG_STACKFLAGS) \ - $(FRAME_LARGER_THAN) + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) \ + $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) SUBDIRS = include $(TARGET_ASM_DIR) DIST_SUBDIRS = include asm-generic asm-i386 asm-x86_64 AM_CCASFLAGS = \ diff --git a/lib/libspl/asm-generic/Makefile.in b/lib/libspl/asm-generic/Makefile.in index a73d1f43..1adc8877 100644 --- a/lib/libspl/asm-generic/Makefile.in +++ b/lib/libspl/asm-generic/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -177,6 +183,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -188,6 +200,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -203,6 +216,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -216,9 +231,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -237,6 +253,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -368,14 +385,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) atomic_SOURCE = atomic.c atomic_ASM = atomic.S COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ diff --git a/lib/libspl/asm-i386/Makefile.in b/lib/libspl/asm-i386/Makefile.in index 04239ac8..c8860186 100644 --- a/lib/libspl/asm-i386/Makefile.in +++ b/lib/libspl/asm-i386/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -181,6 +187,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -192,6 +204,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -207,6 +220,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -220,9 +235,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -241,6 +257,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/lib/libspl/asm-x86_64/Makefile.in b/lib/libspl/asm-x86_64/Makefile.in index 6d989f4e..54511e3e 100644 --- a/lib/libspl/asm-x86_64/Makefile.in +++ b/lib/libspl/asm-x86_64/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -181,6 +187,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -192,6 +204,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -207,6 +220,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -220,9 +235,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -241,6 +257,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/lib/libspl/include/Makefile.in b/lib/libspl/include/Makefile.in index a2762b44..92bead9b 100644 --- a/lib/libspl/include/Makefile.in +++ b/lib/libspl/include/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -241,6 +247,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -252,6 +264,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -267,6 +280,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -280,9 +295,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -301,6 +317,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/lib/libspl/include/ia32/Makefile.in b/lib/libspl/include/ia32/Makefile.in index 3b0ea8d4..c6e36849 100644 --- a/lib/libspl/include/ia32/Makefile.in +++ b/lib/libspl/include/ia32/Makefile.in @@ -40,6 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -55,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -83,14 +86,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -102,7 +109,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -118,9 +124,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -131,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -216,6 +222,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -227,6 +239,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -242,6 +255,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -255,9 +270,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -276,6 +292,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/lib/libspl/include/ia32/sys/Makefile.in b/lib/libspl/include/ia32/sys/Makefile.in index 759d102c..e123d8bf 100644 --- a/lib/libspl/include/ia32/sys/Makefile.in +++ b/lib/libspl/include/ia32/sys/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -203,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -214,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -229,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -242,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -263,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/lib/libspl/include/rpc/Makefile.in b/lib/libspl/include/rpc/Makefile.in index 3c6f84e3..5b8af73b 100644 --- a/lib/libspl/include/rpc/Makefile.in +++ b/lib/libspl/include/rpc/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -203,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -214,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -229,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -242,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -263,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/lib/libspl/include/sys/Makefile.in b/lib/libspl/include/sys/Makefile.in index 64ddc97b..b1dbf236 100644 --- a/lib/libspl/include/sys/Makefile.in +++ b/lib/libspl/include/sys/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -241,6 +247,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -252,6 +264,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -267,6 +280,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -280,9 +295,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -301,6 +317,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/lib/libspl/include/sys/dktp/Makefile.in b/lib/libspl/include/sys/dktp/Makefile.in index 748c7035..682633a7 100644 --- a/lib/libspl/include/sys/dktp/Makefile.in +++ b/lib/libspl/include/sys/dktp/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -203,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -214,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -229,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -242,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -263,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/lib/libspl/include/sys/time.h b/lib/libspl/include/sys/time.h index f05fcaa1..dc645fa5 100644 --- a/lib/libspl/include/sys/time.h +++ b/lib/libspl/include/sys/time.h @@ -54,10 +54,14 @@ #define MSEC2NSEC(m) ((hrtime_t)(m) * (NANOSEC / MILLISEC)) #endif -#ifndef NSEC2MSEC +#ifndef NSEC2MSEC #define NSEC2MSEC(n) ((n) / (NANOSEC / MILLISEC)) #endif +#ifndef USEC2NSEC +#define USEC2NSEC(m) ((hrtime_t)(m) * (NANOSEC / MICROSEC)) +#endif + #ifndef NSEC2SEC #define NSEC2SEC(n) ((n) / (NANOSEC / SEC)) #endif diff --git a/lib/libspl/include/umem.h b/lib/libspl/include/umem.h index c63026ce..5b10ac80 100644 --- a/lib/libspl/include/umem.h +++ b/lib/libspl/include/umem.h @@ -146,7 +146,7 @@ umem_cache_create( cp = umem_alloc(sizeof (umem_cache_t), UMEM_DEFAULT); if (cp) { - strncpy(cp->cache_name, name, UMEM_CACHE_NAMELEN); + strlcpy(cp->cache_name, name, UMEM_CACHE_NAMELEN); cp->cache_bufsize = bufsize; cp->cache_align = align; cp->cache_constructor = constructor; diff --git a/lib/libspl/include/util/Makefile.in b/lib/libspl/include/util/Makefile.in index c268c526..4d3b3db2 100644 --- a/lib/libspl/include/util/Makefile.in +++ b/lib/libspl/include/util/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -203,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -214,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -229,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -242,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -263,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/lib/libunicode/Makefile.in b/lib/libunicode/Makefile.in index a2f185f0..dc07dee4 100644 --- a/lib/libunicode/Makefile.in +++ b/lib/libunicode/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -399,15 +416,15 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 $(DEBUG_STACKFLAGS) \ - $(FRAME_LARGER_THAN) + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) \ + $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) noinst_LTLIBRARIES = libunicode.la USER_C = KERNEL_C = \ diff --git a/lib/libuutil/Makefile.in b/lib/libuutil/Makefile.in index 86c2f912..82eff5b3 100644 --- a/lib/libuutil/Makefile.in +++ b/lib/libuutil/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -236,6 +242,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -247,6 +259,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -262,6 +275,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -275,9 +290,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -296,6 +312,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -427,15 +444,15 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 $(DEBUG_STACKFLAGS) \ - $(FRAME_LARGER_THAN) + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) \ + $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) lib_LTLIBRARIES = libuutil.la USER_C = \ uu_alloc.c \ diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in index 21825f88..1e61b7f1 100644 --- a/lib/libzfs/Makefile.in +++ b/lib/libzfs/Makefile.in @@ -44,6 +44,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -59,6 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -87,14 +90,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -106,7 +113,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -122,9 +128,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -135,7 +141,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -245,6 +251,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -256,6 +268,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -271,6 +284,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -284,9 +299,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -305,6 +321,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -436,14 +453,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) libzfs_pcdir = $(datarootdir)/pkgconfig libzfs_pc_DATA = libzfs.pc libzfs_core.pc lib_LTLIBRARIES = libzfs.la diff --git a/lib/libzfs/libzfs.pc b/lib/libzfs/libzfs.pc index 55d8fd7a..a46f58e1 100644 --- a/lib/libzfs/libzfs.pc +++ b/lib/libzfs/libzfs.pc @@ -5,7 +5,7 @@ includedir=${prefix}/include Name: libzfs Description: LibZFS library -Version: 0.7.6 +Version: 0.7.9 URL: http://zfsonlinux.org Requires: libzfs_core Cflags: -I${includedir}/libzfs -I${includedir}/libspl diff --git a/lib/libzfs/libzfs_core.pc b/lib/libzfs/libzfs_core.pc index f57291a4..6e09d5e4 100644 --- a/lib/libzfs/libzfs_core.pc +++ b/lib/libzfs/libzfs_core.pc @@ -5,7 +5,7 @@ includedir=${prefix}/include Name: libzfs_core Description: LibZFS core library -Version: 0.7.6 +Version: 0.7.9 URL: http://zfsonlinux.org Cflags: -I${includedir}/libzfs -I${includedir}/libspl Libs: -L${libdir} -lzfs_core diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c index b65dbc82..892f058b 100644 --- a/lib/libzfs/libzfs_dataset.c +++ b/lib/libzfs/libzfs_dataset.c @@ -1030,10 +1030,11 @@ zfs_valid_proplist(libzfs_handle_t *hdl, zfs_type_t type, nvlist_t *nvl, if (prop == ZPROP_INVAL && zfs_prop_userquota(propname)) { zfs_userquota_prop_t uqtype; - char newpropname[128]; + char *newpropname = NULL; char domain[128]; uint64_t rid; uint64_t valary[3]; + int rc; if (userquota_propname_decode(propname, zoned, &uqtype, domain, sizeof (domain), &rid) != 0) { @@ -1088,17 +1089,24 @@ zfs_valid_proplist(libzfs_handle_t *hdl, zfs_type_t type, nvlist_t *nvl, * userquota@-domain, to make it easy * for the kernel to decode. */ - (void) snprintf(newpropname, sizeof (newpropname), - "%s%llx-%s", zfs_userquota_prop_prefixes[uqtype], + rc = asprintf(&newpropname, "%s%llx-%s", + zfs_userquota_prop_prefixes[uqtype], (longlong_t)rid, domain); + if (rc == -1 || newpropname == NULL) { + (void) no_memory(hdl); + goto error; + } + valary[0] = uqtype; valary[1] = rid; valary[2] = intval; if (nvlist_add_uint64_array(ret, newpropname, valary, 3) != 0) { + free(newpropname); (void) no_memory(hdl); goto error; } + free(newpropname); continue; } else if (prop == ZPROP_INVAL && zfs_prop_written(propname)) { zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c index 39c06729..9dbf2079 100644 --- a/lib/libzfs/libzfs_import.c +++ b/lib/libzfs/libzfs_import.c @@ -21,7 +21,7 @@ /* * Copyright 2015 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012, 2016 by Delphix. All rights reserved. + * Copyright (c) 2012, 2018 by Delphix. All rights reserved. * Copyright 2015 RackTop Systems. * Copyright (c) 2016, Intel Corporation. */ @@ -142,7 +142,18 @@ zfs_device_get_devid(struct udev_device *dev, char *bufptr, size_t buflen) (void) snprintf(bufptr, buflen, "dm-uuid-%s", dm_uuid); return (0); } - return (ENODATA); + + /* + * NVME 'by-id' symlinks are similar to bus case + */ + struct udev_device *parent; + + parent = udev_device_get_parent_with_subsystem_devtype(dev, + "nvme", NULL); + if (parent != NULL) + bus = "nvme"; /* continue with bus symlink search */ + else + return (ENODATA); } /* diff --git a/lib/libzfs/libzfs_sendrecv.c b/lib/libzfs/libzfs_sendrecv.c index ec190022..5490581a 100644 --- a/lib/libzfs/libzfs_sendrecv.c +++ b/lib/libzfs/libzfs_sendrecv.c @@ -3254,6 +3254,7 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap, zfs_type_t type; boolean_t toplevel = B_FALSE; boolean_t zoned = B_FALSE; + boolean_t hastoken = B_FALSE; begin_time = time(NULL); bzero(origin, MAXNAMELEN); @@ -3379,7 +3380,7 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap, * Determine the name of the origin snapshot. */ if (originsnap) { - (void) strncpy(origin, originsnap, sizeof (origin)); + (void) strlcpy(origin, originsnap, sizeof (origin)); if (flags->verbose) (void) printf("using provided clone origin %s\n", origin); @@ -3535,6 +3536,11 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap, /* we want to know if we're zoned when validating -o|-x props */ zoned = zfs_prop_get_int(zhp, ZFS_PROP_ZONED); + /* may need this info later, get it now we have zhp around */ + if (zfs_prop_get(zhp, ZFS_PROP_RECEIVE_RESUME_TOKEN, NULL, 0, + NULL, NULL, 0, B_TRUE) == 0) + hastoken = B_TRUE; + /* gather existing properties on destination */ origprops = fnvlist_alloc(); fnvlist_merge(origprops, zhp->zfs_props); @@ -3741,9 +3747,19 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap, break; case EDQUOT: zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, - "destination %s space quota exceeded"), name); + "destination %s space quota exceeded."), name); (void) zfs_error(hdl, EZFS_NOSPC, errbuf); break; + case EBUSY: + if (hastoken) { + zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, + "destination %s contains " + "partially-complete state from " + "\"zfs receive -s\"."), name); + (void) zfs_error(hdl, EZFS_BUSY, errbuf); + break; + } + /* fallthru */ default: (void) zfs_standard_error(hdl, ioctl_errno, errbuf); } diff --git a/lib/libzfs/libzfs_status.c b/lib/libzfs/libzfs_status.c index 05a9afce..6cdcd382 100644 --- a/lib/libzfs/libzfs_status.c +++ b/lib/libzfs/libzfs_status.c @@ -274,10 +274,16 @@ check_status(nvlist_t *config, boolean_t isimport, zpool_errata_t *erratap) return (ZPOOL_STATUS_BAD_GUID_SUM); /* - * Check whether the pool has suspended due to failed I/O. + * Check whether the pool has suspended. */ if (nvlist_lookup_uint64(config, ZPOOL_CONFIG_SUSPENDED, &suspended) == 0) { + uint64_t reason; + + if (nvlist_lookup_uint64(config, ZPOOL_CONFIG_SUSPENDED_REASON, + &reason) == 0 && reason == ZIO_SUSPEND_MMP) + return (ZPOOL_STATUS_IO_FAILURE_MMP); + if (suspended == ZIO_FAILURE_MODE_CONTINUE) return (ZPOOL_STATUS_IO_FAILURE_CONTINUE); return (ZPOOL_STATUS_IO_FAILURE_WAIT); diff --git a/lib/libzfs_core/Makefile.in b/lib/libzfs_core/Makefile.in index f1c1ca91..de1bc74a 100644 --- a/lib/libzfs_core/Makefile.in +++ b/lib/libzfs_core/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -235,6 +241,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -246,6 +258,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -261,6 +274,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -274,9 +289,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -295,6 +311,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -426,14 +443,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) lib_LTLIBRARIES = libzfs_core.la USER_C = \ libzfs_core.c diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in index 10223670..9824242f 100644 --- a/lib/libzpool/Makefile.in +++ b/lib/libzpool/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -269,6 +275,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -280,6 +292,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -295,6 +308,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -308,9 +323,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -329,6 +345,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -460,15 +477,15 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 $(DEBUG_STACKFLAGS) \ - $(FRAME_LARGER_THAN) + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) \ + $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) lib_LTLIBRARIES = libzpool.la USER_C = \ kernel.c \ diff --git a/man/Makefile.in b/man/Makefile.in index 0d5fd017..9f69346b 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -40,6 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -55,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -83,14 +86,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -102,7 +109,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -118,9 +124,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -131,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -216,6 +222,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -227,6 +239,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -242,6 +255,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -255,9 +270,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -276,6 +292,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/man/man1/Makefile.in b/man/man1/Makefile.in index 2c9dbd23..bc10022e 100644 --- a/man/man1/Makefile.in +++ b/man/man1/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -202,6 +208,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -213,6 +225,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -228,6 +241,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -241,9 +256,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -262,6 +278,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/man/man5/Makefile.in b/man/man5/Makefile.in index a858f406..bc8e9f83 100644 --- a/man/man5/Makefile.in +++ b/man/man5/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -202,6 +208,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -213,6 +225,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -228,6 +241,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -241,9 +256,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -262,6 +278,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/man/man5/zfs-module-parameters.5 b/man/man5/zfs-module-parameters.5 index 19e6becf..0c5a6462 100644 --- a/man/man5/zfs-module-parameters.5 +++ b/man/man5/zfs-module-parameters.5 @@ -674,17 +674,6 @@ max arc_p Default value: \fB0\fR. .RE -.sp -.ne 2 -.na -\fBzfs_arc_p_aggressive_disable\fR (int) -.ad -.RS 12n -Disable aggressive arc_p growth -.sp -Use \fB1\fR for yes (default) and \fB0\fR to disable. -.RE - .sp .ne 2 .na @@ -750,6 +739,34 @@ Disable pool import at module load by ignoring the cache file (typically \fB/etc Use \fB1\fR for yes (default) and \fB0\fR for no. .RE +.sp +.ne 2 +.na +\fBzfs_checksums_per_second\fR (int) +.ad +.RS 12n +Rate limit checksum events to this many per second. Note that this should +not be set below the zed thresholds (currently 10 checksums over 10 sec) +or else zed may not trigger any action. +.sp +Default value: 20 +.RE + +.sp +.ne 2 +.na +\fBzfs_commit_timeout_pct\fR (int) +.ad +.RS 12n +This controls the amount of time that a ZIL block (lwb) will remain "open" +when it isn't "full", and it has a thread waiting for it to be committed to +stable storage. The timeout is scaled based on a percentage of the last lwb +latency to avoid significantly impacting the latency of each individual +transaction record (itx). +.sp +Default value: \fB5\fR%. +.RE + .sp .ne 2 .na @@ -877,6 +894,17 @@ Note: \fBzfs_delay_scale\fR * \fBzfs_dirty_data_max\fR must be < 2^64. Default value: \fB500,000\fR. .RE +.sp +.ne 2 +.na +\fBzfs_delays_per_second\fR (int) +.ad +.RS 12n +Rate limit IO delay events to this many per second. +.sp +Default value: 20 +.RE + .sp .ne 2 .na @@ -1671,6 +1699,20 @@ at least this much time working on a resilver between txg flushes. Default value: \fB3,000\fR. .RE +.sp +.ne 2 +.na +\fBzfs_scan_ignore_errors\fR (int) +.ad +.RS 12n +If set to a nonzero value, remove the DTL (dirty time list) upon +completion of a pool scan (scrub) even if there were unrepairable +errors. It is intended to be used during pool repair or recovery to +stop resilvering when the pool is next imported. +.sp +Default value: \fB0\fR. +.RE + .sp .ne 2 .na @@ -1721,6 +1763,31 @@ Allow sending of corrupt data (ignore read/checksum errors when sending data) Use \fB1\fR for yes and \fB0\fR for no (default). .RE +.sp +.ne 2 +.na +\fBzfs_send_queue_length\fR (int) +.ad +.RS 12n +The maximum number of bytes allowed in the \fBzfs send\fR queue. This value +must be at least twice the maximum block size in use. +.sp +Default value: \fB16,777,216\fR. +.RE + +.sp +.ne 2 +.na +\fBzfs_recv_queue_length\fR (int) +.ad +.RS 12n +.sp +The maximum number of bytes allowed in the \fBzfs receive\fR queue. This value +must be at least twice the maximum block size in use. +.sp +Default value: \fB16,777,216\fR. +.RE + .sp .ne 2 .na diff --git a/man/man8/Makefile.in b/man/man8/Makefile.in index 300828ab..8fc75339 100644 --- a/man/man8/Makefile.in +++ b/man/man8/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -202,6 +208,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -213,6 +225,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -228,6 +241,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -241,9 +256,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -262,6 +278,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/man/man8/zdb.8 b/man/man8/zdb.8 index 4e47de7b..d991aae4 100644 --- a/man/man8/zdb.8 +++ b/man/man8/zdb.8 @@ -246,7 +246,9 @@ and, optionally, .It Sy b Ar offset Print block pointer .It Sy d -Decompress the block +Decompress the block. Set environment variable +.Nm ZBD_NO_ZLE +to skip zle when guessing. .It Sy e Byte swap the block .It Sy g diff --git a/man/man8/zed.8.in b/man/man8/zed.8.in index 2ab088d9..645e9179 100644 --- a/man/man8/zed.8.in +++ b/man/man8/zed.8.in @@ -27,6 +27,7 @@ ZED \- ZFS Event Daemon [\fB\-L\fR] [\fB\-M\fR] [\fB\-p\fR \fIpidfile\fR] +[\fB\-P\fR \fIpath\fR] [\fB\-s\fR \fIstatefile\fR] [\fB\-v\fR] [\fB\-V\fR] @@ -78,9 +79,16 @@ Read the enabled ZEDLETs from the specified directory. .BI \-p\ pidfile Write the daemon's process ID to the specified file. .TP +.BI \-P\ path +Custom $PATH for zedlets to use. Normally zedlets run in a locked-down +environment, with hardcoded paths to the ZFS commands ($ZFS, $ZPOOL, $ZED, ...), +and a hardcoded $PATH. This is done for security reasons. However, the +ZFS test suite uses a custom PATH for its ZFS commands, and passes it to zed +with -P. In short, -P is only to be used by the ZFS test suite; never use +it in production! +.TP .BI \-s\ statefile Write the daemon's state to the specified file. - .SH ZEVENTS .PP A zevent is comprised of a list of nvpairs (name/value pairs). Each zevent diff --git a/man/man8/zinject.8 b/man/man8/zinject.8 index 50fecfb6..7f363974 100644 --- a/man/man8/zinject.8 +++ b/man/man8/zinject.8 @@ -111,6 +111,9 @@ Specify .BR "dtl" " for an ECHILD error," .BR "io" " for an EIO error where reopening the device will succeed, or" .BR "nxio" " for an ENXIO error where reopening the device will fail." +For EIO and ENXIO, the "failed" reads or writes still occur. The probe simply +sets the error value reported by the I/O pipeline so it appears the read or +write failed. .TP .BI "\-f" " frequency" Only inject errors a fraction of the time. Expressed as a real number diff --git a/man/man8/zpool.8 b/man/man8/zpool.8 index 328ba3dc..46e531e2 100644 --- a/man/man8/zpool.8 +++ b/man/man8/zpool.8 @@ -24,10 +24,10 @@ .\" Copyright 2016 Nexenta Systems, Inc. .\" Copyright (c) 2012 Cyril Plisko. All Rights Reserved. .\" Copyright (c) 2017 Datto Inc. -.\" Copyright (c) 2017 George Melikov. All Rights Reserved. +.\" Copyright (c) 2018 George Melikov. All Rights Reserved. .\" Copyright (c) 2017 Datto Inc. .\" -.Dd June 28, 2017 +.Dd April 27, 2018 .Dt ZPOOL 8 SMM .Os Linux .Sh NAME @@ -655,7 +655,7 @@ Because the kernel destroys and recreates this file when pools are added and removed, care should be taken when attempting to access this file. When the last pool using a .Sy cachefile -is exported or destroyed, the file is removed. +is exported or destroyed, the file will be empty. .It Sy comment Ns = Ns Ar text A text string consisting of printable ASCII characters that will be stored such that it is available even if the pool becomes faulted. @@ -733,7 +733,7 @@ man page. In order to enable this property each host must set a unique hostid. See .Xr genhostid 1 .Xr zgenhostid 8 -.Xr spl-module-paramters 5 +.Xr spl-module-parameters 5 for additional details. The default value is .Sy off . .It Sy version Ns = Ns Ar version @@ -1554,7 +1554,24 @@ block device. Verbose statistics Reports usage statistics for individual vdevs within the pool, in addition to the pool-wide statistics. .It Fl y +Omit statistics since boot. +Normally the first line of output reports the statistics since boot. +This option suppresses that first line of output. .It Fl w +Display latency histograms: +.Pp +.Ar total_wait : +Total IO time (queuing + disk IO time). +.Ar disk_wait : +Disk IO time (time reading/writing the disk). +.Ar syncq_wait : +Amount of time IO spent in synchronous priority queues. Does not include +disk time. +.Ar asyncq_wait : +Amount of time IO spent in asynchronous priority queues. Does not include +disk time. +.Ar scrub : +Amount of time IO spent in scrub queue. Does not include disk time. .It Fl l Include average latency statistics: .Pp @@ -2087,10 +2104,10 @@ is faulted due to a missing device. The results from this command are similar to the following: .Bd -literal # zpool list -NAME SIZE ALLOC FREE FRAG EXPANDSZ CAP DEDUP HEALTH ALTROOT -rpool 19.9G 8.43G 11.4G 33% - 42% 1.00x ONLINE - -tank 61.5G 20.0G 41.5G 48% - 32% 1.00x ONLINE - -zion - - - - - - - FAULTED - +NAME SIZE ALLOC FREE EXPANDSZ FRAG CAP DEDUP HEALTH ALTROOT +rpool 19.9G 8.43G 11.4G - 33% 42% 1.00x ONLINE - +tank 61.5G 20.0G 41.5G - 48% 32% 1.00x ONLINE - +zion - - - - - - - FAULTED - .Ed .It Sy Example 7 No Destroying a ZFS Storage Pool The following command destroys the pool @@ -2215,12 +2232,12 @@ In this example, the pool will not be able to utilize this extra capacity until all the devices under the raidz vdev have been expanded. .Bd -literal # zpool list -v data -NAME SIZE ALLOC FREE FRAG EXPANDSZ CAP DEDUP HEALTH ALTROOT -data 23.9G 14.6G 9.30G 48% - 61% 1.00x ONLINE - - raidz1 23.9G 14.6G 9.30G 48% - - sda - - - - - - sdb - - - - 10G - sdc - - - - - +NAME SIZE ALLOC FREE EXPANDSZ FRAG CAP DEDUP HEALTH ALTROOT +data 23.9G 14.6G 9.30G - 48% 61% 1.00x ONLINE - + raidz1 23.9G 14.6G 9.30G - 48% + sda - - - - - + sdb - - - 10G - + sdc - - - - - .Ed .It Sy Example 16 No Adding output columns Additional columns can be added to the diff --git a/module/zcommon/zfs_comutil.c b/module/zcommon/zfs_comutil.c index 52cb7e36..44cdc852 100644 --- a/module/zcommon/zfs_comutil.c +++ b/module/zcommon/zfs_comutil.c @@ -215,7 +215,7 @@ const char *zfs_history_event_names[ZFS_NUM_LEGACY_HISTORY_EVENTS] = { * interval: Interval time in seconds */ void -zfs_ratelimit_init(zfs_ratelimit_t *rl, unsigned int burst, +zfs_ratelimit_init(zfs_ratelimit_t *rl, unsigned int *burst, unsigned int interval) { rl->count = 0; @@ -270,7 +270,7 @@ zfs_ratelimit(zfs_ratelimit_t *rl) rl->start = now; rl->count = 0; } else { - if (rl->count >= rl->burst) { + if (rl->count >= *rl->burst) { rc = 0; /* We're ratelimiting */ } } diff --git a/module/zfs/arc.c b/module/zfs/arc.c index 264e6773..bcf74dd6 100644 --- a/module/zfs/arc.c +++ b/module/zfs/arc.c @@ -280,6 +280,7 @@ #include #include #include +#include #endif #include #include @@ -391,7 +392,6 @@ unsigned long zfs_arc_dnode_limit_percent = 10; */ unsigned long zfs_arc_sys_free = 0; int zfs_arc_min_prefetch_lifespan = 0; -int zfs_arc_p_aggressive_disable = 1; int zfs_arc_p_dampener_disable = 1; int zfs_arc_meta_prune = 10000; int zfs_arc_meta_strategy = ARC_STRATEGY_META_BALANCED; @@ -4017,17 +4017,11 @@ arc_free_memory(void) si_meminfo(&si); return (ptob(si.freeram - si.freehigh)); #else -#ifdef ZFS_GLOBAL_NODE_PAGE_STATE return (ptob(nr_free_pages() + - global_node_page_state(NR_INACTIVE_FILE) + - global_node_page_state(NR_INACTIVE_ANON) + - global_node_page_state(NR_SLAB_RECLAIMABLE))); -#else - return (ptob(nr_free_pages() + - global_page_state(NR_INACTIVE_FILE) + - global_page_state(NR_INACTIVE_ANON) + - global_page_state(NR_SLAB_RECLAIMABLE))); -#endif /* ZFS_GLOBAL_NODE_PAGE_STATE */ + nr_inactive_file_pages() + + nr_inactive_anon_pages() + + nr_slab_reclaimable_pages())); + #endif /* CONFIG_HIGHMEM */ #else return (spa_get_random(arc_all_memory() * 20 / 100)); @@ -4438,13 +4432,7 @@ arc_evictable_memory(void) * Scale reported evictable memory in proportion to page cache, cap * at specified min/max. */ -#ifdef ZFS_GLOBAL_NODE_PAGE_STATE - uint64_t min = (ptob(global_node_page_state(NR_FILE_PAGES)) / 100) * - zfs_arc_pc_percent; -#else - uint64_t min = (ptob(global_page_state(NR_FILE_PAGES)) / 100) * - zfs_arc_pc_percent; -#endif + uint64_t min = (ptob(nr_file_pages()) / 100) * zfs_arc_pc_percent; min = MAX(arc_c_min, MIN(arc_c_max, min)); if (arc_dirty >= min) @@ -6370,7 +6358,7 @@ arc_tuning_update(void) /* Valid range: 64M - */ if ((zfs_arc_max) && (zfs_arc_max != arc_c_max) && - (zfs_arc_max > 64 << 20) && (zfs_arc_max < allmem) && + (zfs_arc_max >= 64 << 20) && (zfs_arc_max < allmem) && (zfs_arc_max > arc_c_min)) { arc_c_max = zfs_arc_max; arc_c = arc_c_max; @@ -7928,9 +7916,6 @@ MODULE_PARM_DESC(zfs_arc_meta_strategy, "Meta reclaim strategy"); module_param(zfs_arc_grow_retry, int, 0644); MODULE_PARM_DESC(zfs_arc_grow_retry, "Seconds before growing arc size"); -module_param(zfs_arc_p_aggressive_disable, int, 0644); -MODULE_PARM_DESC(zfs_arc_p_aggressive_disable, "disable aggressive arc_p grow"); - module_param(zfs_arc_p_dampener_disable, int, 0644); MODULE_PARM_DESC(zfs_arc_p_dampener_disable, "disable arc_p adapt dampener"); diff --git a/module/zfs/dmu_send.c b/module/zfs/dmu_send.c index 344e4201..cdbc1cd1 100644 --- a/module/zfs/dmu_send.c +++ b/module/zfs/dmu_send.c @@ -61,8 +61,8 @@ /* Set this tunable to TRUE to replace corrupt data with 0x2f5baddb10c */ int zfs_send_corrupt_data = B_FALSE; -int zfs_send_queue_length = 16 * 1024 * 1024; -int zfs_recv_queue_length = 16 * 1024 * 1024; +int zfs_send_queue_length = SPA_MAXBLOCKSIZE; +int zfs_recv_queue_length = SPA_MAXBLOCKSIZE; /* Set this tunable to FALSE to disable setting of DRR_FLAG_FREERECORDS */ int zfs_send_set_freerecords_bit = B_TRUE; @@ -944,7 +944,8 @@ dmu_send_impl(void *tag, dsl_pool_t *dp, dsl_dataset_t *to_ds, goto out; } - err = bqueue_init(&to_arg.q, zfs_send_queue_length, + err = bqueue_init(&to_arg.q, + MAX(zfs_send_queue_length, 2 * zfs_max_recordsize), offsetof(struct send_block_record, ln)); to_arg.error_code = 0; to_arg.cancel = B_FALSE; @@ -3173,7 +3174,8 @@ dmu_recv_stream(dmu_recv_cookie_t *drc, vnode_t *vp, offset_t *voffp, goto out; } - (void) bqueue_init(&rwa->q, zfs_recv_queue_length, + (void) bqueue_init(&rwa->q, + MAX(zfs_recv_queue_length, 2 * zfs_max_recordsize), offsetof(struct receive_record_arg, node)); cv_init(&rwa->cv, NULL, CV_DEFAULT, NULL); mutex_init(&rwa->mutex, NULL, MUTEX_DEFAULT, NULL); @@ -3550,4 +3552,10 @@ dmu_objset_is_receiving(objset_t *os) #if defined(_KERNEL) module_param(zfs_send_corrupt_data, int, 0644); MODULE_PARM_DESC(zfs_send_corrupt_data, "Allow sending corrupt data"); + +module_param(zfs_send_queue_length, int, 0644); +MODULE_PARM_DESC(zfs_send_queue_length, "Maximum send queue length"); + +module_param(zfs_recv_queue_length, int, 0644); +MODULE_PARM_DESC(zfs_recv_queue_length, "Maximum receive queue length"); #endif diff --git a/module/zfs/dmu_traverse.c b/module/zfs/dmu_traverse.c index c78228d7..f63903ef 100644 --- a/module/zfs/dmu_traverse.c +++ b/module/zfs/dmu_traverse.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -599,23 +600,31 @@ traverse_impl(spa_t *spa, dsl_dataset_t *ds, uint64_t objset, blkptr_t *rootbp, /* See comment on ZIL traversal in dsl_scan_visitds. */ if (ds != NULL && !ds->ds_is_snapshot && !BP_IS_HOLE(rootbp)) { + enum zio_flag zio_flags = ZIO_FLAG_CANFAIL; uint32_t flags = ARC_FLAG_WAIT; objset_phys_t *osp; arc_buf_t *buf; - err = arc_read(NULL, td->td_spa, rootbp, - arc_getbuf_func, &buf, - ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, czb); - if (err != 0) - return (err); - - osp = buf->b_data; - traverse_zil(td, &osp->os_zil_header); - arc_buf_destroy(buf, &buf); + err = arc_read(NULL, td->td_spa, rootbp, arc_getbuf_func, + &buf, ZIO_PRIORITY_ASYNC_READ, zio_flags, &flags, czb); + if (err != 0) { + /* + * If both TRAVERSE_HARD and TRAVERSE_PRE are set, + * continue to visitbp so that td_func can be called + * in pre stage, and err will reset to zero. + */ + if (!(td->td_flags & TRAVERSE_HARD) || + !(td->td_flags & TRAVERSE_PRE)) + return (err); + } else { + osp = buf->b_data; + traverse_zil(td, &osp->os_zil_header); + arc_buf_destroy(buf, &buf); + } } if (!(flags & TRAVERSE_PREFETCH_DATA) || - taskq_dispatch(system_taskq, traverse_prefetch_thread, + taskq_dispatch(spa->spa_prefetch_taskq, traverse_prefetch_thread, td, TQ_NOQUEUE) == TASKQID_INVALID) pd->pd_exited = B_TRUE; diff --git a/module/zfs/mmp.c b/module/zfs/mmp.c index 6f2aa3f5..1ae5f31f 100644 --- a/module/zfs/mmp.c +++ b/module/zfs/mmp.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -124,6 +125,7 @@ uint_t zfs_multihost_import_intervals = MMP_DEFAULT_IMPORT_INTERVALS; uint_t zfs_multihost_fail_intervals = MMP_DEFAULT_FAIL_INTERVALS; static void mmp_thread(spa_t *spa); +char *mmp_tag = "mmp_write_uberblock"; void mmp_init(spa_t *spa) @@ -133,6 +135,7 @@ mmp_init(spa_t *spa) mutex_init(&mmp->mmp_thread_lock, NULL, MUTEX_DEFAULT, NULL); cv_init(&mmp->mmp_thread_cv, NULL, CV_DEFAULT, NULL); mutex_init(&mmp->mmp_io_lock, NULL, MUTEX_DEFAULT, NULL); + mmp->mmp_kstat_id = 1; } void @@ -197,28 +200,33 @@ mmp_thread_stop(spa_t *spa) mmp->mmp_thread_exiting = 0; } -/* - * Choose a leaf vdev to write an MMP block to. It must not have an - * outstanding mmp write (if so then there is a problem, and a new write will - * also block). If there is no usable leaf in this subtree return NULL, - * otherwise return a pointer to the leaf. - * - * When walking the subtree, a random child is chosen as the starting point so - * that when the tree is healthy, the leaf chosen will be random with even - * distribution. If there are unhealthy vdevs in the tree, the distribution - * will be really poor only if a large proportion of the vdevs are unhealthy, - * in which case there are other more pressing problems. - */ +typedef enum mmp_vdev_state_flag { + MMP_FAIL_NOT_WRITABLE = (1 << 0), + MMP_FAIL_WRITE_PENDING = (1 << 1), +} mmp_vdev_state_flag_t; + static vdev_t * -mmp_random_leaf(vdev_t *vd) +mmp_random_leaf_impl(vdev_t *vd, int *fail_mask) { int child_idx; - if (!vdev_writeable(vd)) + if (!vdev_writeable(vd)) { + *fail_mask |= MMP_FAIL_NOT_WRITABLE; return (NULL); + } - if (vd->vdev_ops->vdev_op_leaf) - return (vd->vdev_mmp_pending == 0 ? vd : NULL); + if (vd->vdev_ops->vdev_op_leaf) { + vdev_t *ret; + + if (vd->vdev_mmp_pending != 0) { + *fail_mask |= MMP_FAIL_WRITE_PENDING; + ret = NULL; + } else { + ret = vd; + } + + return (ret); + } child_idx = spa_get_random(vd->vdev_children); for (int offset = vd->vdev_children; offset > 0; offset--) { @@ -226,7 +234,7 @@ mmp_random_leaf(vdev_t *vd) vdev_t *child = vd->vdev_child[(child_idx + offset) % vd->vdev_children]; - leaf = mmp_random_leaf(child); + leaf = mmp_random_leaf_impl(child, fail_mask); if (leaf) return (leaf); } @@ -234,6 +242,97 @@ mmp_random_leaf(vdev_t *vd) return (NULL); } +/* + * Find a leaf vdev to write an MMP block to. It must not have an outstanding + * mmp write (if so a new write will also likely block). If there is no usable + * leaf in the tree rooted at in_vd, a nonzero error value is returned, and + * *out_vd is unchanged. + * + * The error value returned is a bit field. + * + * MMP_FAIL_WRITE_PENDING + * If set, one or more leaf vdevs are writeable, but have an MMP write which has + * not yet completed. + * + * MMP_FAIL_NOT_WRITABLE + * If set, one or more vdevs are not writeable. The children of those vdevs + * were not examined. + * + * Assuming in_vd points to a tree, a random subtree will be chosen to start. + * That subtree, and successive ones, will be walked until a usable leaf has + * been found, or all subtrees have been examined (except that the children of + * un-writeable vdevs are not examined). + * + * If the leaf vdevs in the tree are healthy, the distribution of returned leaf + * vdevs will be even. If there are unhealthy leaves, the following leaves + * (child_index % index_children) will be chosen more often. + */ + +static int +mmp_random_leaf(vdev_t *in_vd, vdev_t **out_vd) +{ + int error_mask = 0; + vdev_t *vd = mmp_random_leaf_impl(in_vd, &error_mask); + + if (error_mask == 0) + *out_vd = vd; + + return (error_mask); +} + +/* + * MMP writes are issued on a fixed schedule, but may complete at variable, + * much longer, intervals. The mmp_delay captures long periods between + * successful writes for any reason, including disk latency, scheduling delays, + * etc. + * + * The mmp_delay is usually calculated as a decaying average, but if the latest + * delay is higher we do not average it, so that we do not hide sudden spikes + * which the importing host must wait for. + * + * If writes are occurring frequently, such as due to a high rate of txg syncs, + * the mmp_delay could become very small. Since those short delays depend on + * activity we cannot count on, we never allow mmp_delay to get lower than rate + * expected if only mmp_thread writes occur. + * + * If an mmp write was skipped or fails, and we have already waited longer than + * mmp_delay, we need to update it so the next write reflects the longer delay. + * + * Do not set mmp_delay if the multihost property is not on, so as not to + * trigger an activity check on import. + */ +static void +mmp_delay_update(spa_t *spa, boolean_t write_completed) +{ + mmp_thread_t *mts = &spa->spa_mmp; + hrtime_t delay = gethrtime() - mts->mmp_last_write; + + ASSERT(MUTEX_HELD(&mts->mmp_io_lock)); + + if (spa_multihost(spa) == B_FALSE) { + mts->mmp_delay = 0; + return; + } + + if (delay > mts->mmp_delay) + mts->mmp_delay = delay; + + if (write_completed == B_FALSE) + return; + + mts->mmp_last_write = gethrtime(); + + /* + * strictly less than, in case delay was changed above. + */ + if (delay < mts->mmp_delay) { + hrtime_t min_delay = MSEC2NSEC(zfs_multihost_interval) / + vdev_count_leaves(spa); + mts->mmp_delay = MAX(((delay + mts->mmp_delay * 127) / 128), + min_delay); + } +} + static void mmp_write_done(zio_t *zio) { @@ -242,42 +341,19 @@ mmp_write_done(zio_t *zio) mmp_thread_t *mts = zio->io_private; mutex_enter(&mts->mmp_io_lock); - vd->vdev_mmp_pending = 0; + uint64_t mmp_kstat_id = vd->vdev_mmp_kstat_id; + hrtime_t mmp_write_duration = gethrtime() - vd->vdev_mmp_pending; - if (zio->io_error) - goto unlock; + mmp_delay_update(spa, (zio->io_error == 0)); - /* - * Mmp writes are queued on a fixed schedule, but under many - * circumstances, such as a busy device or faulty hardware, - * the writes will complete at variable, much longer, - * intervals. In these cases, another node checking for - * activity must wait longer to account for these delays. - * - * The mmp_delay is calculated as a decaying average of the interval - * between completed mmp writes. This is used to predict how long - * the import must wait to detect activity in the pool, before - * concluding it is not in use. - * - * Do not set mmp_delay if the multihost property is not on, - * so as not to trigger an activity check on import. - */ - if (spa_multihost(spa)) { - hrtime_t delay = gethrtime() - mts->mmp_last_write; - - if (delay > mts->mmp_delay) - mts->mmp_delay = delay; - else - mts->mmp_delay = (delay + mts->mmp_delay * 127) / - 128; - } else { - mts->mmp_delay = 0; - } - mts->mmp_last_write = gethrtime(); + vd->vdev_mmp_pending = 0; + vd->vdev_mmp_kstat_id = 0; -unlock: mutex_exit(&mts->mmp_io_lock); - spa_config_exit(spa, SCL_STATE, FTAG); + spa_config_exit(spa, SCL_STATE, mmp_tag); + + spa_mmp_history_set(spa, mmp_kstat_id, zio->io_error, + mmp_write_duration); abd_free(zio->io_abd); } @@ -295,6 +371,7 @@ mmp_update_uberblock(spa_t *spa, uberblock_t *ub) mutex_enter(&mmp->mmp_io_lock); mmp->mmp_ub = *ub; mmp->mmp_ub.ub_timestamp = gethrestime_sec(); + mmp_delay_update(spa, B_TRUE); mutex_exit(&mmp->mmp_io_lock); } @@ -309,18 +386,45 @@ mmp_write_uberblock(spa_t *spa) int flags = ZIO_FLAG_CONFIG_WRITER | ZIO_FLAG_CANFAIL; mmp_thread_t *mmp = &spa->spa_mmp; uberblock_t *ub; - vdev_t *vd; - int label; + vdev_t *vd = NULL; + int label, error; uint64_t offset; - spa_config_enter(spa, SCL_STATE, FTAG, RW_READER); - vd = mmp_random_leaf(spa->spa_root_vdev); - if (vd == NULL) { + hrtime_t lock_acquire_time = gethrtime(); + spa_config_enter(spa, SCL_STATE, mmp_tag, RW_READER); + lock_acquire_time = gethrtime() - lock_acquire_time; + if (lock_acquire_time > (MSEC2NSEC(MMP_MIN_INTERVAL) / 10)) + zfs_dbgmsg("SCL_STATE acquisition took %llu ns\n", + (u_longlong_t)lock_acquire_time); + + error = mmp_random_leaf(spa->spa_root_vdev, &vd); + + mutex_enter(&mmp->mmp_io_lock); + + /* + * spa_mmp_history has two types of entries: + * Issued MMP write: records time issued, error status, etc. + * Skipped MMP write: an MMP write could not be issued because no + * suitable leaf vdev was available. See comment above struct + * spa_mmp_history for details. + */ + + if (error) { + mmp_delay_update(spa, B_FALSE); + if (mmp->mmp_skip_error == error) { + spa_mmp_history_set_skip(spa, mmp->mmp_kstat_id - 1); + } else { + mmp->mmp_skip_error = error; + spa_mmp_history_add(spa, mmp->mmp_ub.ub_txg, + gethrestime_sec(), mmp->mmp_delay, NULL, 0, + mmp->mmp_kstat_id++, error); + } + mutex_exit(&mmp->mmp_io_lock); spa_config_exit(spa, SCL_STATE, FTAG); return; } - mutex_enter(&mmp->mmp_io_lock); + mmp->mmp_skip_error = 0; if (mmp->mmp_zio_root == NULL) mmp->mmp_zio_root = zio_root(spa, NULL, NULL, @@ -331,12 +435,14 @@ mmp_write_uberblock(spa_t *spa) ub->ub_mmp_magic = MMP_MAGIC; ub->ub_mmp_delay = mmp->mmp_delay; vd->vdev_mmp_pending = gethrtime(); + vd->vdev_mmp_kstat_id = mmp->mmp_kstat_id; zio_t *zio = zio_null(mmp->mmp_zio_root, spa, NULL, NULL, NULL, flags); abd_t *ub_abd = abd_alloc_for_io(VDEV_UBERBLOCK_SIZE(vd), B_TRUE); abd_zero(ub_abd, VDEV_UBERBLOCK_SIZE(vd)); abd_copy_from_buf(ub_abd, ub, sizeof (uberblock_t)); + mmp->mmp_kstat_id++; mutex_exit(&mmp->mmp_io_lock); offset = VDEV_UBERBLOCK_OFFSET(vd, VDEV_UBERBLOCK_COUNT(vd) - @@ -347,8 +453,8 @@ mmp_write_uberblock(spa_t *spa) VDEV_UBERBLOCK_SIZE(vd), mmp_write_done, mmp, flags | ZIO_FLAG_DONT_PROPAGATE); - spa_mmp_history_add(ub->ub_txg, ub->ub_timestamp, ub->ub_mmp_delay, vd, - label); + (void) spa_mmp_history_add(spa, ub->ub_txg, ub->ub_timestamp, + ub->ub_mmp_delay, vd, label, vd->vdev_mmp_kstat_id, 0); zio_nowait(zio); } @@ -381,27 +487,32 @@ mmp_thread(spa_t *spa) MAX(zfs_multihost_interval, MMP_MIN_INTERVAL)); boolean_t suspended = spa_suspended(spa); boolean_t multihost = spa_multihost(spa); - hrtime_t start, next_time; + hrtime_t next_time; - start = gethrtime(); - if (multihost) { - next_time = start + mmp_interval / + if (multihost) + next_time = gethrtime() + mmp_interval / MAX(vdev_count_leaves(spa), 1); - } else { - next_time = start + MSEC2NSEC(MMP_DEFAULT_INTERVAL); - } + else + next_time = gethrtime() + + MSEC2NSEC(MMP_DEFAULT_INTERVAL); /* - * When MMP goes off => on, or spa goes suspended => - * !suspended, we know no writes occurred recently. We - * update mmp_last_write to give us some time to try. + * MMP off => on, or suspended => !suspended: + * No writes occurred recently. Update mmp_last_write to give + * us some time to try. */ if ((!last_spa_multihost && multihost) || (last_spa_suspended && !suspended)) { mutex_enter(&mmp->mmp_io_lock); mmp->mmp_last_write = gethrtime(); mutex_exit(&mmp->mmp_io_lock); - } else if (last_spa_multihost && !multihost) { + } + + /* + * MMP on => off: + * mmp_delay == 0 tells importing node to skip activity check. + */ + if (last_spa_multihost && !multihost) { mutex_enter(&mmp->mmp_io_lock); mmp->mmp_delay = 0; mutex_exit(&mmp->mmp_io_lock); @@ -427,17 +538,21 @@ mmp_thread(spa_t *spa) * mmp_interval * mmp_fail_intervals nanoseconds. */ if (!suspended && mmp_fail_intervals && multihost && - (start - mmp->mmp_last_write) > max_fail_ns) { - zio_suspend(spa, NULL); + (gethrtime() - mmp->mmp_last_write) > max_fail_ns) { + cmn_err(CE_WARN, "MMP writes to pool '%s' have not " + "succeeded in over %llus; suspending pool", + spa_name(spa), + NSEC2SEC(gethrtime() - mmp->mmp_last_write)); + zio_suspend(spa, NULL, ZIO_SUSPEND_MMP); } - if (multihost) + if (multihost && !suspended) mmp_write_uberblock(spa); CALLB_CPR_SAFE_BEGIN(&cpr); - (void) cv_timedwait_sig(&mmp->mmp_thread_cv, - &mmp->mmp_thread_lock, ddi_get_lbolt() + - ((next_time - gethrtime()) / (NANOSEC / hz))); + (void) cv_timedwait_sig_hires(&mmp->mmp_thread_cv, + &mmp->mmp_thread_lock, next_time, USEC2NSEC(1), + CALLOUT_FLAG_ABSOLUTE); CALLB_CPR_SAFE_END(&cpr, &mmp->mmp_thread_lock); } diff --git a/module/zfs/policy.c b/module/zfs/policy.c index 03e8f748..55c93274 100644 --- a/module/zfs/policy.c +++ b/module/zfs/policy.c @@ -42,19 +42,47 @@ * all other cases this function must fail and return the passed err. */ static int -priv_policy(const cred_t *cr, int capability, boolean_t all, int err) +priv_policy_ns(const cred_t *cr, int capability, boolean_t all, int err, + struct user_namespace *ns) { ASSERT3S(all, ==, B_FALSE); if (cr != CRED() && (cr != kcred)) return (err); +#if defined(CONFIG_USER_NS) && defined(HAVE_NS_CAPABLE) + if (!(ns ? ns_capable(ns, capability) : capable(capability))) +#else if (!capable(capability)) +#endif return (err); return (0); } +static int +priv_policy(const cred_t *cr, int capability, boolean_t all, int err) +{ + return (priv_policy_ns(cr, capability, all, err, NULL)); +} + +static int +priv_policy_user(const cred_t *cr, int capability, boolean_t all, int err) +{ + /* + * All priv_policy_user checks are preceeded by kuid/kgid_has_mapping() + * checks. If we cannot do them, we shouldn't be using ns_capable() + * since we don't know whether the affected files are valid in our + * namespace. Note that kuid_has_mapping() came after cred->user_ns, so + * we shouldn't need to re-check for HAVE_CRED_USER_NS + */ +#if defined(CONFIG_USER_NS) && defined(HAVE_KUID_HAS_MAPPING) + return (priv_policy_ns(cr, capability, all, err, cr->user_ns)); +#else + return (priv_policy_ns(cr, capability, all, err, NULL)); +#endif +} + /* * Checks for operations that are either client-only or are used by * both clients and servers. @@ -102,10 +130,15 @@ secpolicy_vnode_any_access(const cred_t *cr, struct inode *ip, uid_t owner) if (zpl_inode_owner_or_capable(ip)) return (0); - if (priv_policy(cr, CAP_DAC_OVERRIDE, B_FALSE, EPERM) == 0) +#if defined(CONFIG_USER_NS) && defined(HAVE_KUID_HAS_MAPPING) + if (!kuid_has_mapping(cr->user_ns, SUID_TO_KUID(owner))) + return (EPERM); +#endif + + if (priv_policy_user(cr, CAP_DAC_OVERRIDE, B_FALSE, EPERM) == 0) return (0); - if (priv_policy(cr, CAP_DAC_READ_SEARCH, B_FALSE, EPERM) == 0) + if (priv_policy_user(cr, CAP_DAC_READ_SEARCH, B_FALSE, EPERM) == 0) return (0); return (EPERM); @@ -120,7 +153,12 @@ secpolicy_vnode_chown(const cred_t *cr, uid_t owner) if (crgetfsuid(cr) == owner) return (0); - return (priv_policy(cr, CAP_FOWNER, B_FALSE, EPERM)); +#if defined(CONFIG_USER_NS) && defined(HAVE_KUID_HAS_MAPPING) + if (!kuid_has_mapping(cr->user_ns, SUID_TO_KUID(owner))) + return (EPERM); +#endif + + return (priv_policy_user(cr, CAP_FOWNER, B_FALSE, EPERM)); } /* @@ -152,7 +190,12 @@ secpolicy_vnode_setdac(const cred_t *cr, uid_t owner) if (crgetfsuid(cr) == owner) return (0); - return (priv_policy(cr, CAP_FOWNER, B_FALSE, EPERM)); +#if defined(CONFIG_USER_NS) && defined(HAVE_KUID_HAS_MAPPING) + if (!kuid_has_mapping(cr->user_ns, SUID_TO_KUID(owner))) + return (EPERM); +#endif + + return (priv_policy_user(cr, CAP_FOWNER, B_FALSE, EPERM)); } /* @@ -175,8 +218,12 @@ secpolicy_vnode_setid_retain(const cred_t *cr, boolean_t issuidroot) int secpolicy_vnode_setids_setgids(const cred_t *cr, gid_t gid) { +#if defined(CONFIG_USER_NS) && defined(HAVE_KUID_HAS_MAPPING) + if (!kgid_has_mapping(cr->user_ns, SGID_TO_KGID(gid))) + return (EPERM); +#endif if (crgetfsgid(cr) != gid && !groupmember(gid, cr)) - return (priv_policy(cr, CAP_FSETID, B_FALSE, EPERM)); + return (priv_policy_user(cr, CAP_FSETID, B_FALSE, EPERM)); return (0); } @@ -222,7 +269,12 @@ secpolicy_vnode_setid_modify(const cred_t *cr, uid_t owner) if (crgetfsuid(cr) == owner) return (0); - return (priv_policy(cr, CAP_FSETID, B_FALSE, EPERM)); +#if defined(CONFIG_USER_NS) && defined(HAVE_KUID_HAS_MAPPING) + if (!kuid_has_mapping(cr->user_ns, SUID_TO_KUID(owner))) + return (EPERM); +#endif + + return (priv_policy_user(cr, CAP_FSETID, B_FALSE, EPERM)); } /* diff --git a/module/zfs/qat_compress.c b/module/zfs/qat_compress.c index 4d17d7ac..62655f56 100644 --- a/module/zfs/qat_compress.c +++ b/module/zfs/qat_compress.c @@ -364,10 +364,6 @@ qat_compress(qat_compress_dir_t dir, char *src, int src_len, Cpa32U dst_buffer_list_mem_size = sizeof (CpaBufferList) + (num_dst_buf * sizeof (CpaFlatBuffer)); - if (!is_vmalloc_addr(src) || !is_vmalloc_addr(src + src_len - 1) || - !is_vmalloc_addr(dst) || !is_vmalloc_addr(dst + dst_len - 1)) - return (-1); - if (PHYS_CONTIG_ALLOC(&in_pages, num_src_buf * sizeof (struct page *)) != CPA_STATUS_SUCCESS) goto fail; diff --git a/module/zfs/spa.c b/module/zfs/spa.c index a7a2f628..02dda927 100644 --- a/module/zfs/spa.c +++ b/module/zfs/spa.c @@ -1182,6 +1182,14 @@ spa_activate(spa_t *spa, int mode) spa->spa_zvol_taskq = taskq_create("z_zvol", 1, defclsyspri, 1, INT_MAX, 0); + /* + * Taskq dedicated to prefetcher threads: this is used to prevent the + * pool traverse code from monopolizing the global (and limited) + * system_taskq by inappropriately scheduling long running tasks on it. + */ + spa->spa_prefetch_taskq = taskq_create("z_prefetch", boot_ncpus, + defclsyspri, 1, INT_MAX, TASKQ_DYNAMIC); + /* * The taskq to upgrade datasets in this pool. Currently used by * feature SPA_FEATURE_USEROBJ_ACCOUNTING. @@ -1211,6 +1219,11 @@ spa_deactivate(spa_t *spa) spa->spa_zvol_taskq = NULL; } + if (spa->spa_prefetch_taskq) { + taskq_destroy(spa->spa_prefetch_taskq); + spa->spa_prefetch_taskq = NULL; + } + if (spa->spa_upgrade_taskq) { taskq_destroy(spa->spa_upgrade_taskq); spa->spa_upgrade_taskq = NULL; @@ -2458,6 +2471,10 @@ spa_activity_check(spa_t *spa, uberblock_t *ub, nvlist_t *config) import_delay = MAX(import_delay, import_intervals * MSEC2NSEC(MAX(zfs_multihost_interval, MMP_MIN_INTERVAL))); + zfs_dbgmsg("import_delay=%llu ub_mmp_delay=%llu import_intervals=%u " + "leaves=%u", import_delay, ub->ub_mmp_delay, import_intervals, + vdev_count_leaves(spa)); + /* Add a small random factor in case of simultaneous imports (0-25%) */ import_expire = gethrtime() + import_delay + (import_delay * spa_get_random(250) / 1000); @@ -3778,10 +3795,14 @@ spa_get_stats(const char *name, nvlist_t **config, ZPOOL_CONFIG_ERRCOUNT, spa_get_errlog_size(spa)) == 0); - if (spa_suspended(spa)) + if (spa_suspended(spa)) { VERIFY(nvlist_add_uint64(*config, ZPOOL_CONFIG_SUSPENDED, spa->spa_failmode) == 0); + VERIFY(nvlist_add_uint64(*config, + ZPOOL_CONFIG_SUSPENDED_REASON, + spa->spa_suspended) == 0); + } spa_add_spares(spa, *config); spa_add_l2cache(spa, *config); @@ -6969,7 +6990,7 @@ spa_sync(spa_t *spa, uint64_t txg) if (error == 0) break; - zio_suspend(spa, NULL); + zio_suspend(spa, NULL, ZIO_SUSPEND_IOERR); zio_resume_wait(spa); } dmu_tx_commit(tx); diff --git a/module/zfs/spa_config.c b/module/zfs/spa_config.c index 5b792b86..fea23901 100644 --- a/module/zfs/spa_config.c +++ b/module/zfs/spa_config.c @@ -147,6 +147,26 @@ out: kobj_close_file(file); } +static int +spa_config_remove(spa_config_dirent_t *dp) +{ +#if defined(__linux__) && defined(_KERNEL) + int error, flags = FWRITE | FTRUNC; + uio_seg_t seg = UIO_SYSSPACE; + vnode_t *vp; + + error = vn_open(dp->scd_path, seg, flags, 0644, &vp, 0, 0); + if (error == 0) { + (void) VOP_FSYNC(vp, FSYNC, kcred, NULL); + (void) VOP_CLOSE(vp, 0, 1, 0, kcred, NULL); + } + + return (error); +#else + return (vn_remove(dp->scd_path, UIO_SYSSPACE, RMFILE)); +#endif +} + static int spa_config_write(spa_config_dirent_t *dp, nvlist_t *nvl) { @@ -161,7 +181,10 @@ spa_config_write(spa_config_dirent_t *dp, nvlist_t *nvl) * If the nvlist is empty (NULL), then remove the old cachefile. */ if (nvl == NULL) { - err = vn_remove(dp->scd_path, UIO_SYSSPACE, RMFILE); + err = spa_config_remove(dp); + if (err == ENOENT) + err = 0; + return (err); } @@ -174,9 +197,9 @@ spa_config_write(spa_config_dirent_t *dp, nvlist_t *nvl) #if defined(__linux__) && defined(_KERNEL) /* * Write the configuration to disk. Due to the complexity involved - * in performing a rename from within the kernel the file is truncated - * and overwritten in place. In the event of an error the file is - * unlinked to make sure we always have a consistent view of the data. + * in performing a rename and remove from within the kernel the file + * is instead truncated and overwritten in place. This way we always + * have a consistent view of the data or a zero length file. */ err = vn_open(dp->scd_path, UIO_SYSSPACE, oflags, 0644, &vp, 0, 0); if (err == 0) { @@ -186,9 +209,8 @@ spa_config_write(spa_config_dirent_t *dp, nvlist_t *nvl) err = VOP_FSYNC(vp, FSYNC, kcred, NULL); (void) VOP_CLOSE(vp, oflags, 1, 0, kcred, NULL); - if (err) - (void) vn_remove(dp->scd_path, UIO_SYSSPACE, RMFILE); + (void) spa_config_remove(dp); } #else /* diff --git a/module/zfs/spa_misc.c b/module/zfs/spa_misc.c index 3787e010..e92c3948 100644 --- a/module/zfs/spa_misc.c +++ b/module/zfs/spa_misc.c @@ -1691,7 +1691,7 @@ spa_get_failmode(spa_t *spa) boolean_t spa_suspended(spa_t *spa) { - return (spa->spa_suspended); + return (spa->spa_suspended != ZIO_SUSPEND_NONE); } uint64_t diff --git a/module/zfs/spa_stats.c b/module/zfs/spa_stats.c index 7ca35980..8950d9c5 100644 --- a/module/zfs/spa_stats.c +++ b/module/zfs/spa_stats.c @@ -714,25 +714,38 @@ spa_io_history_destroy(spa_t *spa) */ /* - * MMP statistics - Information exported regarding each MMP update + * MMP statistics - Information exported regarding attempted MMP writes + * For MMP writes issued, fields used as per comments below. + * For MMP writes skipped, an entry represents a span of time when + * writes were skipped for same reason (error from mmp_random_leaf). + * Differences are: + * timestamp time first write skipped, if >1 skipped in a row + * mmp_delay delay value at timestamp + * vdev_guid number of writes skipped + * io_error one of enum mmp_error + * duration time span (ns) of skipped writes */ typedef struct spa_mmp_history { + uint64_t mmp_kstat_id; /* unique # for updates */ uint64_t txg; /* txg of last sync */ - uint64_t timestamp; /* UTC time of of last sync */ - uint64_t mmp_delay; /* nanosec since last MMP write */ + uint64_t timestamp; /* UTC time MMP write issued */ + uint64_t mmp_delay; /* mmp_thread.mmp_delay at timestamp */ uint64_t vdev_guid; /* unique ID of leaf vdev */ char *vdev_path; - uint64_t vdev_label; /* vdev label */ + int vdev_label; /* vdev label */ + int io_error; /* error status of MMP write */ + hrtime_t error_start; /* hrtime of start of error period */ + hrtime_t duration; /* time from submission to completion */ list_node_t smh_link; } spa_mmp_history_t; static int spa_mmp_history_headers(char *buf, size_t size) { - (void) snprintf(buf, size, "%-10s %-10s %-12s %-24s %-10s %s\n", - "txg", "timestamp", "mmp_delay", "vdev_guid", "vdev_label", - "vdev_path"); + (void) snprintf(buf, size, "%-10s %-10s %-10s %-6s %-10s %-12s %-24s " + "%-10s %s\n", "id", "txg", "timestamp", "error", "duration", + "mmp_delay", "vdev_guid", "vdev_label", "vdev_path"); return (0); } @@ -740,12 +753,16 @@ static int spa_mmp_history_data(char *buf, size_t size, void *data) { spa_mmp_history_t *smh = (spa_mmp_history_t *)data; - - (void) snprintf(buf, size, "%-10llu %-10llu %-12llu %-24llu %-10llu " - "%s\n", - (u_longlong_t)smh->txg, (u_longlong_t)smh->timestamp, - (u_longlong_t)smh->mmp_delay, (u_longlong_t)smh->vdev_guid, - (u_longlong_t)smh->vdev_label, + char skip_fmt[] = "%-10llu %-10llu %10llu %#6llx %10lld %12llu %-24llu " + "%-10lld %s\n"; + char write_fmt[] = "%-10llu %-10llu %10llu %6lld %10lld %12llu %-24llu " + "%-10lld %s\n"; + + (void) snprintf(buf, size, (smh->error_start ? skip_fmt : write_fmt), + (u_longlong_t)smh->mmp_kstat_id, (u_longlong_t)smh->txg, + (u_longlong_t)smh->timestamp, (longlong_t)smh->io_error, + (longlong_t)smh->duration, (u_longlong_t)smh->mmp_delay, + (u_longlong_t)smh->vdev_guid, (u_longlong_t)smh->vdev_label, (smh->vdev_path ? smh->vdev_path : "-")); return (0); @@ -861,27 +878,102 @@ spa_mmp_history_destroy(spa_t *spa) } /* - * Add a new MMP update to historical record. + * Set duration in existing "skip" record to how long we have waited for a leaf + * vdev to become available. + * + * Important that we start search at the head of the list where new + * records are inserted, so this is normally an O(1) operation. */ -void -spa_mmp_history_add(uint64_t txg, uint64_t timestamp, uint64_t mmp_delay, - vdev_t *vd, int label) +int +spa_mmp_history_set_skip(spa_t *spa, uint64_t mmp_kstat_id) +{ + spa_stats_history_t *ssh = &spa->spa_stats.mmp_history; + spa_mmp_history_t *smh; + int error = ENOENT; + + if (zfs_multihost_history == 0 && ssh->size == 0) + return (0); + + mutex_enter(&ssh->lock); + for (smh = list_head(&ssh->list); smh != NULL; + smh = list_next(&ssh->list, smh)) { + if (smh->mmp_kstat_id == mmp_kstat_id) { + ASSERT3U(smh->io_error, !=, 0); + smh->duration = gethrtime() - smh->error_start; + smh->vdev_guid++; + error = 0; + break; + } + } + mutex_exit(&ssh->lock); + + return (error); +} + +/* + * Set MMP write duration and error status in existing record. + * See comment re: search order above spa_mmp_history_set_skip(). + */ +int +spa_mmp_history_set(spa_t *spa, uint64_t mmp_kstat_id, int io_error, + hrtime_t duration) +{ + spa_stats_history_t *ssh = &spa->spa_stats.mmp_history; + spa_mmp_history_t *smh; + int error = ENOENT; + + if (zfs_multihost_history == 0 && ssh->size == 0) + return (0); + + mutex_enter(&ssh->lock); + for (smh = list_head(&ssh->list); smh != NULL; + smh = list_next(&ssh->list, smh)) { + if (smh->mmp_kstat_id == mmp_kstat_id) { + ASSERT(smh->io_error == 0); + smh->io_error = io_error; + smh->duration = duration; + error = 0; + break; + } + } + mutex_exit(&ssh->lock); + + return (error); +} + +/* + * Add a new MMP historical record. + * error == 0 : a write was issued. + * error != 0 : a write was not issued because no leaves were found. + */ +void * +spa_mmp_history_add(spa_t *spa, uint64_t txg, uint64_t timestamp, + uint64_t mmp_delay, vdev_t *vd, int label, uint64_t mmp_kstat_id, + int error) { - spa_t *spa = vd->vdev_spa; spa_stats_history_t *ssh = &spa->spa_stats.mmp_history; spa_mmp_history_t *smh, *rm; if (zfs_multihost_history == 0 && ssh->size == 0) - return; + return (NULL); smh = kmem_zalloc(sizeof (spa_mmp_history_t), KM_SLEEP); smh->txg = txg; smh->timestamp = timestamp; smh->mmp_delay = mmp_delay; - smh->vdev_guid = vd->vdev_guid; - if (vd->vdev_path) - smh->vdev_path = strdup(vd->vdev_path); + if (vd) { + smh->vdev_guid = vd->vdev_guid; + if (vd->vdev_path) + smh->vdev_path = strdup(vd->vdev_path); + } smh->vdev_label = label; + smh->mmp_kstat_id = mmp_kstat_id; + + if (error) { + smh->io_error = error; + smh->error_start = gethrtime(); + smh->vdev_guid = 1; + } mutex_enter(&ssh->lock); @@ -897,6 +989,7 @@ spa_mmp_history_add(uint64_t txg, uint64_t timestamp, uint64_t mmp_delay, } mutex_exit(&ssh->lock); + return ((void *)smh); } void diff --git a/module/zfs/vdev.c b/module/zfs/vdev.c index df07d893..acac2a97 100644 --- a/module/zfs/vdev.c +++ b/module/zfs/vdev.c @@ -56,6 +56,22 @@ */ int metaslabs_per_vdev = 200; +/* + * Rate limit delay events to this many IO delays per second. + */ +unsigned int zfs_delays_per_second = 20; + +/* + * Rate limit checksum events after this many checksum errors per second. + */ +unsigned int zfs_checksums_per_second = 20; + +/* + * Ignore errors during scrub/resilver. Allows to work around resilver + * upon import when there are pool errors. + */ +int zfs_scan_ignore_errors = 0; + /* * Virtual device management. */ @@ -357,8 +373,8 @@ vdev_alloc_common(spa_t *spa, uint_t id, uint64_t guid, vdev_ops_t *ops) * and checksum events so that we don't overwhelm ZED with thousands * of events when a disk is acting up. */ - zfs_ratelimit_init(&vd->vdev_delay_rl, DELAYS_PER_SECOND, 1); - zfs_ratelimit_init(&vd->vdev_checksum_rl, CHECKSUMS_PER_SECOND, 1); + zfs_ratelimit_init(&vd->vdev_delay_rl, &zfs_delays_per_second, 1); + zfs_ratelimit_init(&vd->vdev_checksum_rl, &zfs_checksums_per_second, 1); list_link_init(&vd->vdev_config_dirty_node); list_link_init(&vd->vdev_state_dirty_node); @@ -1951,6 +1967,12 @@ vdev_dtl_reassess(vdev_t *vd, uint64_t txg, uint64_t scrub_txg, int scrub_done) mutex_enter(&vd->vdev_dtl_lock); + /* + * If requested, pretend the scan completed cleanly. + */ + if (zfs_scan_ignore_errors && scn) + scn->scn_phys.scn_errors = 0; + /* * If we've completed a scan cleanly then determine * if this vdev should remove any DTLs. We only want to @@ -3776,5 +3798,18 @@ module_param(metaslabs_per_vdev, int, 0644); MODULE_PARM_DESC(metaslabs_per_vdev, "Divide added vdev into approximately (but no more than) this number " "of metaslabs"); + +module_param(zfs_delays_per_second, uint, 0644); +MODULE_PARM_DESC(zfs_delays_per_second, "Rate limit delay events to this many " + "IO delays per second"); + +module_param(zfs_checksums_per_second, uint, 0644); + MODULE_PARM_DESC(zfs_checksums_per_second, "Rate limit checksum events " + "to this many checksum errors per second (do not set below zed" + "threshold)."); + +module_param(zfs_scan_ignore_errors, int, 0644); +MODULE_PARM_DESC(zfs_scan_ignore_errors, + "Ignore errors during resilver/scrub"); /* END CSTYLED */ #endif diff --git a/module/zfs/vdev_label.c b/module/zfs/vdev_label.c index 27e79ae6..a1bfe5a1 100644 --- a/module/zfs/vdev_label.c +++ b/module/zfs/vdev_label.c @@ -1501,7 +1501,6 @@ retry: if ((error = vdev_uberblock_sync_list(svd, svdcount, ub, flags)) != 0) goto retry; - if (spa_multihost(spa)) mmp_update_uberblock(spa, ub); diff --git a/module/zfs/zfs_acl.c b/module/zfs/zfs_acl.c index 7ddedeaa..1fcfca0c 100644 --- a/module/zfs/zfs_acl.c +++ b/module/zfs/zfs_acl.c @@ -1323,6 +1323,7 @@ zfs_aclset_common(znode_t *zp, zfs_acl_t *aclp, cred_t *cr, dmu_tx_t *tx) sa_bulk_attr_t bulk[5]; uint64_t ctime[2]; int count = 0; + zfs_acl_phys_t acl_phys; mode = zp->z_mode; @@ -1369,7 +1370,6 @@ zfs_aclset_common(znode_t *zp, zfs_acl_t *aclp, cred_t *cr, dmu_tx_t *tx) } else { /* Painful legacy way */ zfs_acl_node_t *aclnode; uint64_t off = 0; - zfs_acl_phys_t acl_phys; uint64_t aoid; if ((error = sa_lookup(zp->z_sa_hdl, SA_ZPL_ZNODE_ACL(zfsvfs), diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c index 6f6ce79d..0d2b61a1 100644 --- a/module/zfs/zfs_vnops.c +++ b/module/zfs/zfs_vnops.c @@ -398,6 +398,7 @@ mappedread(struct inode *ip, int nbytes, uio_t *uio) pp = find_lock_page(mp, start >> PAGE_SHIFT); if (pp) { ASSERT(PageUptodate(pp)); + unlock_page(pp); pb = kmap(pp); error = uiomove(pb + off, bytes, UIO_READ, uio); @@ -407,7 +408,6 @@ mappedread(struct inode *ip, int nbytes, uio_t *uio) flush_dcache_page(pp); mark_page_accessed(pp); - unlock_page(pp); put_page(pp); } else { error = dmu_read_uio_dbuf(sa_get_db(zp->z_sa_hdl), @@ -2223,7 +2223,7 @@ out: */ /* ARGSUSED */ int -zfs_readdir(struct inode *ip, struct dir_context *ctx, cred_t *cr) +zfs_readdir(struct inode *ip, zpl_dir_context_t *ctx, cred_t *cr) { znode_t *zp = ITOZ(ip); zfsvfs_t *zfsvfs = ITOZSB(ip); @@ -2328,7 +2328,7 @@ zfs_readdir(struct inode *ip, struct dir_context *ctx, cred_t *cr) type = ZFS_DIRENT_TYPE(zap.za_first_integer); } - done = !dir_emit(ctx, zap.za_name, strlen(zap.za_name), + done = !zpl_dir_emit(ctx, zap.za_name, strlen(zap.za_name), objnum, type); if (done) break; diff --git a/module/zfs/zil.c b/module/zfs/zil.c index 4d714cef..645b1d4d 100644 --- a/module/zfs/zil.c +++ b/module/zfs/zil.c @@ -1167,8 +1167,7 @@ cont: lrw->lr_offset += dnow; lrw->lr_length -= dnow; ZIL_STAT_BUMP(zil_itx_needcopy_count); - ZIL_STAT_INCR(zil_itx_needcopy_bytes, - lrw->lr_length); + ZIL_STAT_INCR(zil_itx_needcopy_bytes, dnow); } else { ASSERT(itx->itx_wr_state == WR_INDIRECT); dbuf = NULL; diff --git a/module/zfs/zio.c b/module/zfs/zio.c index 1d69d8d8..9a465e1b 100644 --- a/module/zfs/zio.c +++ b/module/zfs/zio.c @@ -491,21 +491,26 @@ zio_remove_child(zio_t *pio, zio_t *cio, zio_link_t *zl) } static boolean_t -zio_wait_for_children(zio_t *zio, enum zio_child child, enum zio_wait_type wait) +zio_wait_for_children(zio_t *zio, uint8_t childbits, enum zio_wait_type wait) { - uint64_t *countp = &zio->io_children[child][wait]; boolean_t waiting = B_FALSE; mutex_enter(&zio->io_lock); ASSERT(zio->io_stall == NULL); - if (*countp != 0) { - zio->io_stage >>= 1; - ASSERT3U(zio->io_stage, !=, ZIO_STAGE_OPEN); - zio->io_stall = countp; - waiting = B_TRUE; + for (int c = 0; c < ZIO_CHILD_TYPES; c++) { + if (!(ZIO_CHILD_BIT_IS_SET(childbits, c))) + continue; + + uint64_t *countp = &zio->io_children[c][wait]; + if (*countp != 0) { + zio->io_stage >>= 1; + ASSERT3U(zio->io_stage, !=, ZIO_STAGE_OPEN); + zio->io_stall = countp; + waiting = B_TRUE; + break; + } } mutex_exit(&zio->io_lock); - return (waiting); } @@ -1296,9 +1301,10 @@ zio_write_compress(zio_t *zio) * If our children haven't all reached the ready stage, * wait for them and then repeat this pipeline stage. */ - if (zio_wait_for_children(zio, ZIO_CHILD_GANG, ZIO_WAIT_READY) || - zio_wait_for_children(zio, ZIO_CHILD_LOGICAL, ZIO_WAIT_READY)) + if (zio_wait_for_children(zio, ZIO_CHILD_LOGICAL_BIT | + ZIO_CHILD_GANG_BIT, ZIO_WAIT_READY)) { return (ZIO_PIPELINE_STOP); + } if (!IO_IS_ALLOCATING(zio)) return (ZIO_PIPELINE_CONTINUE); @@ -1858,7 +1864,7 @@ zio_reexecute(zio_t *pio) } void -zio_suspend(spa_t *spa, zio_t *zio) +zio_suspend(spa_t *spa, zio_t *zio, zio_suspend_reason_t reason) { if (spa_get_failmode(spa) == ZIO_FAILURE_MODE_PANIC) fm_panic("Pool '%s' has encountered an uncorrectable I/O " @@ -1877,7 +1883,7 @@ zio_suspend(spa_t *spa, zio_t *zio) ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE | ZIO_FLAG_GODFATHER); - spa->spa_suspended = B_TRUE; + spa->spa_suspended = reason; if (zio != NULL) { ASSERT(!(zio->io_flags & ZIO_FLAG_GODFATHER)); @@ -1900,7 +1906,7 @@ zio_resume(spa_t *spa) * Reexecute all previously suspended i/o. */ mutex_enter(&spa->spa_suspend_lock); - spa->spa_suspended = B_FALSE; + spa->spa_suspended = ZIO_SUSPEND_NONE; cv_broadcast(&spa->spa_suspend_cv); pio = spa->spa_suspend_zio_root; spa->spa_suspend_zio_root = NULL; @@ -2229,8 +2235,9 @@ zio_gang_issue(zio_t *zio) { blkptr_t *bp = zio->io_bp; - if (zio_wait_for_children(zio, ZIO_CHILD_GANG, ZIO_WAIT_DONE)) + if (zio_wait_for_children(zio, ZIO_CHILD_GANG_BIT, ZIO_WAIT_DONE)) { return (ZIO_PIPELINE_STOP); + } ASSERT(BP_IS_GANG(bp) && zio->io_gang_leader == zio); ASSERT(zio->io_child_type > ZIO_CHILD_GANG); @@ -2561,8 +2568,9 @@ zio_ddt_read_done(zio_t *zio) { blkptr_t *bp = zio->io_bp; - if (zio_wait_for_children(zio, ZIO_CHILD_DDT, ZIO_WAIT_DONE)) + if (zio_wait_for_children(zio, ZIO_CHILD_DDT_BIT, ZIO_WAIT_DONE)) { return (ZIO_PIPELINE_STOP); + } ASSERT(BP_GET_DEDUP(bp)); ASSERT(BP_GET_PSIZE(bp) == zio->io_size); @@ -3292,8 +3300,9 @@ zio_vdev_io_done(zio_t *zio) vdev_ops_t *ops = vd ? vd->vdev_ops : &vdev_mirror_ops; boolean_t unexpected_error = B_FALSE; - if (zio_wait_for_children(zio, ZIO_CHILD_VDEV, ZIO_WAIT_DONE)) + if (zio_wait_for_children(zio, ZIO_CHILD_VDEV_BIT, ZIO_WAIT_DONE)) { return (ZIO_PIPELINE_STOP); + } ASSERT(zio->io_type == ZIO_TYPE_READ || zio->io_type == ZIO_TYPE_WRITE); @@ -3362,8 +3371,9 @@ zio_vdev_io_assess(zio_t *zio) { vdev_t *vd = zio->io_vd; - if (zio_wait_for_children(zio, ZIO_CHILD_VDEV, ZIO_WAIT_DONE)) + if (zio_wait_for_children(zio, ZIO_CHILD_VDEV_BIT, ZIO_WAIT_DONE)) { return (ZIO_PIPELINE_STOP); + } if (vd == NULL && !(zio->io_flags & ZIO_FLAG_CONFIG_WRITER)) spa_config_exit(zio->io_spa, SCL_ZIO, zio); @@ -3578,9 +3588,10 @@ zio_ready(zio_t *zio) zio_t *pio, *pio_next; zio_link_t *zl = NULL; - if (zio_wait_for_children(zio, ZIO_CHILD_GANG, ZIO_WAIT_READY) || - zio_wait_for_children(zio, ZIO_CHILD_DDT, ZIO_WAIT_READY)) + if (zio_wait_for_children(zio, ZIO_CHILD_GANG_BIT | ZIO_CHILD_DDT_BIT, + ZIO_WAIT_READY)) { return (ZIO_PIPELINE_STOP); + } if (zio->io_ready) { ASSERT(IO_IS_ALLOCATING(zio)); @@ -3721,11 +3732,9 @@ zio_done(zio_t *zio) * If our children haven't all completed, * wait for them and then repeat this pipeline stage. */ - if (zio_wait_for_children(zio, ZIO_CHILD_VDEV, ZIO_WAIT_DONE) || - zio_wait_for_children(zio, ZIO_CHILD_GANG, ZIO_WAIT_DONE) || - zio_wait_for_children(zio, ZIO_CHILD_DDT, ZIO_WAIT_DONE) || - zio_wait_for_children(zio, ZIO_CHILD_LOGICAL, ZIO_WAIT_DONE)) + if (zio_wait_for_children(zio, ZIO_CHILD_ALL_BITS, ZIO_WAIT_DONE)) { return (ZIO_PIPELINE_STOP); + } /* * If the allocation throttle is enabled, then update the accounting. @@ -3966,7 +3975,7 @@ zio_done(zio_t *zio) * We'd fail again if we reexecuted now, so suspend * until conditions improve (e.g. device comes online). */ - zio_suspend(zio->io_spa, zio); + zio_suspend(zio->io_spa, zio, ZIO_SUSPEND_IOERR); } else { /* * Reexecution is potentially a huge amount of work. diff --git a/module/zfs/zle.c b/module/zfs/zle.c index 13c5673f..613607fa 100644 --- a/module/zfs/zle.c +++ b/module/zfs/zle.c @@ -74,10 +74,14 @@ zle_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n) while (src < s_end && dst < d_end) { int len = 1 + *src++; if (len <= n) { + if (src + len > s_end || dst + len > d_end) + return (-1); while (len-- != 0) *dst++ = *src++; } else { len -= n; + if (dst + len > d_end) + return (-1); while (len-- != 0) *dst++ = 0; } diff --git a/module/zfs/zpl_ctldir.c b/module/zfs/zpl_ctldir.c index 1c5fb34e..6df367b8 100644 --- a/module/zfs/zpl_ctldir.c +++ b/module/zfs/zpl_ctldir.c @@ -50,27 +50,27 @@ zpl_common_open(struct inode *ip, struct file *filp) * Get root directory contents. */ static int -zpl_root_iterate(struct file *filp, struct dir_context *ctx) +zpl_root_iterate(struct file *filp, zpl_dir_context_t *ctx) { zfsvfs_t *zfsvfs = ITOZSB(file_inode(filp)); int error = 0; ZFS_ENTER(zfsvfs); - if (!dir_emit_dots(filp, ctx)) + if (!zpl_dir_emit_dots(filp, ctx)) goto out; if (ctx->pos == 2) { - if (!dir_emit(ctx, ZFS_SNAPDIR_NAME, strlen(ZFS_SNAPDIR_NAME), - ZFSCTL_INO_SNAPDIR, DT_DIR)) + if (!zpl_dir_emit(ctx, ZFS_SNAPDIR_NAME, + strlen(ZFS_SNAPDIR_NAME), ZFSCTL_INO_SNAPDIR, DT_DIR)) goto out; ctx->pos++; } if (ctx->pos == 3) { - if (!dir_emit(ctx, ZFS_SHAREDIR_NAME, strlen(ZFS_SHAREDIR_NAME), - ZFSCTL_INO_SHARES, DT_DIR)) + if (!zpl_dir_emit(ctx, ZFS_SHAREDIR_NAME, + strlen(ZFS_SHAREDIR_NAME), ZFSCTL_INO_SHARES, DT_DIR)) goto out; ctx->pos++; @@ -85,7 +85,8 @@ out: static int zpl_root_readdir(struct file *filp, void *dirent, filldir_t filldir) { - struct dir_context ctx = DIR_CONTEXT_INIT(dirent, filldir, filp->f_pos); + zpl_dir_context_t ctx = + ZPL_DIR_CONTEXT_INIT(dirent, filldir, filp->f_pos); int error; error = zpl_root_iterate(filp, &ctx); @@ -93,7 +94,7 @@ zpl_root_readdir(struct file *filp, void *dirent, filldir_t filldir) return (error); } -#endif /* HAVE_VFS_ITERATE */ +#endif /* !HAVE_VFS_ITERATE && !HAVE_VFS_ITERATE_SHARED */ /* * Get root directory attributes. @@ -248,7 +249,7 @@ zpl_snapdir_lookup(struct inode *dip, struct dentry *dentry, } static int -zpl_snapdir_iterate(struct file *filp, struct dir_context *ctx) +zpl_snapdir_iterate(struct file *filp, zpl_dir_context_t *ctx) { zfsvfs_t *zfsvfs = ITOZSB(file_inode(filp)); fstrans_cookie_t cookie; @@ -260,7 +261,7 @@ zpl_snapdir_iterate(struct file *filp, struct dir_context *ctx) ZFS_ENTER(zfsvfs); cookie = spl_fstrans_mark(); - if (!dir_emit_dots(filp, ctx)) + if (!zpl_dir_emit_dots(filp, ctx)) goto out; pos = ctx->pos; @@ -272,7 +273,7 @@ zpl_snapdir_iterate(struct file *filp, struct dir_context *ctx) if (error) goto out; - if (!dir_emit(ctx, snapname, strlen(snapname), + if (!zpl_dir_emit(ctx, snapname, strlen(snapname), ZFSCTL_INO_SHARES - id, DT_DIR)) goto out; @@ -292,7 +293,8 @@ out: static int zpl_snapdir_readdir(struct file *filp, void *dirent, filldir_t filldir) { - struct dir_context ctx = DIR_CONTEXT_INIT(dirent, filldir, filp->f_pos); + zpl_dir_context_t ctx = + ZPL_DIR_CONTEXT_INIT(dirent, filldir, filp->f_pos); int error; error = zpl_snapdir_iterate(filp, &ctx); @@ -300,7 +302,7 @@ zpl_snapdir_readdir(struct file *filp, void *dirent, filldir_t filldir) return (error); } -#endif /* HAVE_VFS_ITERATE */ +#endif /* !HAVE_VFS_ITERATE && !HAVE_VFS_ITERATE_SHARED */ static int zpl_snapdir_rename2(struct inode *sdip, struct dentry *sdentry, @@ -463,7 +465,7 @@ zpl_shares_lookup(struct inode *dip, struct dentry *dentry, } static int -zpl_shares_iterate(struct file *filp, struct dir_context *ctx) +zpl_shares_iterate(struct file *filp, zpl_dir_context_t *ctx) { fstrans_cookie_t cookie; cred_t *cr = CRED(); @@ -475,7 +477,7 @@ zpl_shares_iterate(struct file *filp, struct dir_context *ctx) cookie = spl_fstrans_mark(); if (zfsvfs->z_shares_dir == 0) { - dir_emit_dots(filp, ctx); + zpl_dir_emit_dots(filp, ctx); goto out; } @@ -500,7 +502,8 @@ out: static int zpl_shares_readdir(struct file *filp, void *dirent, filldir_t filldir) { - struct dir_context ctx = DIR_CONTEXT_INIT(dirent, filldir, filp->f_pos); + zpl_dir_context_t ctx = + ZPL_DIR_CONTEXT_INIT(dirent, filldir, filp->f_pos); int error; error = zpl_shares_iterate(filp, &ctx); @@ -508,7 +511,7 @@ zpl_shares_readdir(struct file *filp, void *dirent, filldir_t filldir) return (error); } -#endif /* HAVE_VFS_ITERATE */ +#endif /* !HAVE_VFS_ITERATE && !HAVE_VFS_ITERATE_SHARED */ /* ARGSUSED */ static int diff --git a/module/zfs/zpl_file.c b/module/zfs/zpl_file.c index 4805abe6..94a521af 100644 --- a/module/zfs/zpl_file.c +++ b/module/zfs/zpl_file.c @@ -76,7 +76,7 @@ zpl_release(struct inode *ip, struct file *filp) } static int -zpl_iterate(struct file *filp, struct dir_context *ctx) +zpl_iterate(struct file *filp, zpl_dir_context_t *ctx) { cred_t *cr = CRED(); int error; @@ -96,7 +96,8 @@ zpl_iterate(struct file *filp, struct dir_context *ctx) static int zpl_readdir(struct file *filp, void *dirent, filldir_t filldir) { - struct dir_context ctx = DIR_CONTEXT_INIT(dirent, filldir, filp->f_pos); + zpl_dir_context_t ctx = + ZPL_DIR_CONTEXT_INIT(dirent, filldir, filp->f_pos); int error; error = zpl_iterate(filp, &ctx); @@ -104,7 +105,7 @@ zpl_readdir(struct file *filp, void *dirent, filldir_t filldir) return (error); } -#endif /* HAVE_VFS_ITERATE */ +#endif /* !HAVE_VFS_ITERATE && !HAVE_VFS_ITERATE_SHARED */ #if defined(HAVE_FSYNC_WITH_DENTRY) /* @@ -885,7 +886,7 @@ const struct file_operations zpl_file_operations = { const struct file_operations zpl_dir_file_operations = { .llseek = generic_file_llseek, .read = generic_read_dir, -#ifdef HAVE_VFS_ITERATE_SHARED +#if defined(HAVE_VFS_ITERATE_SHARED) .iterate_shared = zpl_iterate, #elif defined(HAVE_VFS_ITERATE) .iterate = zpl_iterate, diff --git a/module/zfs/zpl_super.c b/module/zfs/zpl_super.c index b6ef6027..fc10271b 100644 --- a/module/zfs/zpl_super.c +++ b/module/zfs/zpl_super.c @@ -36,7 +36,7 @@ zpl_inode_alloc(struct super_block *sb) struct inode *ip; VERIFY3S(zfs_inode_alloc(sb, &ip), ==, 0); - ip->i_version = 1; + inode_set_iversion(ip, 1); return (ip); } @@ -248,14 +248,61 @@ zpl_fill_super(struct super_block *sb, void *data, int silent) return (error); } -#ifdef HAVE_MOUNT_NODEV +static int +zpl_test_super(struct super_block *s, void *data) +{ + zfsvfs_t *zfsvfs = s->s_fs_info; + objset_t *os = data; + + if (zfsvfs == NULL) + return (0); + + return (os == zfsvfs->z_os); +} + +static struct super_block * +zpl_mount_impl(struct file_system_type *fs_type, int flags, zfs_mnt_t *zm) +{ + struct super_block *s; + objset_t *os; + int err; + + err = dmu_objset_hold(zm->mnt_osname, FTAG, &os); + if (err) + return (ERR_PTR(-err)); + + s = zpl_sget(fs_type, zpl_test_super, set_anon_super, flags, os); + dmu_objset_rele(os, FTAG); + if (IS_ERR(s)) + return (ERR_CAST(s)); + + if (s->s_root == NULL) { + err = zpl_fill_super(s, zm, flags & SB_SILENT ? 1 : 0); + if (err) { + deactivate_locked_super(s); + return (ERR_PTR(err)); + } + s->s_flags |= SB_ACTIVE; + } else if ((flags ^ s->s_flags) & SB_RDONLY) { + deactivate_locked_super(s); + return (ERR_PTR(-EBUSY)); + } + + return (s); +} + +#ifdef HAVE_FST_MOUNT static struct dentry * zpl_mount(struct file_system_type *fs_type, int flags, const char *osname, void *data) { zfs_mnt_t zm = { .mnt_osname = osname, .mnt_data = data }; - return (mount_nodev(fs_type, flags, &zm, zpl_fill_super)); + struct super_block *sb = zpl_mount_impl(fs_type, flags, &zm); + if (IS_ERR(sb)) + return (ERR_CAST(sb)); + + return (dget(sb->s_root)); } #else static int @@ -264,9 +311,15 @@ zpl_get_sb(struct file_system_type *fs_type, int flags, { zfs_mnt_t zm = { .mnt_osname = osname, .mnt_data = data }; - return (get_sb_nodev(fs_type, flags, &zm, zpl_fill_super, mnt)); + struct super_block *sb = zpl_mount_impl(fs_type, flags, &zm); + if (IS_ERR(sb)) + return (PTR_ERR(sb)); + + (void) simple_set_mnt(mnt, sb); + + return (0); } -#endif /* HAVE_MOUNT_NODEV */ +#endif /* HAVE_FST_MOUNT */ static void zpl_kill_sb(struct super_block *sb) @@ -333,10 +386,10 @@ const struct super_operations zpl_super_operations = { struct file_system_type zpl_fs_type = { .owner = THIS_MODULE, .name = ZFS_DRIVER, -#ifdef HAVE_MOUNT_NODEV +#ifdef HAVE_FST_MOUNT .mount = zpl_mount, #else .get_sb = zpl_get_sb, -#endif /* HAVE_MOUNT_NODEV */ +#endif /* HAVE_FST_MOUNT */ .kill_sb = zpl_kill_sb, }; diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c index aac49420..3e7059b3 100644 --- a/module/zfs/zvol.c +++ b/module/zfs/zvol.c @@ -1559,7 +1559,7 @@ zvol_probe(dev_t dev, int *part, void *arg) struct kobject *kobj; zv = zvol_find_by_dev(dev); - kobj = zv ? get_disk(zv->zv_disk) : NULL; + kobj = zv ? get_disk_and_module(zv->zv_disk) : NULL; ASSERT(zv == NULL || MUTEX_HELD(&zv->zv_state_lock)); if (zv) mutex_exit(&zv->zv_state_lock); @@ -1666,7 +1666,7 @@ zvol_alloc(dev_t dev, const char *name) blk_queue_set_read_ahead(zv->zv_queue, 1); /* Disable write merging in favor of the ZIO pipeline. */ - queue_flag_set_unlocked(QUEUE_FLAG_NOMERGES, zv->zv_queue); + blk_queue_flag_set(QUEUE_FLAG_NOMERGES, zv->zv_queue); zv->zv_disk = alloc_disk(ZVOL_MINORS); if (zv->zv_disk == NULL) @@ -1817,12 +1817,12 @@ zvol_create_minor_impl(const char *name) blk_queue_max_discard_sectors(zv->zv_queue, (zvol_max_discard_blocks * zv->zv_volblocksize) >> 9); blk_queue_discard_granularity(zv->zv_queue, zv->zv_volblocksize); - queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, zv->zv_queue); + blk_queue_flag_set(QUEUE_FLAG_DISCARD, zv->zv_queue); #ifdef QUEUE_FLAG_NONROT - queue_flag_set_unlocked(QUEUE_FLAG_NONROT, zv->zv_queue); + blk_queue_flag_set(QUEUE_FLAG_NONROT, zv->zv_queue); #endif #ifdef QUEUE_FLAG_ADD_RANDOM - queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, zv->zv_queue); + blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, zv->zv_queue); #endif if (spa_writeable(dmu_objset_spa(os))) { diff --git a/module/zpios/pios.c b/module/zpios/pios.c index c70c0d6f..6ce96e67 100644 --- a/module/zpios/pios.c +++ b/module/zpios/pios.c @@ -289,10 +289,11 @@ zpios_setup_run(run_args_t **run_args, zpios_cmd_t *kcmd, struct file *file) ra = vmem_zalloc(size, KM_SLEEP); *run_args = ra; - strncpy(ra->pool, kcmd->cmd_pool, ZPIOS_NAME_SIZE - 1); - strncpy(ra->pre, kcmd->cmd_pre, ZPIOS_PATH_SIZE - 1); - strncpy(ra->post, kcmd->cmd_post, ZPIOS_PATH_SIZE - 1); - strncpy(ra->log, kcmd->cmd_log, ZPIOS_PATH_SIZE - 1); + snprintf(ra->pool, sizeof (ra->pool), "%s", kcmd->cmd_pool); + snprintf(ra->pre, sizeof (ra->pre), "%s", kcmd->cmd_pre); + snprintf(ra->post, sizeof (ra->post), "%s", kcmd->cmd_post); + snprintf(ra->log, sizeof (ra->log), "%s", kcmd->cmd_log); + ra->id = kcmd->cmd_id; ra->chunk_size = kcmd->cmd_chunk_size; ra->thread_count = kcmd->cmd_thread_count; diff --git a/rpm/Makefile.in b/rpm/Makefile.in index 27b27515..77e13ff0 100644 --- a/rpm/Makefile.in +++ b/rpm/Makefile.in @@ -40,6 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -55,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -83,14 +86,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -102,7 +109,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -118,9 +124,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -131,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -216,6 +222,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -227,6 +239,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -242,6 +255,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -255,9 +270,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -276,6 +292,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/rpm/generic/Makefile.in b/rpm/generic/Makefile.in index a2fc28ae..952a8c0b 100644 --- a/rpm/generic/Makefile.in +++ b/rpm/generic/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -178,6 +184,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -189,6 +201,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -204,6 +217,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -217,9 +232,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -238,6 +254,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/rpm/generic/zfs-kmod.spec.in b/rpm/generic/zfs-kmod.spec.in index cb23b0a8..a3678681 100644 --- a/rpm/generic/zfs-kmod.spec.in +++ b/rpm/generic/zfs-kmod.spec.in @@ -191,6 +191,15 @@ chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/* rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 08 2018 Tony Hutter - 0.7.9-1 +- Released 0.7.9-1, detailed release notes are available at: +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.9 +* Mon Apr 09 2018 Tony Hutter - 0.7.8-1 +- Released 0.7.8-1, detailed release notes are available at: +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.8 +* Wed Mar 14 2018 Tony Hutter - 0.7.7-1 +- Released 0.7.7-1, detailed release notes are available at: +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.7 * Thu Feb 01 2018 Tony Hutter - 0.7.6-1 - Released 0.7.6-1, detailed release notes are available at: - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.6 diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in index 8df57fa4..5b89db02 100644 --- a/rpm/generic/zfs.spec.in +++ b/rpm/generic/zfs.spec.in @@ -36,6 +36,16 @@ %bcond_with debug %bcond_with systemd +# Python permits the !/usr/bin/python shebang for scripts that are cross +# compatible between python2 and python3, but Fedora 28 does not. Fedora +# wants us to choose python3 for cross-compatible scripts. Since we want +# to support python2 and python3 users, exclude our scripts from Fedora 28's +# RPM build check, so that we don't get a bunch of build warnings. +# +# Details: https://github.com/zfsonlinux/zfs/issues/7360 +# +%global __brp_mangle_shebangs_exclude_from arc_summary.py|arcstat.py|dbufstat.py|test-runner.py + # Generic enable switch for systemd %if %{with systemd} %define _systemd 1 @@ -86,12 +96,15 @@ BuildRequires: libuuid-devel BuildRequires: libblkid-devel BuildRequires: libudev-devel BuildRequires: libattr-devel +%if 0%{?fedora} >= 28 +BuildRequires: libtirpc-devel +%endif %endif + %if 0%{?_systemd} Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -BuildRequires: systemd %endif # The zpool iostat/status -c scripts call some utilities like lsblk and iostat @@ -183,6 +196,7 @@ Requires: acl Requires: sudo Requires: sysstat Requires: rng-tools +Requires: libaio AutoReqProv: no %description test @@ -245,8 +259,15 @@ find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \; %post %if 0%{?_systemd} +%if 0%{?systemd_post:1} %systemd_post %{systemd_svcs} %else +if [ "$1" = "1" -o "$1" = "install" ] ; then + # Initial installation + systemctl preset %{systemd_svcs} >/dev/null || true +fi +%endif +%else if [ -x /sbin/chkconfig ]; then /sbin/chkconfig --add zfs-import /sbin/chkconfig --add zfs-mount @@ -258,9 +279,17 @@ exit 0 %preun %if 0%{?_systemd} +%if 0%{?systemd_preun:1} %systemd_preun %{systemd_svcs} %else -if [ "$1" = "0" ] && [ -x /sbin/chkconfig ]; then +if [ "$1" = "0" -o "$1" = "remove" ] ; then + # Package removal, not upgrade + systemctl --no-reload disable %{systemd_svcs} >/dev/null || true + systemctl stop %{systemd_svcs} >/dev/null || true +fi +%endif +%else +if [ "$1" = "0" -o "$1" = "remove" ] && [ -x /sbin/chkconfig ]; then /sbin/chkconfig --del zfs-import /sbin/chkconfig --del zfs-mount /sbin/chkconfig --del zfs-share @@ -271,7 +300,11 @@ exit 0 %postun %if 0%{?_systemd} +%if 0%{?systemd_postun:1} %systemd_postun %{systemd_svcs} +%else +systemctl --system daemon-reload >/dev/null || true +%endif %endif %files @@ -333,6 +366,15 @@ exit 0 %endif %changelog +* Tue May 08 2018 Tony Hutter - 0.7.9-1 +- Released 0.7.9-1, detailed release notes are available at: +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.9 +* Mon Apr 09 2018 Tony Hutter - 0.7.8-1 +- Released 0.7.8-1, detailed release notes are available at: +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.8 +* Wed Mar 14 2018 Tony Hutter - 0.7.7-1 +- Released 0.7.7-1, detailed release notes are available at: +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.7 * Thu Feb 01 2018 Tony Hutter - 0.7.6-1 - Released 0.7.6-1, detailed release notes are available at: - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.6 diff --git a/rpm/redhat/Makefile.in b/rpm/redhat/Makefile.in index 988d5cee..a2efbd7d 100644 --- a/rpm/redhat/Makefile.in +++ b/rpm/redhat/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -178,6 +184,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -189,6 +201,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -204,6 +217,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -217,9 +232,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -238,6 +254,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/rpm/redhat/zfs.spec.in b/rpm/redhat/zfs.spec.in index 8df57fa4..5b89db02 100644 --- a/rpm/redhat/zfs.spec.in +++ b/rpm/redhat/zfs.spec.in @@ -36,6 +36,16 @@ %bcond_with debug %bcond_with systemd +# Python permits the !/usr/bin/python shebang for scripts that are cross +# compatible between python2 and python3, but Fedora 28 does not. Fedora +# wants us to choose python3 for cross-compatible scripts. Since we want +# to support python2 and python3 users, exclude our scripts from Fedora 28's +# RPM build check, so that we don't get a bunch of build warnings. +# +# Details: https://github.com/zfsonlinux/zfs/issues/7360 +# +%global __brp_mangle_shebangs_exclude_from arc_summary.py|arcstat.py|dbufstat.py|test-runner.py + # Generic enable switch for systemd %if %{with systemd} %define _systemd 1 @@ -86,12 +96,15 @@ BuildRequires: libuuid-devel BuildRequires: libblkid-devel BuildRequires: libudev-devel BuildRequires: libattr-devel +%if 0%{?fedora} >= 28 +BuildRequires: libtirpc-devel +%endif %endif + %if 0%{?_systemd} Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -BuildRequires: systemd %endif # The zpool iostat/status -c scripts call some utilities like lsblk and iostat @@ -183,6 +196,7 @@ Requires: acl Requires: sudo Requires: sysstat Requires: rng-tools +Requires: libaio AutoReqProv: no %description test @@ -245,8 +259,15 @@ find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \; %post %if 0%{?_systemd} +%if 0%{?systemd_post:1} %systemd_post %{systemd_svcs} %else +if [ "$1" = "1" -o "$1" = "install" ] ; then + # Initial installation + systemctl preset %{systemd_svcs} >/dev/null || true +fi +%endif +%else if [ -x /sbin/chkconfig ]; then /sbin/chkconfig --add zfs-import /sbin/chkconfig --add zfs-mount @@ -258,9 +279,17 @@ exit 0 %preun %if 0%{?_systemd} +%if 0%{?systemd_preun:1} %systemd_preun %{systemd_svcs} %else -if [ "$1" = "0" ] && [ -x /sbin/chkconfig ]; then +if [ "$1" = "0" -o "$1" = "remove" ] ; then + # Package removal, not upgrade + systemctl --no-reload disable %{systemd_svcs} >/dev/null || true + systemctl stop %{systemd_svcs} >/dev/null || true +fi +%endif +%else +if [ "$1" = "0" -o "$1" = "remove" ] && [ -x /sbin/chkconfig ]; then /sbin/chkconfig --del zfs-import /sbin/chkconfig --del zfs-mount /sbin/chkconfig --del zfs-share @@ -271,7 +300,11 @@ exit 0 %postun %if 0%{?_systemd} +%if 0%{?systemd_postun:1} %systemd_postun %{systemd_svcs} +%else +systemctl --system daemon-reload >/dev/null || true +%endif %endif %files @@ -333,6 +366,15 @@ exit 0 %endif %changelog +* Tue May 08 2018 Tony Hutter - 0.7.9-1 +- Released 0.7.9-1, detailed release notes are available at: +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.9 +* Mon Apr 09 2018 Tony Hutter - 0.7.8-1 +- Released 0.7.8-1, detailed release notes are available at: +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.8 +* Wed Mar 14 2018 Tony Hutter - 0.7.7-1 +- Released 0.7.7-1, detailed release notes are available at: +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.7 * Thu Feb 01 2018 Tony Hutter - 0.7.6-1 - Released 0.7.6-1, detailed release notes are available at: - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.6 diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 74b8b31a..5a8abd13 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -5,6 +5,7 @@ EXTRA_DIST = dkms.mkconf dkms.postbuild kmodtool zfs2zol-patch.sed cstyle.pl pkgdatadir = $(datadir)/@PACKAGE@ dist_pkgdata_SCRIPTS = \ $(top_builddir)/scripts/common.sh \ + $(top_srcdir)/scripts/enum-extract.pl \ $(top_srcdir)/scripts/zimport.sh \ $(top_srcdir)/scripts/zfs.sh \ $(top_srcdir)/scripts/zfs-tests.sh \ @@ -15,3 +16,4 @@ dist_pkgdata_SCRIPTS = \ $(top_srcdir)/scripts/zpios-survey.sh \ $(top_srcdir)/scripts/smb.sh \ $(top_srcdir)/scripts/zfs-helpers.sh + diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 545c72df..5bd7a43d 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -241,6 +247,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -252,6 +264,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -267,6 +280,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -280,9 +295,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -301,6 +317,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -431,6 +448,7 @@ SUBDIRS = zpool-config zpios-test zpios-profile EXTRA_DIST = dkms.mkconf dkms.postbuild kmodtool zfs2zol-patch.sed cstyle.pl dist_pkgdata_SCRIPTS = \ $(top_builddir)/scripts/common.sh \ + $(top_srcdir)/scripts/enum-extract.pl \ $(top_srcdir)/scripts/zimport.sh \ $(top_srcdir)/scripts/zfs.sh \ $(top_srcdir)/scripts/zfs-tests.sh \ diff --git a/scripts/enum-extract.pl b/scripts/enum-extract.pl new file mode 100755 index 00000000..5112cc80 --- /dev/null +++ b/scripts/enum-extract.pl @@ -0,0 +1,58 @@ +#!/usr/bin/perl -w + +my $usage = <) { + # comments + s/\/\*.*\*\///; + if (m/\/\*/) { + while ($_ .= <>) { + last if s/\/\*.*\*\///s; + } + } + + # preprocessor stuff + next if /^#/; + + # find our enum + $in_enum = 1 if s/^\s*enum\s+${enum}(?:\s|$)//; + next unless $in_enum; + + # remove explicit values + s/\s*=[^,]+,/,/g; + + # extract each identifier + while (m/\b([a-z_][a-z0-9_]*)\b/ig) { + print $1, "\n"; + } + + # + # don't exit: there may be multiple versions of the same enum, e.g. + # inside different #ifdef blocks. Let's explicitly return all of + # them and let external tooling deal with it. + # + $in_enum = 0 if m/}\s*;/; +} + +exit 0; diff --git a/scripts/zpios-profile/Makefile.in b/scripts/zpios-profile/Makefile.in index ac30d10e..8109c3ed 100644 --- a/scripts/zpios-profile/Makefile.in +++ b/scripts/zpios-profile/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/scripts/zpios-test/Makefile.in b/scripts/zpios-test/Makefile.in index 9fa4804e..8fed57ac 100644 --- a/scripts/zpios-test/Makefile.in +++ b/scripts/zpios-test/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/scripts/zpool-config/Makefile.in b/scripts/zpool-config/Makefile.in index 826f3aea..e926f25e 100644 --- a/scripts/zpool-config/Makefile.in +++ b/scripts/zpool-config/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/Makefile.in b/tests/Makefile.in index 6686f955..85af799a 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -40,6 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -55,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -83,14 +86,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -102,7 +109,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -118,9 +124,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -131,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -216,6 +222,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -227,6 +239,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -242,6 +255,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -255,9 +270,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -276,6 +292,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/runfiles/Makefile.am b/tests/runfiles/Makefile.am index cddfb2ed..138d905a 100644 --- a/tests/runfiles/Makefile.am +++ b/tests/runfiles/Makefile.am @@ -1,2 +1,2 @@ pkgdatadir = $(datadir)/@PACKAGE@/runfiles -dist_pkgdata_SCRIPTS = *.run +dist_pkgdata_DATA = *.run diff --git a/tests/runfiles/Makefile.in b/tests/runfiles/Makefile.in index 45fd98b6..9d61aec2 100644 --- a/tests/runfiles/Makefile.in +++ b/tests/runfiles/Makefile.in @@ -35,12 +35,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/runfiles -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ +DIST_COMMON = $(dist_pkgdata_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -152,6 +158,14 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/zfs_config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +SOURCES = +DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -174,15 +188,7 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(pkgdatadir)" -SCRIPTS = $(dist_pkgdata_SCRIPTS) -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/runfiles ACLOCAL = @ACLOCAL@ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -387,7 +404,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ -dist_pkgdata_SCRIPTS = *.run +dist_pkgdata_DATA = *.run all: all-am .SUFFIXES: @@ -421,46 +438,32 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-dist_pkgdataSCRIPTS: $(dist_pkgdata_SCRIPTS) + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) @$(NORMAL_INSTALL) test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" - @list='$(dist_pkgdata_SCRIPTS)'; test -n "$(pkgdatadir)" || list=; \ + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(pkgdatadir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(pkgdatadir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-dist_pkgdataSCRIPTS: + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_pkgdata_SCRIPTS)'; test -n "$(pkgdatadir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs tags: TAGS TAGS: @@ -500,7 +503,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -550,7 +553,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dvi: install-dvi-am @@ -594,21 +597,21 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ + install-data install-data-am install-dist_pkgdataDATA \ install-dvi install-dvi-am install-exec install-exec-am \ install-html install-html-am install-info install-info-am \ install-man install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + ps ps-am uninstall uninstall-am uninstall-dist_pkgdataDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run index 303c2752..272c8c77 100644 --- a/tests/runfiles/linux.run +++ b/tests/runfiles/linux.run @@ -73,7 +73,7 @@ tags = ['functional', 'clean_mirror'] [tests/functional/cli_root/zdb] tests = ['zdb_001_neg', 'zdb_002_pos', 'zdb_003_pos', 'zdb_004_pos', - 'zdb_005_pos'] + 'zdb_005_pos', 'zdb_006_pos'] pre = post = tags = ['functional', 'cli_root', 'zdb'] @@ -127,7 +127,7 @@ tests = ['zfs_mount_001_pos', 'zfs_mount_002_pos', 'zfs_mount_003_pos', 'zfs_mount_004_pos', 'zfs_mount_005_pos', 'zfs_mount_007_pos', 'zfs_mount_008_pos', 'zfs_mount_009_neg', 'zfs_mount_010_neg', 'zfs_mount_011_neg', 'zfs_mount_012_neg', 'zfs_mount_all_001_pos', - 'zfs_mount_remount'] + 'zfs_mount_remount', 'zfs_multi_mount'] tags = ['functional', 'cli_root', 'zfs_mount'] [tests/functional/cli_root/zfs_promote] @@ -413,7 +413,7 @@ tests = ['devices_001_pos', 'devices_002_neg', 'devices_003_pos'] tags = ['functional', 'devices'] [tests/functional/events] -tests = ['events_001_pos', 'events_002_pos'] +tests = ['events_001_pos', 'events_002_pos', 'zed_rc_filter'] tags = ['functional', 'events'] [tests/functional/exec] @@ -421,7 +421,7 @@ tests = ['exec_001_pos', 'exec_002_neg'] tags = ['functional', 'exec'] [tests/functional/fault] -tests = ['auto_online_001_pos', 'auto_replace_001_pos'] +tests = ['auto_online_001_pos', 'auto_replace_001_pos', 'scrub_after_resilver'] tags = ['functional', 'fault'] [tests/functional/features/async_destroy] @@ -485,13 +485,13 @@ tests = ['migration_001_pos', 'migration_002_pos', 'migration_003_pos', tags = ['functional', 'migration'] [tests/functional/mmap] -tests = ['mmap_write_001_pos', 'mmap_read_001_pos'] +tests = ['mmap_write_001_pos', 'mmap_read_001_pos', 'mmap_libaio_001_pos'] tags = ['functional', 'mmap'] [tests/functional/mmp] tests = ['mmp_on_thread', 'mmp_on_uberblocks', 'mmp_on_off', 'mmp_interval', 'mmp_active_import', 'mmp_inactive_import', 'mmp_exported_import', - 'mmp_write_uberblocks', 'mmp_reset_interval'] + 'mmp_write_uberblocks', 'mmp_reset_interval', 'multihost_history'] tags = ['functional', 'mmp'] [tests/functional/mount] @@ -499,7 +499,7 @@ tests = ['umount_001', 'umountall_001'] tags = ['functional', 'mount'] [tests/functional/mv_files] -tests = ['mv_files_001_pos', 'mv_files_002_pos'] +tests = ['mv_files_001_pos', 'mv_files_002_pos', 'random_creation'] tags = ['functional', 'mv_files'] [tests/functional/nestedfs] @@ -648,6 +648,10 @@ tags = ['functional', 'truncate'] tests = [ 'upgrade_userobj_001_pos' ] tags = ['functional', 'upgrade'] +[tests/functional/user_namespace] +tests = ['user_namespace_001'] +tags = ['functional', 'user_namespace'] + [tests/functional/userquota] tests = [ 'userquota_001_pos', 'userquota_002_pos', 'userquota_003_pos', diff --git a/tests/test-runner/Makefile.in b/tests/test-runner/Makefile.in index 4c5fdd2a..468435e1 100644 --- a/tests/test-runner/Makefile.in +++ b/tests/test-runner/Makefile.in @@ -40,6 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -55,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -83,14 +86,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -102,7 +109,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -118,9 +124,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -131,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -216,6 +222,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -227,6 +239,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -242,6 +255,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -255,9 +270,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -276,6 +292,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/test-runner/cmd/Makefile.in b/tests/test-runner/cmd/Makefile.in index 86f6a739..c8c881ff 100644 --- a/tests/test-runner/cmd/Makefile.in +++ b/tests/test-runner/cmd/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/test-runner/include/Makefile.am b/tests/test-runner/include/Makefile.am index d071dd49..d3eeb32d 100644 --- a/tests/test-runner/include/Makefile.am +++ b/tests/test-runner/include/Makefile.am @@ -1,4 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/test-runner/include -dist_pkgdata_SCRIPTS = \ + +dist_pkgdata_DATA = \ logapi.shlib \ stf.shlib diff --git a/tests/test-runner/include/Makefile.in b/tests/test-runner/include/Makefile.in index fd84debd..db2d9c7f 100644 --- a/tests/test-runner/include/Makefile.in +++ b/tests/test-runner/include/Makefile.in @@ -35,12 +35,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/test-runner/include -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ +DIST_COMMON = $(dist_pkgdata_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -152,6 +158,14 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/zfs_config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +SOURCES = +DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -174,15 +188,7 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(pkgdatadir)" -SCRIPTS = $(dist_pkgdata_SCRIPTS) -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/test-runner/include ACLOCAL = @ACLOCAL@ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -387,7 +404,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ -dist_pkgdata_SCRIPTS = \ +dist_pkgdata_DATA = \ logapi.shlib \ stf.shlib @@ -424,46 +441,32 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-dist_pkgdataSCRIPTS: $(dist_pkgdata_SCRIPTS) + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) @$(NORMAL_INSTALL) test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" - @list='$(dist_pkgdata_SCRIPTS)'; test -n "$(pkgdatadir)" || list=; \ + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(pkgdatadir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(pkgdatadir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-dist_pkgdataSCRIPTS: + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_pkgdata_SCRIPTS)'; test -n "$(pkgdatadir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs tags: TAGS TAGS: @@ -503,7 +506,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -553,7 +556,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dvi: install-dvi-am @@ -597,21 +600,21 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ + install-data install-data-am install-dist_pkgdataDATA \ install-dvi install-dvi-am install-exec install-exec-am \ install-html install-html-am install-info install-info-am \ install-man install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + ps ps-am uninstall uninstall-am uninstall-dist_pkgdataDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/test-runner/include/logapi.shlib b/tests/test-runner/include/logapi.shlib index fabfc42b..32fc0061 100644 --- a/tests/test-runner/include/logapi.shlib +++ b/tests/test-runner/include/logapi.shlib @@ -1,4 +1,3 @@ -#!/bin/ksh -p # # CDDL HEADER START # diff --git a/tests/test-runner/man/Makefile.in b/tests/test-runner/man/Makefile.in index 8cfcc68d..d2f16370 100644 --- a/tests/test-runner/man/Makefile.in +++ b/tests/test-runner/man/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -202,6 +208,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -213,6 +225,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -228,6 +241,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -241,9 +256,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -262,6 +278,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/Makefile.in b/tests/zfs-tests/Makefile.in index 3d8c1e8e..f4abe4b2 100644 --- a/tests/zfs-tests/Makefile.in +++ b/tests/zfs-tests/Makefile.in @@ -40,6 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -55,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -83,14 +86,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -102,7 +109,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -118,9 +124,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -131,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -216,6 +222,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -227,6 +239,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -242,6 +255,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -255,9 +270,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -276,6 +292,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/callbacks/Makefile.in b/tests/zfs-tests/callbacks/Makefile.in index ed6d487d..a160cd79 100644 --- a/tests/zfs-tests/callbacks/Makefile.in +++ b/tests/zfs-tests/callbacks/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/cmd/Makefile.am b/tests/zfs-tests/cmd/Makefile.am index f55ff8ce..7c3a9653 100644 --- a/tests/zfs-tests/cmd/Makefile.am +++ b/tests/zfs-tests/cmd/Makefile.am @@ -2,6 +2,7 @@ EXTRA_DIST = file_common.h SUBDIRS = \ chg_usr_exec \ + user_ns_exec \ devname2devid \ dir_rd_update \ file_check \ @@ -13,6 +14,7 @@ SUBDIRS = \ mkfiles \ mktree \ mmap_exec \ + mmap_libaio \ mmapwrite \ randfree_file \ readmmap \ diff --git a/tests/zfs-tests/cmd/Makefile.in b/tests/zfs-tests/cmd/Makefile.in index a36cffbb..2d0454e0 100644 --- a/tests/zfs-tests/cmd/Makefile.in +++ b/tests/zfs-tests/cmd/Makefile.in @@ -40,6 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -55,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -83,14 +86,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -102,7 +109,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -118,9 +124,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -131,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -216,6 +222,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -227,6 +239,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -242,6 +255,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -255,9 +270,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -276,6 +292,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -405,6 +422,7 @@ udevruledir = @udevruledir@ EXTRA_DIST = file_common.h SUBDIRS = \ chg_usr_exec \ + user_ns_exec \ devname2devid \ dir_rd_update \ file_check \ @@ -416,6 +434,7 @@ SUBDIRS = \ mkfiles \ mktree \ mmap_exec \ + mmap_libaio \ mmapwrite \ randfree_file \ readmmap \ diff --git a/tests/zfs-tests/cmd/chg_usr_exec/Makefile.in b/tests/zfs-tests/cmd/chg_usr_exec/Makefile.in index b01437ce..2cc35600 100644 --- a/tests/zfs-tests/cmd/chg_usr_exec/Makefile.in +++ b/tests/zfs-tests/cmd/chg_usr_exec/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -398,14 +415,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin chg_usr_exec_SOURCES = chg_usr_exec.c all: all-am diff --git a/tests/zfs-tests/cmd/devname2devid/Makefile.in b/tests/zfs-tests/cmd/devname2devid/Makefile.in index 3f704c79..81fde0b2 100644 --- a/tests/zfs-tests/cmd/devname2devid/Makefile.in +++ b/tests/zfs-tests/cmd/devname2devid/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -210,6 +216,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -221,6 +233,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -236,6 +249,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -249,9 +264,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -270,6 +286,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -400,14 +417,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin @WANT_DEVNAME2DEVID_TRUE@devname2devid_SOURCES = devname2devid.c @WANT_DEVNAME2DEVID_TRUE@devname2devid_LDADD = -ludev diff --git a/tests/zfs-tests/cmd/devname2devid/devname2devid.c b/tests/zfs-tests/cmd/devname2devid/devname2devid.c index 59fbcddd..91e59c58 100644 --- a/tests/zfs-tests/cmd/devname2devid/devname2devid.c +++ b/tests/zfs-tests/cmd/devname2devid/devname2devid.c @@ -83,7 +83,8 @@ udev_device_get_devid(struct udev_device *dev, char *bufptr, size_t buflen) name = udev_list_entry_get_name(entry); if (strncmp(name, devbyid, strlen(devbyid)) == 0) { name += strlen(DEV_BYID_PATH); - (void) stpncpy(bufptr, name, buflen); + (void) stpncpy(bufptr, name, buflen - 1); + bufptr[buflen - 1] = '\0'; return (0); } entry = udev_list_entry_get_next(entry); diff --git a/tests/zfs-tests/cmd/dir_rd_update/Makefile.in b/tests/zfs-tests/cmd/dir_rd_update/Makefile.in index 6621eb76..6397f842 100644 --- a/tests/zfs-tests/cmd/dir_rd_update/Makefile.in +++ b/tests/zfs-tests/cmd/dir_rd_update/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -398,14 +415,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin dir_rd_update_SOURCES = dir_rd_update.c all: all-am diff --git a/tests/zfs-tests/cmd/file_check/Makefile.in b/tests/zfs-tests/cmd/file_check/Makefile.in index b68acf51..67fde6ae 100644 --- a/tests/zfs-tests/cmd/file_check/Makefile.in +++ b/tests/zfs-tests/cmd/file_check/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -398,14 +415,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin file_check_SOURCES = file_check.c all: all-am diff --git a/tests/zfs-tests/cmd/file_trunc/Makefile.in b/tests/zfs-tests/cmd/file_trunc/Makefile.in index b71ab3cd..97182bd0 100644 --- a/tests/zfs-tests/cmd/file_trunc/Makefile.in +++ b/tests/zfs-tests/cmd/file_trunc/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -398,14 +415,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin file_trunc_SOURCES = file_trunc.c all: all-am diff --git a/tests/zfs-tests/cmd/file_write/Makefile.in b/tests/zfs-tests/cmd/file_write/Makefile.in index 53f9e5bc..aeb8e8bf 100644 --- a/tests/zfs-tests/cmd/file_write/Makefile.in +++ b/tests/zfs-tests/cmd/file_write/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -398,14 +415,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin file_write_SOURCES = file_write.c all: all-am diff --git a/tests/zfs-tests/cmd/largest_file/Makefile.in b/tests/zfs-tests/cmd/largest_file/Makefile.in index 67439615..af521a12 100644 --- a/tests/zfs-tests/cmd/largest_file/Makefile.in +++ b/tests/zfs-tests/cmd/largest_file/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -398,14 +415,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin largest_file_SOURCES = largest_file.c all: all-am diff --git a/tests/zfs-tests/cmd/mkbusy/Makefile.in b/tests/zfs-tests/cmd/mkbusy/Makefile.in index da13dfc2..f833b169 100644 --- a/tests/zfs-tests/cmd/mkbusy/Makefile.in +++ b/tests/zfs-tests/cmd/mkbusy/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -398,14 +415,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin mkbusy_SOURCES = mkbusy.c all: all-am diff --git a/tests/zfs-tests/cmd/mkbusy/mkbusy.c b/tests/zfs-tests/cmd/mkbusy/mkbusy.c index 1e456748..9634904f 100644 --- a/tests/zfs-tests/cmd/mkbusy/mkbusy.c +++ b/tests/zfs-tests/cmd/mkbusy/mkbusy.c @@ -98,8 +98,9 @@ main(int argc, char *argv[]) if ((ret = stat(argv[0], &sbuf)) != 0) { char *arg, *dname, *fname; - int arglen, dlen, flen; + int arglen; char *slash; + int rc; /* * The argument supplied doesn't exist. Copy the path, and @@ -126,23 +127,18 @@ main(int argc, char *argv[]) free(arg); if (dname == NULL || fname == NULL) fail("strdup", 1); - dlen = strlen(dname); - flen = strlen(fname); /* The directory portion of the path must exist */ if ((ret = stat(dname, &sbuf)) != 0 || !(sbuf.st_mode & S_IFDIR)) usage(prog); - if ((fpath = (char *)malloc(dlen + 1 + flen + 1)) == NULL) - fail("malloc", 1); - (void) memset(fpath, '\0', dlen + 1 + flen + 1); - - (void) strncpy(fpath, dname, dlen); - fpath[dlen] = '/'; - (void) strncat(fpath, fname, flen); + rc = asprintf(&fpath, "%s/%s", dname, fname); free(dname); free(fname); + if (rc == -1 || fpath == NULL) + fail("asprintf", 1); + } else if ((sbuf.st_mode & S_IFMT) == S_IFREG || (sbuf.st_mode & S_IFMT) == S_IFLNK || (sbuf.st_mode & S_IFMT) == S_IFCHR || diff --git a/tests/zfs-tests/cmd/mkfile/Makefile.in b/tests/zfs-tests/cmd/mkfile/Makefile.in index 4609e43b..d7310cb6 100644 --- a/tests/zfs-tests/cmd/mkfile/Makefile.in +++ b/tests/zfs-tests/cmd/mkfile/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -398,14 +415,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin mkfile_SOURCES = mkfile.c all: all-am diff --git a/tests/zfs-tests/cmd/mkfiles/Makefile.in b/tests/zfs-tests/cmd/mkfiles/Makefile.in index 88f57889..de54ede4 100644 --- a/tests/zfs-tests/cmd/mkfiles/Makefile.in +++ b/tests/zfs-tests/cmd/mkfiles/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -398,14 +415,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin mkfiles_SOURCES = mkfiles.c all: all-am diff --git a/tests/zfs-tests/cmd/mktree/Makefile.in b/tests/zfs-tests/cmd/mktree/Makefile.in index 4f970e5d..740ac290 100644 --- a/tests/zfs-tests/cmd/mktree/Makefile.in +++ b/tests/zfs-tests/cmd/mktree/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -398,14 +415,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin mktree_SOURCES = mktree.c all: all-am diff --git a/tests/zfs-tests/cmd/mktree/mktree.c b/tests/zfs-tests/cmd/mktree/mktree.c index 3dc3dd8e..02d4974d 100644 --- a/tests/zfs-tests/cmd/mktree/mktree.c +++ b/tests/zfs-tests/cmd/mktree/mktree.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -137,8 +137,12 @@ mktree(char *pdir, int level) static char * getfdname(char *pdir, char type, int level, int dir, int file) { - (void) snprintf(fdname, sizeof (fdname), - "%s/%c-l%dd%df%d", pdir, type, level, dir, file); + size_t size = sizeof (fdname); + if (snprintf(fdname, size, "%s/%c-l%dd%df%d", pdir, type, level, dir, + file) >= size) { + (void) fprintf(stderr, "fdname truncated\n"); + exit(EINVAL); + } return (fdname); } diff --git a/tests/zfs-tests/cmd/mmap_exec/Makefile.in b/tests/zfs-tests/cmd/mmap_exec/Makefile.in index 643f5c2e..c2b43e3d 100644 --- a/tests/zfs-tests/cmd/mmap_exec/Makefile.in +++ b/tests/zfs-tests/cmd/mmap_exec/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -398,14 +415,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin mmap_exec_SOURCES = mmap_exec.c all: all-am diff --git a/tests/zfs-tests/cmd/mmap_libaio/Makefile.am b/tests/zfs-tests/cmd/mmap_libaio/Makefile.am new file mode 100644 index 00000000..67d0f0ec --- /dev/null +++ b/tests/zfs-tests/cmd/mmap_libaio/Makefile.am @@ -0,0 +1,9 @@ +include $(top_srcdir)/config/Rules.am + +pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin + +if WANT_MMAP_LIBAIO +pkgexec_PROGRAMS = mmap_libaio +mmap_libaio_SOURCES = mmap_libaio.c +mmap_libaio_LDADD = $(LIBAIO) +endif diff --git a/tests/zfs-tests/cmd/mmap_libaio/Makefile.in b/tests/zfs-tests/cmd/mmap_libaio/Makefile.in new file mode 100644 index 00000000..f8640e26 --- /dev/null +++ b/tests/zfs-tests/cmd/mmap_libaio/Makefile.in @@ -0,0 +1,758 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/config/Rules.am +@WANT_MMAP_LIBAIO_TRUE@pkgexec_PROGRAMS = mmap_libaio$(EXEEXT) +subdir = tests/zfs-tests/cmd/mmap_libaio +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ + $(top_srcdir)/config/always-no-bool-compare.m4 \ + $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ + $(top_srcdir)/config/kernel-acl.m4 \ + $(top_srcdir)/config/kernel-aio-fsync.m4 \ + $(top_srcdir)/config/kernel-automount.m4 \ + $(top_srcdir)/config/kernel-bdev-block-device-operations.m4 \ + $(top_srcdir)/config/kernel-bdev-logical-size.m4 \ + $(top_srcdir)/config/kernel-bdev-physical-size.m4 \ + $(top_srcdir)/config/kernel-bdi.m4 \ + $(top_srcdir)/config/kernel-bio-bvec-iter.m4 \ + $(top_srcdir)/config/kernel-bio-end-io-t-args.m4 \ + $(top_srcdir)/config/kernel-bio-failfast.m4 \ + $(top_srcdir)/config/kernel-bio-op.m4 \ + $(top_srcdir)/config/kernel-bio-rw-barrier.m4 \ + $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ + $(top_srcdir)/config/kernel-bio_set_dev.m4 \ + $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ + $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ + $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ + $(top_srcdir)/config/kernel-blk-queue-unplug.m4 \ + $(top_srcdir)/config/kernel-blkdev-get-by-path.m4 \ + $(top_srcdir)/config/kernel-blkdev-get.m4 \ + $(top_srcdir)/config/kernel-block-device-operations-release-void.m4 \ + $(top_srcdir)/config/kernel-clear-inode.m4 \ + $(top_srcdir)/config/kernel-commit-metadata.m4 \ + $(top_srcdir)/config/kernel-create-nameidata.m4 \ + $(top_srcdir)/config/kernel-current-time.m4 \ + $(top_srcdir)/config/kernel-current_bio_tail.m4 \ + $(top_srcdir)/config/kernel-d-make-root.m4 \ + $(top_srcdir)/config/kernel-d-obtain-alias.m4 \ + $(top_srcdir)/config/kernel-d-prune-aliases.m4 \ + $(top_srcdir)/config/kernel-declare-event-class.m4 \ + $(top_srcdir)/config/kernel-dentry-operations.m4 \ + $(top_srcdir)/config/kernel-dirty-inode.m4 \ + $(top_srcdir)/config/kernel-discard-granularity.m4 \ + $(top_srcdir)/config/kernel-elevator-change.m4 \ + $(top_srcdir)/config/kernel-encode-fh-inode.m4 \ + $(top_srcdir)/config/kernel-evict-inode.m4 \ + $(top_srcdir)/config/kernel-fallocate.m4 \ + $(top_srcdir)/config/kernel-file-dentry.m4 \ + $(top_srcdir)/config/kernel-file-inode.m4 \ + $(top_srcdir)/config/kernel-fmode-t.m4 \ + $(top_srcdir)/config/kernel-follow-down-one.m4 \ + $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ + $(top_srcdir)/config/kernel-fsync.m4 \ + $(top_srcdir)/config/kernel-generic_io_acct.m4 \ + $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ + $(top_srcdir)/config/kernel-get-disk-ro.m4 \ + $(top_srcdir)/config/kernel-get-gendisk.m4 \ + $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ + $(top_srcdir)/config/kernel-inode-getattr.m4 \ + $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ + $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ + $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ + $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ + $(top_srcdir)/config/kernel-kmap-atomic-args.m4 \ + $(top_srcdir)/config/kernel-kuid-helpers.m4 \ + $(top_srcdir)/config/kernel-lookup-bdev.m4 \ + $(top_srcdir)/config/kernel-lookup-nameidata.m4 \ + $(top_srcdir)/config/kernel-lseek-execute.m4 \ + $(top_srcdir)/config/kernel-mk-request-fn.m4 \ + $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ + $(top_srcdir)/config/kernel-mod-param.m4 \ + $(top_srcdir)/config/kernel-objtool.m4 \ + $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ + $(top_srcdir)/config/kernel-put-link.m4 \ + $(top_srcdir)/config/kernel-rename.m4 \ + $(top_srcdir)/config/kernel-security-inode-init.m4 \ + $(top_srcdir)/config/kernel-set-nlink.m4 \ + $(top_srcdir)/config/kernel-setattr-prepare.m4 \ + $(top_srcdir)/config/kernel-sget-args.m4 \ + $(top_srcdir)/config/kernel-show-options.m4 \ + $(top_srcdir)/config/kernel-shrink.m4 \ + $(top_srcdir)/config/kernel-submit_bio.m4 \ + $(top_srcdir)/config/kernel-super-userns.m4 \ + $(top_srcdir)/config/kernel-tmpfile.m4 \ + $(top_srcdir)/config/kernel-truncate-range.m4 \ + $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ + $(top_srcdir)/config/kernel-vfs-iterate.m4 \ + $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ + $(top_srcdir)/config/kernel-xattr-handler.m4 \ + $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ + $(top_srcdir)/config/ltoptions.m4 \ + $(top_srcdir)/config/ltsugar.m4 \ + $(top_srcdir)/config/ltversion.m4 \ + $(top_srcdir)/config/lt~obsolete.m4 \ + $(top_srcdir)/config/mount-helper.m4 \ + $(top_srcdir)/config/toolchain-simd.m4 \ + $(top_srcdir)/config/user-dracut.m4 \ + $(top_srcdir)/config/user-frame-larger-than.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ + $(top_srcdir)/config/user-libtirpc.m4 \ + $(top_srcdir)/config/user-libudev.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ + $(top_srcdir)/config/user-makedev.m4 \ + $(top_srcdir)/config/user-no-format-truncation.m4 \ + $(top_srcdir)/config/user-runstatedir.m4 \ + $(top_srcdir)/config/user-systemd.m4 \ + $(top_srcdir)/config/user-sysvinit.m4 \ + $(top_srcdir)/config/user-udev.m4 \ + $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ + $(top_srcdir)/config/zfs-build.m4 \ + $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/zfs_config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(pkgexecdir)" +PROGRAMS = $(pkgexec_PROGRAMS) +am__mmap_libaio_SOURCES_DIST = mmap_libaio.c +@WANT_MMAP_LIBAIO_TRUE@am_mmap_libaio_OBJECTS = mmap_libaio.$(OBJEXT) +mmap_libaio_OBJECTS = $(am_mmap_libaio_OBJECTS) +am__DEPENDENCIES_1 = +@WANT_MMAP_LIBAIO_TRUE@mmap_libaio_DEPENDENCIES = \ +@WANT_MMAP_LIBAIO_TRUE@ $(am__DEPENDENCIES_1) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent +depcomp = $(SHELL) $(top_srcdir)/config/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +SOURCES = $(mmap_libaio_SOURCES) +DIST_SOURCES = $(am__mmap_libaio_SOURCES_DIST) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALIEN = @ALIEN@ +ALIEN_VERSION = @ALIEN_VERSION@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCAS = @CCAS@ +CCASDEPMODE = @CCASDEPMODE@ +CCASFLAGS = @CCASFLAGS@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEBUG_CFLAGS = @DEBUG_CFLAGS@ +DEBUG_STACKFLAGS = @DEBUG_STACKFLAGS@ +DEBUG_ZFS = @DEBUG_ZFS@ +DEFAULT_INITCONF_DIR = @DEFAULT_INITCONF_DIR@ +DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ +DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ +DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ +DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DPKG = @DPKG@ +DPKGBUILD = @DPKGBUILD@ +DPKGBUILD_VERSION = @DPKGBUILD_VERSION@ +DPKG_VERSION = @DPKG_VERSION@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ +GREP = @GREP@ +HAVE_ALIEN = @HAVE_ALIEN@ +HAVE_DPKG = @HAVE_DPKG@ +HAVE_DPKGBUILD = @HAVE_DPKGBUILD@ +HAVE_RPM = @HAVE_RPM@ +HAVE_RPMBUILD = @HAVE_RPMBUILD@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KERNELCPPFLAGS = @KERNELCPPFLAGS@ +KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBAIO = @LIBAIO@ +LIBBLKID = @LIBBLKID@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTIRPC = @LIBTIRPC@ +LIBTIRPC_CFLAGS = @LIBTIRPC_CFLAGS@ +LIBTOOL = @LIBTOOL@ +LIBUDEV = @LIBUDEV@ +LIBUUID = @LIBUUID@ +LINUX = @LINUX@ +LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ +LINUX_VERSION = @LINUX_VERSION@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ +NM = @NM@ +NMEDIT = @NMEDIT@ +NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ +NO_FORMAT_TRUNCATION = @NO_FORMAT_TRUNCATION@ +NO_UNUSED_BUT_SET_VARIABLE = @NO_UNUSED_BUT_SET_VARIABLE@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +QAT_OBJ = @QAT_OBJ@ +QAT_SRC = @QAT_SRC@ +QAT_SYMBOLS = @QAT_SYMBOLS@ +RANLIB = @RANLIB@ +RELEASE = @RELEASE@ +RM = @RM@ +RPM = @RPM@ +RPMBUILD = @RPMBUILD@ +RPMBUILD_VERSION = @RPMBUILD_VERSION@ +RPM_DEFINE_COMMON = @RPM_DEFINE_COMMON@ +RPM_DEFINE_DKMS = @RPM_DEFINE_DKMS@ +RPM_DEFINE_KMOD = @RPM_DEFINE_KMOD@ +RPM_DEFINE_UTIL = @RPM_DEFINE_UTIL@ +RPM_SPEC_DIR = @RPM_SPEC_DIR@ +RPM_VERSION = @RPM_VERSION@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ +SRPM_DEFINE_COMMON = @SRPM_DEFINE_COMMON@ +SRPM_DEFINE_DKMS = @SRPM_DEFINE_DKMS@ +SRPM_DEFINE_KMOD = @SRPM_DEFINE_KMOD@ +SRPM_DEFINE_UTIL = @SRPM_DEFINE_UTIL@ +STRIP = @STRIP@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ +VENDOR = @VENDOR@ +VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ +ZFS_INIT_SYSTEMD = @ZFS_INIT_SYSTEMD@ +ZFS_INIT_SYSV = @ZFS_INIT_SYSV@ +ZFS_META_ALIAS = @ZFS_META_ALIAS@ +ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ +ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ +ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ +ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ +ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ +ZFS_META_NAME = @ZFS_META_NAME@ +ZFS_META_RELEASE = @ZFS_META_RELEASE@ +ZFS_META_VERSION = @ZFS_META_VERSION@ +ZFS_MODULE_LOAD = @ZFS_MODULE_LOAD@ +ZLIB = @ZLIB@ +ZONENAME = @ZONENAME@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dracutdir = @dracutdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +modulesloaddir = @modulesloaddir@ +mounthelperdir = @mounthelperdir@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +systemdpresetdir = @systemdpresetdir@ +systemdunitdir = @systemdunitdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +udevdir = @udevdir@ +udevruledir = @udevruledir@ +DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h +AM_LIBTOOLFLAGS = --silent +AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ + ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) +AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ + -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ + -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ + -DTEXT_DOMAIN=\"zfs-linux-user\" \ + -DLIBEXECDIR=\"$(libexecdir)\" \ + -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) +pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin +@WANT_MMAP_LIBAIO_TRUE@mmap_libaio_SOURCES = mmap_libaio.c +@WANT_MMAP_LIBAIO_TRUE@mmap_libaio_LDADD = $(LIBAIO) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/Rules.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/zfs-tests/cmd/mmap_libaio/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu tests/zfs-tests/cmd/mmap_libaio/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-pkgexecPROGRAMS: $(pkgexec_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(pkgexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgexecdir)" + @list='$(pkgexec_PROGRAMS)'; test -n "$(pkgexecdir)" || list=; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p || test -f $$p1; \ + then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(pkgexecdir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(pkgexecdir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-pkgexecPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(pkgexec_PROGRAMS)'; test -n "$(pkgexecdir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgexecdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgexecdir)" && rm -f $$files + +clean-pkgexecPROGRAMS: + @list='$(pkgexec_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +mmap_libaio$(EXEEXT): $(mmap_libaio_OBJECTS) $(mmap_libaio_DEPENDENCIES) + @rm -f mmap_libaio$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(mmap_libaio_OBJECTS) $(mmap_libaio_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mmap_libaio.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(pkgexecdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkgexecPROGRAMS \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkgexecPROGRAMS + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkgexecPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkgexecPROGRAMS ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pkgexecPROGRAMS install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-pkgexecPROGRAMS + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/tests/zfs-tests/cmd/mmap_libaio/mmap_libaio.c b/tests/zfs-tests/cmd/mmap_libaio/mmap_libaio.c new file mode 100644 index 00000000..21119ebc --- /dev/null +++ b/tests/zfs-tests/cmd/mmap_libaio/mmap_libaio.c @@ -0,0 +1,88 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright 2018 Canonical. All rights reserved. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +io_context_t io_ctx; + +static void +do_sync_io(struct iocb *iocb) +{ + struct io_event event; + struct iocb *iocbs[] = { iocb }; + struct timespec ts = { 30, 0 }; + + if (io_submit(io_ctx, 1, iocbs) != 1) + err(1, "io_submit failed"); + + if (io_getevents(io_ctx, 0, 1, &event, &ts) != 1) + err(1, "io_getevents failed"); +} + +int +main(int argc, char **argv) +{ + char *buf; + int page_size = getpagesize(); + int buf_size = strtol(argv[2], NULL, 0); + int rwfd; + struct iocb iocb; + + if (io_queue_init(1024, &io_ctx)) + err(1, "io_queue_init failed"); + + rwfd = open(argv[1], O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); + if (rwfd < 0) + err(1, "open failed"); + + if (ftruncate(rwfd, buf_size) < 0) + err(1, "ftruncate failed"); + + buf = mmap(0, page_size, PROT_READ | PROT_WRITE, MAP_SHARED, rwfd, 0); + if (buf == MAP_FAILED) + err(1, "mmap failed"); + + (void) io_prep_pwrite(&iocb, rwfd, buf, buf_size, 0); + do_sync_io(&iocb); + + (void) io_prep_pread(&iocb, rwfd, buf, buf_size, 0); + do_sync_io(&iocb); + + if (close(rwfd)) + err(1, "close failed"); + + if (io_queue_release(io_ctx) != 0) + err(1, "io_queue_release failed"); + + return (0); +} diff --git a/tests/zfs-tests/cmd/mmapwrite/Makefile.in b/tests/zfs-tests/cmd/mmapwrite/Makefile.in index 8ea05fd3..5c44f911 100644 --- a/tests/zfs-tests/cmd/mmapwrite/Makefile.in +++ b/tests/zfs-tests/cmd/mmapwrite/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -398,14 +415,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin mmapwrite_SOURCES = mmapwrite.c mmapwrite_LDADD = -lpthread diff --git a/tests/zfs-tests/cmd/randfree_file/Makefile.in b/tests/zfs-tests/cmd/randfree_file/Makefile.in index aaa174f3..9fd8dd5e 100644 --- a/tests/zfs-tests/cmd/randfree_file/Makefile.in +++ b/tests/zfs-tests/cmd/randfree_file/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -398,14 +415,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin randfree_file_SOURCES = randfree_file.c all: all-am diff --git a/tests/zfs-tests/cmd/readmmap/Makefile.in b/tests/zfs-tests/cmd/readmmap/Makefile.in index dba27a37..43e31d2c 100644 --- a/tests/zfs-tests/cmd/readmmap/Makefile.in +++ b/tests/zfs-tests/cmd/readmmap/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -398,14 +415,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin readmmap_SOURCES = readmmap.c all: all-am diff --git a/tests/zfs-tests/cmd/rename_dir/Makefile.in b/tests/zfs-tests/cmd/rename_dir/Makefile.in index 96439b6a..c33ddcb2 100644 --- a/tests/zfs-tests/cmd/rename_dir/Makefile.in +++ b/tests/zfs-tests/cmd/rename_dir/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -398,14 +415,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin rename_dir_SOURCES = rename_dir.c all: all-am diff --git a/tests/zfs-tests/cmd/rm_lnkcnt_zero_file/Makefile.in b/tests/zfs-tests/cmd/rm_lnkcnt_zero_file/Makefile.in index 40d3d7a8..578a64a7 100644 --- a/tests/zfs-tests/cmd/rm_lnkcnt_zero_file/Makefile.in +++ b/tests/zfs-tests/cmd/rm_lnkcnt_zero_file/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -398,14 +415,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin rm_lnkcnt_zero_file_SOURCES = rm_lnkcnt_zero_file.c rm_lnkcnt_zero_file_LDADD = -lpthread diff --git a/tests/zfs-tests/cmd/threadsappend/Makefile.in b/tests/zfs-tests/cmd/threadsappend/Makefile.in index 4e6b09f7..1ebdc955 100644 --- a/tests/zfs-tests/cmd/threadsappend/Makefile.in +++ b/tests/zfs-tests/cmd/threadsappend/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -398,14 +415,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin threadsappend_SOURCES = threadsappend.c threadsappend_LDADD = -lpthread diff --git a/tests/zfs-tests/cmd/user_ns_exec/Makefile.am b/tests/zfs-tests/cmd/user_ns_exec/Makefile.am new file mode 100644 index 00000000..5b4bc9aa --- /dev/null +++ b/tests/zfs-tests/cmd/user_ns_exec/Makefile.am @@ -0,0 +1,6 @@ +include $(top_srcdir)/config/Rules.am + +pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin + +pkgexec_PROGRAMS = user_ns_exec +user_ns_exec_SOURCES = user_ns_exec.c diff --git a/tests/zfs-tests/cmd/user_ns_exec/Makefile.in b/tests/zfs-tests/cmd/user_ns_exec/Makefile.in new file mode 100644 index 00000000..1b67b6df --- /dev/null +++ b/tests/zfs-tests/cmd/user_ns_exec/Makefile.in @@ -0,0 +1,754 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/config/Rules.am +pkgexec_PROGRAMS = user_ns_exec$(EXEEXT) +subdir = tests/zfs-tests/cmd/user_ns_exec +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ + $(top_srcdir)/config/always-no-bool-compare.m4 \ + $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ + $(top_srcdir)/config/kernel-acl.m4 \ + $(top_srcdir)/config/kernel-aio-fsync.m4 \ + $(top_srcdir)/config/kernel-automount.m4 \ + $(top_srcdir)/config/kernel-bdev-block-device-operations.m4 \ + $(top_srcdir)/config/kernel-bdev-logical-size.m4 \ + $(top_srcdir)/config/kernel-bdev-physical-size.m4 \ + $(top_srcdir)/config/kernel-bdi.m4 \ + $(top_srcdir)/config/kernel-bio-bvec-iter.m4 \ + $(top_srcdir)/config/kernel-bio-end-io-t-args.m4 \ + $(top_srcdir)/config/kernel-bio-failfast.m4 \ + $(top_srcdir)/config/kernel-bio-op.m4 \ + $(top_srcdir)/config/kernel-bio-rw-barrier.m4 \ + $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ + $(top_srcdir)/config/kernel-bio_set_dev.m4 \ + $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ + $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ + $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ + $(top_srcdir)/config/kernel-blk-queue-unplug.m4 \ + $(top_srcdir)/config/kernel-blkdev-get-by-path.m4 \ + $(top_srcdir)/config/kernel-blkdev-get.m4 \ + $(top_srcdir)/config/kernel-block-device-operations-release-void.m4 \ + $(top_srcdir)/config/kernel-clear-inode.m4 \ + $(top_srcdir)/config/kernel-commit-metadata.m4 \ + $(top_srcdir)/config/kernel-create-nameidata.m4 \ + $(top_srcdir)/config/kernel-current-time.m4 \ + $(top_srcdir)/config/kernel-current_bio_tail.m4 \ + $(top_srcdir)/config/kernel-d-make-root.m4 \ + $(top_srcdir)/config/kernel-d-obtain-alias.m4 \ + $(top_srcdir)/config/kernel-d-prune-aliases.m4 \ + $(top_srcdir)/config/kernel-declare-event-class.m4 \ + $(top_srcdir)/config/kernel-dentry-operations.m4 \ + $(top_srcdir)/config/kernel-dirty-inode.m4 \ + $(top_srcdir)/config/kernel-discard-granularity.m4 \ + $(top_srcdir)/config/kernel-elevator-change.m4 \ + $(top_srcdir)/config/kernel-encode-fh-inode.m4 \ + $(top_srcdir)/config/kernel-evict-inode.m4 \ + $(top_srcdir)/config/kernel-fallocate.m4 \ + $(top_srcdir)/config/kernel-file-dentry.m4 \ + $(top_srcdir)/config/kernel-file-inode.m4 \ + $(top_srcdir)/config/kernel-fmode-t.m4 \ + $(top_srcdir)/config/kernel-follow-down-one.m4 \ + $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ + $(top_srcdir)/config/kernel-fsync.m4 \ + $(top_srcdir)/config/kernel-generic_io_acct.m4 \ + $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ + $(top_srcdir)/config/kernel-get-disk-ro.m4 \ + $(top_srcdir)/config/kernel-get-gendisk.m4 \ + $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ + $(top_srcdir)/config/kernel-inode-getattr.m4 \ + $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ + $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ + $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ + $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ + $(top_srcdir)/config/kernel-kmap-atomic-args.m4 \ + $(top_srcdir)/config/kernel-kuid-helpers.m4 \ + $(top_srcdir)/config/kernel-lookup-bdev.m4 \ + $(top_srcdir)/config/kernel-lookup-nameidata.m4 \ + $(top_srcdir)/config/kernel-lseek-execute.m4 \ + $(top_srcdir)/config/kernel-mk-request-fn.m4 \ + $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ + $(top_srcdir)/config/kernel-mod-param.m4 \ + $(top_srcdir)/config/kernel-objtool.m4 \ + $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ + $(top_srcdir)/config/kernel-put-link.m4 \ + $(top_srcdir)/config/kernel-rename.m4 \ + $(top_srcdir)/config/kernel-security-inode-init.m4 \ + $(top_srcdir)/config/kernel-set-nlink.m4 \ + $(top_srcdir)/config/kernel-setattr-prepare.m4 \ + $(top_srcdir)/config/kernel-sget-args.m4 \ + $(top_srcdir)/config/kernel-show-options.m4 \ + $(top_srcdir)/config/kernel-shrink.m4 \ + $(top_srcdir)/config/kernel-submit_bio.m4 \ + $(top_srcdir)/config/kernel-super-userns.m4 \ + $(top_srcdir)/config/kernel-tmpfile.m4 \ + $(top_srcdir)/config/kernel-truncate-range.m4 \ + $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ + $(top_srcdir)/config/kernel-vfs-iterate.m4 \ + $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ + $(top_srcdir)/config/kernel-xattr-handler.m4 \ + $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ + $(top_srcdir)/config/ltoptions.m4 \ + $(top_srcdir)/config/ltsugar.m4 \ + $(top_srcdir)/config/ltversion.m4 \ + $(top_srcdir)/config/lt~obsolete.m4 \ + $(top_srcdir)/config/mount-helper.m4 \ + $(top_srcdir)/config/toolchain-simd.m4 \ + $(top_srcdir)/config/user-dracut.m4 \ + $(top_srcdir)/config/user-frame-larger-than.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ + $(top_srcdir)/config/user-libblkid.m4 \ + $(top_srcdir)/config/user-libtirpc.m4 \ + $(top_srcdir)/config/user-libudev.m4 \ + $(top_srcdir)/config/user-libuuid.m4 \ + $(top_srcdir)/config/user-makedev.m4 \ + $(top_srcdir)/config/user-no-format-truncation.m4 \ + $(top_srcdir)/config/user-runstatedir.m4 \ + $(top_srcdir)/config/user-systemd.m4 \ + $(top_srcdir)/config/user-sysvinit.m4 \ + $(top_srcdir)/config/user-udev.m4 \ + $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ + $(top_srcdir)/config/zfs-build.m4 \ + $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/zfs_config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(pkgexecdir)" +PROGRAMS = $(pkgexec_PROGRAMS) +am_user_ns_exec_OBJECTS = user_ns_exec.$(OBJEXT) +user_ns_exec_OBJECTS = $(am_user_ns_exec_OBJECTS) +user_ns_exec_LDADD = $(LDADD) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent +depcomp = $(SHELL) $(top_srcdir)/config/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +SOURCES = $(user_ns_exec_SOURCES) +DIST_SOURCES = $(user_ns_exec_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALIEN = @ALIEN@ +ALIEN_VERSION = @ALIEN_VERSION@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCAS = @CCAS@ +CCASDEPMODE = @CCASDEPMODE@ +CCASFLAGS = @CCASFLAGS@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEBUG_CFLAGS = @DEBUG_CFLAGS@ +DEBUG_STACKFLAGS = @DEBUG_STACKFLAGS@ +DEBUG_ZFS = @DEBUG_ZFS@ +DEFAULT_INITCONF_DIR = @DEFAULT_INITCONF_DIR@ +DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ +DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ +DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ +DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DPKG = @DPKG@ +DPKGBUILD = @DPKGBUILD@ +DPKGBUILD_VERSION = @DPKGBUILD_VERSION@ +DPKG_VERSION = @DPKG_VERSION@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ +GREP = @GREP@ +HAVE_ALIEN = @HAVE_ALIEN@ +HAVE_DPKG = @HAVE_DPKG@ +HAVE_DPKGBUILD = @HAVE_DPKGBUILD@ +HAVE_RPM = @HAVE_RPM@ +HAVE_RPMBUILD = @HAVE_RPMBUILD@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KERNELCPPFLAGS = @KERNELCPPFLAGS@ +KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBAIO = @LIBAIO@ +LIBBLKID = @LIBBLKID@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTIRPC = @LIBTIRPC@ +LIBTIRPC_CFLAGS = @LIBTIRPC_CFLAGS@ +LIBTOOL = @LIBTOOL@ +LIBUDEV = @LIBUDEV@ +LIBUUID = @LIBUUID@ +LINUX = @LINUX@ +LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ +LINUX_VERSION = @LINUX_VERSION@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ +NM = @NM@ +NMEDIT = @NMEDIT@ +NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ +NO_FORMAT_TRUNCATION = @NO_FORMAT_TRUNCATION@ +NO_UNUSED_BUT_SET_VARIABLE = @NO_UNUSED_BUT_SET_VARIABLE@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +QAT_OBJ = @QAT_OBJ@ +QAT_SRC = @QAT_SRC@ +QAT_SYMBOLS = @QAT_SYMBOLS@ +RANLIB = @RANLIB@ +RELEASE = @RELEASE@ +RM = @RM@ +RPM = @RPM@ +RPMBUILD = @RPMBUILD@ +RPMBUILD_VERSION = @RPMBUILD_VERSION@ +RPM_DEFINE_COMMON = @RPM_DEFINE_COMMON@ +RPM_DEFINE_DKMS = @RPM_DEFINE_DKMS@ +RPM_DEFINE_KMOD = @RPM_DEFINE_KMOD@ +RPM_DEFINE_UTIL = @RPM_DEFINE_UTIL@ +RPM_SPEC_DIR = @RPM_SPEC_DIR@ +RPM_VERSION = @RPM_VERSION@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ +SRPM_DEFINE_COMMON = @SRPM_DEFINE_COMMON@ +SRPM_DEFINE_DKMS = @SRPM_DEFINE_DKMS@ +SRPM_DEFINE_KMOD = @SRPM_DEFINE_KMOD@ +SRPM_DEFINE_UTIL = @SRPM_DEFINE_UTIL@ +STRIP = @STRIP@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ +VENDOR = @VENDOR@ +VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ +ZFS_INIT_SYSTEMD = @ZFS_INIT_SYSTEMD@ +ZFS_INIT_SYSV = @ZFS_INIT_SYSV@ +ZFS_META_ALIAS = @ZFS_META_ALIAS@ +ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ +ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ +ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ +ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ +ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ +ZFS_META_NAME = @ZFS_META_NAME@ +ZFS_META_RELEASE = @ZFS_META_RELEASE@ +ZFS_META_VERSION = @ZFS_META_VERSION@ +ZFS_MODULE_LOAD = @ZFS_MODULE_LOAD@ +ZLIB = @ZLIB@ +ZONENAME = @ZONENAME@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dracutdir = @dracutdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +modulesloaddir = @modulesloaddir@ +mounthelperdir = @mounthelperdir@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +systemdpresetdir = @systemdpresetdir@ +systemdunitdir = @systemdunitdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +udevdir = @udevdir@ +udevruledir = @udevruledir@ +DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h +AM_LIBTOOLFLAGS = --silent +AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ + ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) +AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ + -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ + -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ + -DTEXT_DOMAIN=\"zfs-linux-user\" \ + -DLIBEXECDIR=\"$(libexecdir)\" \ + -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) +pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin +user_ns_exec_SOURCES = user_ns_exec.c +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/Rules.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/zfs-tests/cmd/user_ns_exec/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu tests/zfs-tests/cmd/user_ns_exec/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-pkgexecPROGRAMS: $(pkgexec_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(pkgexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgexecdir)" + @list='$(pkgexec_PROGRAMS)'; test -n "$(pkgexecdir)" || list=; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p || test -f $$p1; \ + then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(pkgexecdir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(pkgexecdir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-pkgexecPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(pkgexec_PROGRAMS)'; test -n "$(pkgexecdir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgexecdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgexecdir)" && rm -f $$files + +clean-pkgexecPROGRAMS: + @list='$(pkgexec_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +user_ns_exec$(EXEEXT): $(user_ns_exec_OBJECTS) $(user_ns_exec_DEPENDENCIES) + @rm -f user_ns_exec$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(user_ns_exec_OBJECTS) $(user_ns_exec_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/user_ns_exec.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(pkgexecdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkgexecPROGRAMS \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkgexecPROGRAMS + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkgexecPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkgexecPROGRAMS ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pkgexecPROGRAMS install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-pkgexecPROGRAMS + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/tests/zfs-tests/cmd/user_ns_exec/user_ns_exec.c b/tests/zfs-tests/cmd/user_ns_exec/user_ns_exec.c new file mode 100644 index 00000000..cd46738b --- /dev/null +++ b/tests/zfs-tests/cmd/user_ns_exec/user_ns_exec.c @@ -0,0 +1,179 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define EXECSHELL "/bin/sh" +#define UIDMAP "0 100000 65536" + +static int +child_main(int argc, char *argv[], int sync_pipe) +{ + char sync_buf; + char cmds[BUFSIZ] = { 0 }; + char sep[] = " "; + int i, len; + + if (unshare(CLONE_NEWUSER | CLONE_NEWNS) != 0) { + perror("unshare"); + return (1); + } + + /* tell parent we entered the new namespace */ + if (write(sync_pipe, "1", 1) != 1) { + perror("write"); + return (1); + } + + /* wait for parent to setup the uid mapping */ + if (read(sync_pipe, &sync_buf, 1) != 1) { + (void) fprintf(stderr, "user namespace setup failed\n"); + return (1); + } + + close(sync_pipe); + + if (setuid(0) != 0) { + perror("setuid"); + return (1); + } + if (setgid(0) != 0) { + perror("setgid"); + return (1); + } + + len = 0; + for (i = 1; i < argc; i++) { + (void) snprintf(cmds+len, sizeof (cmds)-len, + "%s%s", argv[i], sep); + len += strlen(argv[i]) + strlen(sep); + } + + if (execl(EXECSHELL, "sh", "-c", cmds, (char *)NULL) != 0) { + perror("execl: " EXECSHELL); + return (1); + } + + return (0); +} + +static int +set_idmap(pid_t pid, const char *file) +{ + int result = 0; + int mapfd; + char path[PATH_MAX]; + + (void) snprintf(path, sizeof (path), "/proc/%d/%s", (int)pid, file); + + mapfd = open(path, O_WRONLY); + if (mapfd < 0) { + result = errno; + perror("open"); + return (errno); + } + + if (write(mapfd, UIDMAP, sizeof (UIDMAP)-1) != sizeof (UIDMAP)-1) { + perror("write"); + result = (errno); + } + + close(mapfd); + + return (result); +} + +int +main(int argc, char *argv[]) +{ + char sync_buf; + int result, wstatus; + int syncfd[2]; + pid_t child; + + if (argc < 2 || strlen(argv[1]) == 0) { + (void) printf("\tUsage: %s ...\n", argv[0]); + return (1); + } + + if (socketpair(AF_UNIX, SOCK_STREAM, 0, syncfd) != 0) { + perror("socketpair"); + return (1); + } + + child = fork(); + if (child == (pid_t)-1) { + perror("fork"); + return (1); + } + + if (child == 0) { + close(syncfd[0]); + return (child_main(argc, argv, syncfd[1])); + } + + close(syncfd[1]); + + result = 0; + /* wait for the child to have unshared its namespaces */ + if (read(syncfd[0], &sync_buf, 1) != 1) { + perror("read"); + kill(child, SIGKILL); + result = 1; + goto reap; + } + + /* write uid mapping */ + if (set_idmap(child, "uid_map") != 0 || + set_idmap(child, "gid_map") != 0) { + result = 1; + kill(child, SIGKILL); + goto reap; + } + + /* tell the child to proceed */ + if (write(syncfd[0], "1", 1) != 1) { + perror("write"); + kill(child, SIGKILL); + result = 1; + goto reap; + } + close(syncfd[0]); + +reap: + while (waitpid(child, &wstatus, 0) != child) + kill(child, SIGKILL); + if (result == 0) + result = WEXITSTATUS(wstatus); + + return (result); +} diff --git a/tests/zfs-tests/cmd/xattrtest/Makefile.in b/tests/zfs-tests/cmd/xattrtest/Makefile.in index 46a3310c..239cd3d3 100644 --- a/tests/zfs-tests/cmd/xattrtest/Makefile.in +++ b/tests/zfs-tests/cmd/xattrtest/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -208,6 +214,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -219,6 +231,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -234,6 +247,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -247,9 +262,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -268,6 +284,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -398,14 +415,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin xattrtest_SOURCES = xattrtest.c all: all-am diff --git a/tests/zfs-tests/cmd/xattrtest/xattrtest.c b/tests/zfs-tests/cmd/xattrtest/xattrtest.c index a93cce7f..32a6b1d9 100644 --- a/tests/zfs-tests/cmd/xattrtest/xattrtest.c +++ b/tests/zfs-tests/cmd/xattrtest/xattrtest.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include @@ -367,8 +367,10 @@ create_files(void) char *file = NULL; struct timeval start, stop; double seconds; + size_t fsize; - file = malloc(PATH_MAX); + fsize = PATH_MAX; + file = malloc(fsize); if (file == NULL) { rc = ENOMEM; ERROR("Error %d: malloc(%d) bytes for file name\n", rc, @@ -379,7 +381,11 @@ create_files(void) (void) gettimeofday(&start, NULL); for (i = 1; i <= files; i++) { - (void) sprintf(file, "%s/file-%d", path, i); + if (snprintf(file, fsize, "%s/file-%d", path, i) >= fsize) { + rc = EINVAL; + ERROR("Error %d: path too long\n", rc); + goto out; + } if (nth && ((i % nth) == 0)) fprintf(stdout, "create: %s\n", file); @@ -452,6 +458,7 @@ setxattrs(void) char *file = NULL; struct timeval start, stop; double seconds; + size_t fsize; value = malloc(XATTR_SIZE_MAX); if (value == NULL) { @@ -461,7 +468,8 @@ setxattrs(void) goto out; } - file = malloc(PATH_MAX); + fsize = PATH_MAX; + file = malloc(fsize); if (file == NULL) { rc = ENOMEM; ERROR("Error %d: malloc(%d) bytes for file name\n", rc, @@ -472,7 +480,11 @@ setxattrs(void) (void) gettimeofday(&start, NULL); for (i = 1; i <= files; i++) { - (void) sprintf(file, "%s/file-%d", path, i); + if (snprintf(file, fsize, "%s/file-%d", path, i) >= fsize) { + rc = EINVAL; + ERROR("Error %d: path too long\n", rc); + goto out; + } if (nth && ((i % nth) == 0)) fprintf(stdout, "setxattr: %s\n", file); @@ -523,6 +535,7 @@ getxattrs(void) char *file = NULL; struct timeval start, stop; double seconds; + size_t fsize; verify_value = malloc(XATTR_SIZE_MAX); if (verify_value == NULL) { @@ -543,7 +556,9 @@ getxattrs(void) verify_string = value_is_random ? "" : verify_value; value_string = value_is_random ? "" : value; - file = malloc(PATH_MAX); + fsize = PATH_MAX; + file = malloc(fsize); + if (file == NULL) { rc = ENOMEM; ERROR("Error %d: malloc(%d) bytes for file name\n", rc, @@ -554,7 +569,11 @@ getxattrs(void) (void) gettimeofday(&start, NULL); for (i = 1; i <= files; i++) { - (void) sprintf(file, "%s/file-%d", path, i); + if (snprintf(file, fsize, "%s/file-%d", path, i) >= fsize) { + rc = EINVAL; + ERROR("Error %d: path too long\n", rc); + goto out; + } if (nth && ((i % nth) == 0)) fprintf(stdout, "getxattr: %s\n", file); @@ -615,8 +634,10 @@ unlink_files(void) char *file = NULL; struct timeval start, stop; double seconds; + size_t fsize; - file = malloc(PATH_MAX); + fsize = PATH_MAX; + file = malloc(fsize); if (file == NULL) { rc = ENOMEM; ERROR("Error %d: malloc(%d) bytes for file name\n", @@ -627,7 +648,11 @@ unlink_files(void) (void) gettimeofday(&start, NULL); for (i = 1; i <= files; i++) { - (void) sprintf(file, "%s/file-%d", path, i); + if (snprintf(file, fsize, "%s/file-%d", path, i) >= fsize) { + rc = EINVAL; + ERROR("Error %d: path too long\n", rc); + goto out; + } if (nth && ((i % nth) == 0)) fprintf(stdout, "unlink: %s\n", file); diff --git a/tests/zfs-tests/include/Makefile.am b/tests/zfs-tests/include/Makefile.am index 24633ccc..27867d4a 100644 --- a/tests/zfs-tests/include/Makefile.am +++ b/tests/zfs-tests/include/Makefile.am @@ -1,5 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/include -dist_pkgdata_SCRIPTS = \ +dist_pkgdata_DATA = \ commands.cfg \ default.cfg \ libtest.shlib \ diff --git a/tests/zfs-tests/include/Makefile.in b/tests/zfs-tests/include/Makefile.in index 16839f9f..f99b67d0 100644 --- a/tests/zfs-tests/include/Makefile.in +++ b/tests/zfs-tests/include/Makefile.in @@ -35,12 +35,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/include -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ +DIST_COMMON = $(dist_pkgdata_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/default.cfg.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -152,6 +158,14 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/zfs_config.h CONFIG_CLEAN_FILES = default.cfg CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +SOURCES = +DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -174,15 +188,7 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(pkgdatadir)" -SCRIPTS = $(dist_pkgdata_SCRIPTS) -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/include ACLOCAL = @ACLOCAL@ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -387,7 +404,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ -dist_pkgdata_SCRIPTS = \ +dist_pkgdata_DATA = \ commands.cfg \ default.cfg \ libtest.shlib \ @@ -431,46 +448,32 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): default.cfg: $(top_builddir)/config.status $(srcdir)/default.cfg.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -install-dist_pkgdataSCRIPTS: $(dist_pkgdata_SCRIPTS) + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) @$(NORMAL_INSTALL) test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" - @list='$(dist_pkgdata_SCRIPTS)'; test -n "$(pkgdatadir)" || list=; \ + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(pkgdatadir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(pkgdatadir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-dist_pkgdataSCRIPTS: + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_pkgdata_SCRIPTS)'; test -n "$(pkgdatadir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs tags: TAGS TAGS: @@ -510,7 +513,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -560,7 +563,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dvi: install-dvi-am @@ -604,7 +607,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA .MAKE: install-am install-strip @@ -612,14 +615,14 @@ uninstall-am: uninstall-dist_pkgdataSCRIPTS distclean distclean-generic distclean-libtool distclean-local \ distdir dvi dvi-am html html-am info info-am install \ install-am install-data install-data-am \ - install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-dist_pkgdataDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-dist_pkgdataSCRIPTS + uninstall-dist_pkgdataDATA distclean-local:: diff --git a/tests/zfs-tests/include/commands.cfg b/tests/zfs-tests/include/commands.cfg index f6fd239d..1399ad55 100644 --- a/tests/zfs-tests/include/commands.cfg +++ b/tests/zfs-tests/include/commands.cfg @@ -83,6 +83,7 @@ export SYSTEM_FILES='arp pgrep ping pkill + printenv printf ps pwd @@ -157,10 +158,12 @@ export ZFSTEST_FILES='chg_usr_exec mkfiles mktree mmap_exec + mmap_libaio mmapwrite randfree_file readmmap rename_dir rm_lnkcnt_zero_file threadsappend + user_ns_exec xattrtest' diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib index 86f172a6..13c85912 100644 --- a/tests/zfs-tests/include/libtest.shlib +++ b/tests/zfs-tests/include/libtest.shlib @@ -1,4 +1,3 @@ -#!/bin/ksh -p # # CDDL HEADER START # @@ -503,8 +502,7 @@ function default_cleanup_noexit typeset fs="" for fs in $(zfs list -H -o name \ | grep "^$ZONE_POOL/$ZONE_CTR[01234]/"); do - datasetexists $fs && \ - log_must zfs destroy -Rf $fs + destroy_dataset "$fs" "-Rf" done # Need cleanup here to avoid garbage dir left. @@ -565,11 +563,8 @@ function default_container_cleanup [[ $? -eq 0 ]] && \ log_must zfs unmount $TESTPOOL/$TESTCTR/$TESTFS1 - datasetexists $TESTPOOL/$TESTCTR/$TESTFS1 && \ - log_must zfs destroy -R $TESTPOOL/$TESTCTR/$TESTFS1 - - datasetexists $TESTPOOL/$TESTCTR && \ - log_must zfs destroy -Rf $TESTPOOL/$TESTCTR + destroy_dataset "$TESTPOOL/$TESTCTR/$TESTFS1" "-R" + destroy_dataset "$TESTPOOL/$TESTCTR" "-Rf" [[ -e $TESTDIR1 ]] && \ log_must rm -rf $TESTDIR1 > /dev/null 2>&1 @@ -603,7 +598,7 @@ function destroy_snapshot log_fail "get_prop mountpoint $snap failed." fi - log_must zfs destroy $snap + destroy_dataset "$snap" [[ $mtpt != "" && -d $mtpt ]] && \ log_must rm -rf $mtpt } @@ -629,7 +624,7 @@ function destroy_clone log_fail "get_prop mountpoint $clone failed." fi - log_must zfs destroy $clone + destroy_dataset "$clone" [[ $mtpt != "" && -d $mtpt ]] && \ log_must rm -rf $mtpt } @@ -648,7 +643,7 @@ function destroy_bookmark log_fail "'$bkmarkp' does not existed." fi - log_must zfs destroy $bkmark + destroy_dataset "$bkmark" } # Return 0 if a snapshot exists; $? otherwise @@ -767,7 +762,11 @@ function zero_partitions # typeset i if is_linux; then - log_must parted $DEV_DSKDIR/$diskname -s -- mklabel gpt + DSK=$DEV_DSKDIR/$diskname + DSK=$(echo $DSK | sed -e "s|//|/|g") + log_must parted $DSK -s -- mklabel gpt + blockdev --rereadpt $DSK 2>/dev/null + block_device_wait else for i in 0 1 3 4 5 6 7 do @@ -795,10 +794,11 @@ function set_partition # /dev/null block_device_wait else + if [[ -z $slicenum || -z $size || -z $disk ]]; then + log_fail "The slice, size or disk name is unspecified." + fi + typeset format_file=/var/tmp/format_in.$$ echo "partition" >$format_file @@ -1546,6 +1550,40 @@ function destroy_pool #pool return 0 } +# Return 0 if destroy successfully or the dataset exists; $? otherwise +# Note: In local zones, this function should return 0 silently. +# +# $1 - dataset name +# $2 - custom arguments for zfs destroy +# Destroy dataset with the given parameters. + +function destroy_dataset #dataset #args +{ + typeset dataset=$1 + typeset mtpt + typeset args=${2:-""} + + if [[ -z $dataset ]]; then + log_note "No dataset name given." + return 1 + fi + + if is_global_zone ; then + if datasetexists "$dataset" ; then + mtpt=$(get_prop mountpoint "$dataset") + log_must_busy zfs destroy $args $dataset + + [[ -d $mtpt ]] && \ + log_must rm -rf $mtpt + else + log_note "Dataset does not exist. ($dataset)" + return 1 + fi + fi + + return 0 +} + # # Firstly, create a pool with 5 datasets. Then, create a single zone and # export the 5 datasets to it. In addition, we also add a ZFS filesystem @@ -2532,9 +2570,7 @@ function verify_opt_p_ops esac # make sure the upper level filesystem does not exist - if datasetexists ${newdataset%/*} ; then - log_must zfs destroy -rRf ${newdataset%/*} - fi + destroy_dataset "${newdataset%/*}" "-rRf" # without -p option, operation will fail log_mustnot zfs $ops $dataset $newdataset @@ -3339,9 +3375,47 @@ function wait_replacing #pool done } +# +# Wait for a pool to be scrubbed +# +# $1 pool name +# $2 number of seconds to wait (optional) +# +# Returns true when pool has been scrubbed, or false if there's a timeout or if +# no scrub was done. +# +function wait_scrubbed +{ + typeset pool=${1:-$TESTPOOL} + typeset iter=${2:-10} + for i in {1..$iter} ; do + if is_pool_scrubbed $pool ; then + return 0 + fi + sleep 1 + done + return 1 +} + +# Backup the zed.rc in our test directory so that we can edit it for our test. +# +# Returns: Backup file name. You will need to pass this to zed_rc_restore(). +function zed_rc_backup +{ + zedrc_backup="$(mktemp)" + cp $ZEDLET_DIR/zed.rc $zedrc_backup + echo $zedrc_backup +} + +function zed_rc_restore +{ + mv $1 $ZEDLET_DIR/zed.rc +} + # # Setup custom environment for the ZED. # +# $@ Optional list of zedlets to run under zed. function zed_setup { if ! is_linux; then @@ -3359,6 +3433,7 @@ function zed_setup if [[ -e $VDEVID_CONF_ETC ]]; then log_fail "Must not have $VDEVID_CONF_ETC file present on system" fi + EXTRA_ZEDLETS=$@ # Create a symlink for /etc/zfs/vdev_id.conf file. log_must ln -s $VDEVID_CONF $VDEVID_CONF_ETC @@ -3368,32 +3443,44 @@ function zed_setup log_must cp ${ZEDLET_ETC_DIR}/zed.rc $ZEDLET_DIR log_must cp ${ZEDLET_ETC_DIR}/zed-functions.sh $ZEDLET_DIR + # Scripts must only be user writable. + if [[ -n "$EXTRA_ZEDLETS" ]] ; then + saved_umask=$(umask) + log_must umask 0022 + for i in $EXTRA_ZEDLETS ; do + log_must cp ${ZEDLET_LIBEXEC_DIR}/$i $ZEDLET_DIR + done + log_must umask $saved_umask + fi + # Customize the zed.rc file to enable the full debug log. log_must sed -i '/\#ZED_DEBUG_LOG=.*/d' $ZEDLET_DIR/zed.rc echo "ZED_DEBUG_LOG=$ZED_DEBUG_LOG" >>$ZEDLET_DIR/zed.rc - # Scripts must only be user writable. - saved_umask=$(umask) - log_must umask 0022 - log_must cp ${ZEDLET_LIBEXEC_DIR}/all-syslog.sh $ZEDLET_DIR - log_must cp ${ZEDLET_LIBEXEC_DIR}/all-debug.sh $ZEDLET_DIR - log_must umask $saved_umask } # # Cleanup custom ZED environment. # +# $@ Optional list of zedlets to remove from our test zed.d directory. function zed_cleanup { if ! is_linux; then return fi + EXTRA_ZEDLETS=$@ log_must rm -f ${ZEDLET_DIR}/zed.rc log_must rm -f ${ZEDLET_DIR}/zed-functions.sh log_must rm -f ${ZEDLET_DIR}/all-syslog.sh log_must rm -f ${ZEDLET_DIR}/all-debug.sh log_must rm -f ${ZEDLET_DIR}/state + + if [[ -n "$EXTRA_ZEDLETS" ]] ; then + for i in $EXTRA_ZEDLETS ; do + log_must rm -f ${ZEDLET_DIR}/$i + done + fi log_must rm -f $ZED_LOG log_must rm -f $ZED_DEBUG_LOG log_must rm -f $VDEVID_CONF_ETC @@ -3425,7 +3512,7 @@ function zed_start # run ZED in the background and redirect foreground logging # output to $ZED_LOG. log_must truncate -s 0 $ZED_DEBUG_LOG - log_must eval "zed -vF -d $ZEDLET_DIR -p $ZEDLET_DIR/zed.pid" \ + log_must eval "zed -vF -d $ZEDLET_DIR -p $ZEDLET_DIR/zed.pid -P $PATH" \ "-s $ZEDLET_DIR/state 2>$ZED_LOG &" return 0 @@ -3463,6 +3550,23 @@ function zed_events_drain done } +# Set a variable in zed.rc to something, un-commenting it in the process. +# +# $1 variable +# $2 value +function zed_rc_set +{ + var="$1" + val="$2" + # Remove the line + cmd="'/$var/d'" + eval sed -i $cmd $ZEDLET_DIR/zed.rc + + # Add it at the end + echo "$var=$val" >> $ZEDLET_DIR/zed.rc +} + + # # Check is provided device is being active used as a swap device. # @@ -3598,3 +3702,19 @@ function get_tunable_impl return 1 } + +# +# Get actual devices used by the pool (i.e. linux sdb1 not sdb). +# +function get_pool_devices #testpool #devdir +{ + typeset testpool=$1 + typeset devdir=$2 + typeset out="" + + if is_linux; then + out=$(zpool status -P $testpool |grep ${devdir} | awk '{print $1}') + out=$(echo $out | sed -e "s|${devdir}/||g" | tr '\n' ' ') + fi + echo $out +} diff --git a/tests/zfs-tests/include/zpool_script.shlib b/tests/zfs-tests/include/zpool_script.shlib index 52ae6489..10bc0cc2 100755 --- a/tests/zfs-tests/include/zpool_script.shlib +++ b/tests/zfs-tests/include/zpool_script.shlib @@ -1,4 +1,3 @@ -#!/bin/ksh -p # # Common functions used by the zpool_status and zpool_iostat tests for running # scripts with the -c option. diff --git a/tests/zfs-tests/tests/Makefile.in b/tests/zfs-tests/tests/Makefile.in index e32edece..17ac037d 100644 --- a/tests/zfs-tests/tests/Makefile.in +++ b/tests/zfs-tests/tests/Makefile.in @@ -40,6 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -55,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -83,14 +86,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -102,7 +109,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -118,9 +124,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -131,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -216,6 +222,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -227,6 +239,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -242,6 +255,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -255,9 +270,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -276,6 +292,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/Makefile.am b/tests/zfs-tests/tests/functional/Makefile.am index d68f254e..cd60324f 100644 --- a/tests/zfs-tests/tests/functional/Makefile.am +++ b/tests/zfs-tests/tests/functional/Makefile.am @@ -58,6 +58,7 @@ SUBDIRS = \ tmpfile \ truncate \ upgrade \ + user_namespace \ userquota \ vdev_zaps \ write_dirs \ diff --git a/tests/zfs-tests/tests/functional/Makefile.in b/tests/zfs-tests/tests/functional/Makefile.in index 9d2000d8..a26fa035 100644 --- a/tests/zfs-tests/tests/functional/Makefile.in +++ b/tests/zfs-tests/tests/functional/Makefile.in @@ -40,6 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -55,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -83,14 +86,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -102,7 +109,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -118,9 +124,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -131,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -216,6 +222,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -227,6 +239,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -242,6 +255,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -255,9 +270,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -276,6 +292,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -462,6 +479,7 @@ SUBDIRS = \ tmpfile \ truncate \ upgrade \ + user_namespace \ userquota \ vdev_zaps \ write_dirs \ diff --git a/tests/zfs-tests/tests/functional/acl/Makefile.am b/tests/zfs-tests/tests/functional/acl/Makefile.am index 6a025838..6086930e 100644 --- a/tests/zfs-tests/tests/functional/acl/Makefile.am +++ b/tests/zfs-tests/tests/functional/acl/Makefile.am @@ -1,5 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/acl -dist_pkgdata_SCRIPTS = \ +dist_pkgdata_DATA = \ acl.cfg \ acl_common.kshlib diff --git a/tests/zfs-tests/tests/functional/acl/Makefile.in b/tests/zfs-tests/tests/functional/acl/Makefile.in index e74cf5cb..43586066 100644 --- a/tests/zfs-tests/tests/functional/acl/Makefile.in +++ b/tests/zfs-tests/tests/functional/acl/Makefile.in @@ -35,12 +35,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/acl -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ +DIST_COMMON = $(dist_pkgdata_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -152,6 +158,21 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/zfs_config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -174,22 +195,7 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(pkgdatadir)" -SCRIPTS = $(dist_pkgdata_SCRIPTS) -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +DATA = $(dist_pkgdata_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -241,6 +247,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -252,6 +264,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -267,6 +280,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -280,9 +295,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -301,6 +317,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -427,7 +444,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ -dist_pkgdata_SCRIPTS = \ +dist_pkgdata_DATA = \ acl.cfg \ acl_common.kshlib @@ -465,47 +482,33 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-dist_pkgdataSCRIPTS: $(dist_pkgdata_SCRIPTS) + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) @$(NORMAL_INSTALL) test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" - @list='$(dist_pkgdata_SCRIPTS)'; test -n "$(pkgdatadir)" || list=; \ + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(pkgdatadir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(pkgdatadir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-dist_pkgdataSCRIPTS: + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_pkgdata_SCRIPTS)'; test -n "$(pkgdatadir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -701,7 +704,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-recursive -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(pkgdatadir)"; do \ @@ -752,7 +755,7 @@ info: info-recursive info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dvi: install-dvi-recursive @@ -796,7 +799,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -806,7 +809,7 @@ uninstall-am: uninstall-dist_pkgdataSCRIPTS ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-dist_pkgdataSCRIPTS install-dvi \ + install-data-am install-dist_pkgdataDATA install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ @@ -814,7 +817,7 @@ uninstall-am: uninstall-dist_pkgdataSCRIPTS installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-dist_pkgdataSCRIPTS + uninstall-dist_pkgdataDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/acl/posix/Makefile.in b/tests/zfs-tests/tests/functional/acl/posix/Makefile.in index 465c0f6d..05290adc 100644 --- a/tests/zfs-tests/tests/functional/acl/posix/Makefile.in +++ b/tests/zfs-tests/tests/functional/acl/posix/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/atime/Makefile.am b/tests/zfs-tests/tests/functional/atime/Makefile.am index e0729255..a4e2335a 100644 --- a/tests/zfs-tests/tests/functional/atime/Makefile.am +++ b/tests/zfs-tests/tests/functional/atime/Makefile.am @@ -1,9 +1,11 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/atime dist_pkgdata_SCRIPTS = \ - atime.cfg \ - atime_common.kshlib \ cleanup.ksh \ setup.ksh \ atime_001_pos.ksh \ atime_002_neg.ksh \ atime_003_pos.ksh + +dist_pkgdata_DATA = \ + atime.cfg \ + atime_common.kshlib diff --git a/tests/zfs-tests/tests/functional/atime/Makefile.in b/tests/zfs-tests/tests/functional/atime/Makefile.in index 94150720..c9580578 100644 --- a/tests/zfs-tests/tests/functional/atime/Makefile.in +++ b/tests/zfs-tests/tests/functional/atime/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/atime -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/atime ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,14 +407,16 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - atime.cfg \ - atime_common.kshlib \ cleanup.ksh \ setup.ksh \ atime_001_pos.ksh \ atime_002_neg.ksh \ atime_003_pos.ksh +dist_pkgdata_DATA = \ + atime.cfg \ + atime_common.kshlib + all: all-am .SUFFIXES: @@ -469,6 +490,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -508,9 +549,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -558,7 +599,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -602,21 +643,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/bootfs/Makefile.in b/tests/zfs-tests/tests/functional/bootfs/Makefile.in index 6eef7a94..3887ac1f 100644 --- a/tests/zfs-tests/tests/functional/bootfs/Makefile.in +++ b/tests/zfs-tests/tests/functional/bootfs/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/cache/Makefile.am b/tests/zfs-tests/tests/functional/cache/Makefile.am index f1aaf721..18dd9c19 100644 --- a/tests/zfs-tests/tests/functional/cache/Makefile.am +++ b/tests/zfs-tests/tests/functional/cache/Makefile.am @@ -1,7 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cache dist_pkgdata_SCRIPTS = \ - cache.cfg \ - cache.kshlib \ cleanup.ksh \ setup.ksh \ cache_001_pos.ksh \ @@ -15,3 +13,7 @@ dist_pkgdata_SCRIPTS = \ cache_009_pos.ksh \ cache_010_neg.ksh \ cache_011_pos.ksh + +dist_pkgdata_DATA = \ + cache.cfg \ + cache.kshlib diff --git a/tests/zfs-tests/tests/functional/cache/Makefile.in b/tests/zfs-tests/tests/functional/cache/Makefile.in index 41795cf6..1f1fa254 100644 --- a/tests/zfs-tests/tests/functional/cache/Makefile.in +++ b/tests/zfs-tests/tests/functional/cache/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cache -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cache ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,8 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - cache.cfg \ - cache.kshlib \ cleanup.ksh \ setup.ksh \ cache_001_pos.ksh \ @@ -404,6 +421,10 @@ dist_pkgdata_SCRIPTS = \ cache_010_neg.ksh \ cache_011_pos.ksh +dist_pkgdata_DATA = \ + cache.cfg \ + cache.kshlib + all: all-am .SUFFIXES: @@ -477,6 +498,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -516,9 +557,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -566,7 +607,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -610,21 +651,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cachefile/Makefile.am b/tests/zfs-tests/tests/functional/cachefile/Makefile.am index 89d6a9b8..53d8c8c6 100644 --- a/tests/zfs-tests/tests/functional/cachefile/Makefile.am +++ b/tests/zfs-tests/tests/functional/cachefile/Makefile.am @@ -2,9 +2,11 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cachefile dist_pkgdata_SCRIPTS = \ cleanup.ksh \ setup.ksh \ - cachefile.cfg \ - cachefile.kshlib \ cachefile_001_pos.ksh \ cachefile_002_pos.ksh \ cachefile_003_pos.ksh \ cachefile_004_pos.ksh + +dist_pkgdata_DATA = \ + cachefile.cfg \ + cachefile.kshlib diff --git a/tests/zfs-tests/tests/functional/cachefile/Makefile.in b/tests/zfs-tests/tests/functional/cachefile/Makefile.in index 8a4979ec..28d4f69e 100644 --- a/tests/zfs-tests/tests/functional/cachefile/Makefile.in +++ b/tests/zfs-tests/tests/functional/cachefile/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cachefile -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cachefile ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -390,13 +409,15 @@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ cleanup.ksh \ setup.ksh \ - cachefile.cfg \ - cachefile.kshlib \ cachefile_001_pos.ksh \ cachefile_002_pos.ksh \ cachefile_003_pos.ksh \ cachefile_004_pos.ksh +dist_pkgdata_DATA = \ + cachefile.cfg \ + cachefile.kshlib + all: all-am .SUFFIXES: @@ -470,6 +491,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -509,9 +550,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -559,7 +600,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -603,21 +644,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cachefile/cachefile.kshlib b/tests/zfs-tests/tests/functional/cachefile/cachefile.kshlib index a88ac59c..7723e308 100644 --- a/tests/zfs-tests/tests/functional/cachefile/cachefile.kshlib +++ b/tests/zfs-tests/tests/functional/cachefile/cachefile.kshlib @@ -1,4 +1,3 @@ -#!/bin/ksh -p # # CDDL HEADER START # diff --git a/tests/zfs-tests/tests/functional/cachefile/cachefile_004_pos.ksh b/tests/zfs-tests/tests/functional/cachefile/cachefile_004_pos.ksh index ae54a936..e0b81e16 100755 --- a/tests/zfs-tests/tests/functional/cachefile/cachefile_004_pos.ksh +++ b/tests/zfs-tests/tests/functional/cachefile/cachefile_004_pos.ksh @@ -98,13 +98,13 @@ log_must zpool set cachefile=$CPATH2 $TESTPOOL1 log_must pool_in_cache $TESTPOOL1 $CPATH2 log_must zpool set cachefile=$CPATH2 $TESTPOOL2 log_must pool_in_cache $TESTPOOL2 $CPATH2 -if [[ -f $CPATH1 ]]; then +if [[ -s $CPATH1 ]]; then log_fail "Verify set when cachefile is set on pool." fi log_must zpool export $TESTPOOL1 log_must zpool export $TESTPOOL2 -if [[ -f $CPATH2 ]]; then +if [[ -s $CPATH2 ]]; then log_fail "Verify export when cachefile is set on pool." fi @@ -117,7 +117,7 @@ log_must pool_in_cache $TESTPOOL2 $CPATH2 log_must zpool destroy $TESTPOOL1 log_must zpool destroy $TESTPOOL2 -if [[ -f $CPATH2 ]]; then +if [[ -s $CPATH2 ]]; then log_fail "Verify destroy when cachefile is set on pool." fi diff --git a/tests/zfs-tests/tests/functional/casenorm/Makefile.am b/tests/zfs-tests/tests/functional/casenorm/Makefile.am index 00a19c7f..65dd156e 100644 --- a/tests/zfs-tests/tests/functional/casenorm/Makefile.am +++ b/tests/zfs-tests/tests/functional/casenorm/Makefile.am @@ -3,8 +3,6 @@ dist_pkgdata_SCRIPTS = \ setup.ksh \ cleanup.ksh \ case_all_values.ksh \ - casenorm.cfg \ - casenorm.kshlib \ insensitive_formd_delete.ksh \ insensitive_formd_lookup.ksh \ insensitive_none_delete.ksh \ @@ -20,3 +18,7 @@ dist_pkgdata_SCRIPTS = \ sensitive_formd_lookup.ksh \ sensitive_none_delete.ksh \ sensitive_none_lookup.ksh + +dist_pkgdata_DATA = \ + casenorm.cfg \ + casenorm.kshlib diff --git a/tests/zfs-tests/tests/functional/casenorm/Makefile.in b/tests/zfs-tests/tests/functional/casenorm/Makefile.in index e49ac6da..0d6f0bc7 100644 --- a/tests/zfs-tests/tests/functional/casenorm/Makefile.in +++ b/tests/zfs-tests/tests/functional/casenorm/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/casenorm -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/casenorm ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -391,8 +410,6 @@ dist_pkgdata_SCRIPTS = \ setup.ksh \ cleanup.ksh \ case_all_values.ksh \ - casenorm.cfg \ - casenorm.kshlib \ insensitive_formd_delete.ksh \ insensitive_formd_lookup.ksh \ insensitive_none_delete.ksh \ @@ -409,6 +426,10 @@ dist_pkgdata_SCRIPTS = \ sensitive_none_delete.ksh \ sensitive_none_lookup.ksh +dist_pkgdata_DATA = \ + casenorm.cfg \ + casenorm.kshlib + all: all-am .SUFFIXES: @@ -482,6 +503,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -521,9 +562,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -571,7 +612,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -615,21 +656,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/chattr/Makefile.in b/tests/zfs-tests/tests/functional/chattr/Makefile.in index c799e1ce..8eeaa9c2 100644 --- a/tests/zfs-tests/tests/functional/chattr/Makefile.in +++ b/tests/zfs-tests/tests/functional/chattr/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/checksum/Makefile.am b/tests/zfs-tests/tests/functional/checksum/Makefile.am index 8132ea1d..9eb2573e 100644 --- a/tests/zfs-tests/tests/functional/checksum/Makefile.am +++ b/tests/zfs-tests/tests/functional/checksum/Makefile.am @@ -7,7 +7,6 @@ AUTOMAKE_OPTIONS = subdir-objects pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/checksum dist_pkgdata_SCRIPTS = \ - default.cfg \ setup.ksh \ cleanup.ksh \ run_edonr_test.ksh \ @@ -15,6 +14,9 @@ dist_pkgdata_SCRIPTS = \ run_skein_test.ksh \ filetest_001_pos.ksh +dist_pkgdata_DATA = \ + default.cfg + pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/checksum pkgexec_PROGRAMS = \ diff --git a/tests/zfs-tests/tests/functional/checksum/Makefile.in b/tests/zfs-tests/tests/functional/checksum/Makefile.in index 7326f50a..43861759 100644 --- a/tests/zfs-tests/tests/functional/checksum/Makefile.in +++ b/tests/zfs-tests/tests/functional/checksum/Makefile.in @@ -16,6 +16,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,8 +36,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/config/Rules.am +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/config/Rules.am pkgexec_PROGRAMS = edonr_test$(EXEEXT) skein_test$(EXEEXT) \ sha2_test$(EXEEXT) subdir = tests/zfs-tests/tests/functional/checksum @@ -44,6 +46,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -59,6 +63,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -87,14 +92,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -106,7 +115,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -122,9 +130,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -135,7 +143,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -155,7 +163,8 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/zfs_config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(pkgexecdir)" "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgexecdir)" "$(DESTDIR)$(pkgdatadir)" \ + "$(DESTDIR)$(pkgdatadir)" PROGRAMS = $(pkgexec_PROGRAMS) am_edonr_test_OBJECTS = edonr_test.$(OBJEXT) edonr_test_OBJECTS = $(am_edonr_test_OBJECTS) @@ -223,6 +232,7 @@ SOURCES = $(edonr_test_SOURCES) $(sha2_test_SOURCES) \ $(skein_test_SOURCES) DIST_SOURCES = $(edonr_test_SOURCES) $(sha2_test_SOURCES) \ $(skein_test_SOURCES) +DATA = $(dist_pkgdata_DATA) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -243,6 +253,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -254,6 +270,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -269,6 +286,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -282,9 +301,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -303,6 +323,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -433,18 +454,18 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" -I$(top_srcdir)/include + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) \ + -I$(top_srcdir)/include LDADD = $(top_srcdir)/lib/libicp/libicp.la AUTOMAKE_OPTIONS = subdir-objects dist_pkgdata_SCRIPTS = \ - default.cfg \ setup.ksh \ cleanup.ksh \ run_edonr_test.ksh \ @@ -452,6 +473,9 @@ dist_pkgdata_SCRIPTS = \ run_skein_test.ksh \ filetest_001_pos.ksh +dist_pkgdata_DATA = \ + default.cfg + pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/checksum edonr_test_SOURCES = edonr_test.c skein_test_SOURCES = skein_test.c @@ -619,6 +643,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -704,9 +748,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) $(SCRIPTS) +all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgexecdir)" "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgexecdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -757,7 +801,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -803,7 +847,8 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS uninstall-pkgexecPROGRAMS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS \ + uninstall-pkgexecPROGRAMS .MAKE: install-am install-strip @@ -812,16 +857,16 @@ uninstall-am: uninstall-dist_pkgdataSCRIPTS uninstall-pkgexecPROGRAMS distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am \ - install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-pkgexecPROGRAMS install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-dist_pkgdataSCRIPTS \ - uninstall-pkgexecPROGRAMS + install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-pkgexecPROGRAMS \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-dist_pkgdataDATA \ + uninstall-dist_pkgdataSCRIPTS uninstall-pkgexecPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/clean_mirror/Makefile.am b/tests/zfs-tests/tests/functional/clean_mirror/Makefile.am index 2e37147b..2bc67709 100644 --- a/tests/zfs-tests/tests/functional/clean_mirror/Makefile.am +++ b/tests/zfs-tests/tests/functional/clean_mirror/Makefile.am @@ -1,10 +1,12 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/clean_mirror dist_pkgdata_SCRIPTS = \ - clean_mirror_common.kshlib \ - default.cfg \ cleanup.ksh \ setup.ksh \ clean_mirror_001_pos.ksh \ clean_mirror_002_pos.ksh \ clean_mirror_003_pos.ksh \ clean_mirror_004_pos.ksh + +dist_pkgdata_DATA = \ + clean_mirror_common.kshlib \ + default.cfg diff --git a/tests/zfs-tests/tests/functional/clean_mirror/Makefile.in b/tests/zfs-tests/tests/functional/clean_mirror/Makefile.in index c26d6dc3..54668d46 100644 --- a/tests/zfs-tests/tests/functional/clean_mirror/Makefile.in +++ b/tests/zfs-tests/tests/functional/clean_mirror/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/clean_mirror -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/clean_mirror ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,8 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - clean_mirror_common.kshlib \ - default.cfg \ cleanup.ksh \ setup.ksh \ clean_mirror_001_pos.ksh \ @@ -397,6 +414,10 @@ dist_pkgdata_SCRIPTS = \ clean_mirror_003_pos.ksh \ clean_mirror_004_pos.ksh +dist_pkgdata_DATA = \ + clean_mirror_common.kshlib \ + default.cfg + all: all-am .SUFFIXES: @@ -470,6 +491,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -509,9 +550,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -559,7 +600,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -603,21 +644,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/clean_mirror/cleanup.ksh b/tests/zfs-tests/tests/functional/clean_mirror/cleanup.ksh index ac3bfbca..fb0db312 100755 --- a/tests/zfs-tests/tests/functional/clean_mirror/cleanup.ksh +++ b/tests/zfs-tests/tests/functional/clean_mirror/cleanup.ksh @@ -38,10 +38,10 @@ df -F zfs -h | grep "$TESTFS " >/dev/null [[ $? == 0 ]] && log_must zfs umount -f $TESTDIR destroy_pool $TESTPOOL -if is_mpath_device $MIRROR_PRIMARY; then +if ( is_mpath_device $MIRROR_PRIMARY || is_loop_device $MIRROR_SECONDARY); then parted $DEV_DSKDIR/$MIRROR_PRIMARY -s rm 1 fi -if is_mpath_device $MIRROR_SECONDARY; then +if ( is_mpath_device $MIRROR_SECONDARY || is_loop_device $MIRROR_SECONDARY); then parted $DEV_DSKDIR/$MIRROR_SECONDARY -s rm 1 fi # recreate and destroy a zpool over the disks to restore the partitions to diff --git a/tests/zfs-tests/tests/functional/cli_root/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/Makefile.am index ff095148..97446b91 100644 --- a/tests/zfs-tests/tests/functional/cli_root/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/Makefile.am @@ -1,5 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root -dist_pkgdata_SCRIPTS = \ +dist_pkgdata_DATA = \ cli_common.kshlib SUBDIRS = \ diff --git a/tests/zfs-tests/tests/functional/cli_root/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/Makefile.in index 37a81b25..48f5a2eb 100644 --- a/tests/zfs-tests/tests/functional/cli_root/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/Makefile.in @@ -35,12 +35,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ +DIST_COMMON = $(dist_pkgdata_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -152,6 +158,21 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/zfs_config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -174,22 +195,7 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(pkgdatadir)" -SCRIPTS = $(dist_pkgdata_SCRIPTS) -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +DATA = $(dist_pkgdata_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -241,6 +247,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -252,6 +264,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -267,6 +280,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -280,9 +295,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -301,6 +317,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -427,7 +444,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ -dist_pkgdata_SCRIPTS = \ +dist_pkgdata_DATA = \ cli_common.kshlib SUBDIRS = \ @@ -509,47 +526,33 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-dist_pkgdataSCRIPTS: $(dist_pkgdata_SCRIPTS) + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) @$(NORMAL_INSTALL) test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" - @list='$(dist_pkgdata_SCRIPTS)'; test -n "$(pkgdatadir)" || list=; \ + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(pkgdatadir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(pkgdatadir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-dist_pkgdataSCRIPTS: + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_pkgdata_SCRIPTS)'; test -n "$(pkgdatadir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -745,7 +748,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-recursive -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(pkgdatadir)"; do \ @@ -796,7 +799,7 @@ info: info-recursive info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dvi: install-dvi-recursive @@ -840,7 +843,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -850,7 +853,7 @@ uninstall-am: uninstall-dist_pkgdataSCRIPTS ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-dist_pkgdataSCRIPTS install-dvi \ + install-data-am install-dist_pkgdataDATA install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ @@ -858,7 +861,7 @@ uninstall-am: uninstall-dist_pkgdataSCRIPTS installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-dist_pkgdataSCRIPTS + uninstall-dist_pkgdataDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zdb/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zdb/Makefile.am index 51170fbc..d37bcf60 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zdb/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zdb/Makefile.am @@ -4,4 +4,5 @@ dist_pkgdata_SCRIPTS = \ zdb_002_pos.ksh \ zdb_003_pos.ksh \ zdb_004_pos.ksh \ - zdb_005_pos.ksh + zdb_005_pos.ksh \ + zdb_006_pos.ksh diff --git a/tests/zfs-tests/tests/functional/cli_root/zdb/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zdb/Makefile.in index 425aa870..8c996111 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zdb/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zdb/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -392,7 +409,8 @@ dist_pkgdata_SCRIPTS = \ zdb_002_pos.ksh \ zdb_003_pos.ksh \ zdb_004_pos.ksh \ - zdb_005_pos.ksh + zdb_005_pos.ksh \ + zdb_006_pos.ksh all: all-am diff --git a/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_003_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_003_pos.ksh index 4c57cb58..3c444ae9 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_003_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_003_pos.ksh @@ -43,6 +43,11 @@ config_count=(1 2) set -A DISK $DISKS default_mirror_setup_noexit $DISKS + +DEVS=$(get_pool_devices ${TESTPOOL} ${DEV_RDSKDIR}) +log_note "$DEVS" +[[ -n $DEVS ]] && set -A DISK $DEVS + log_must dd if=/dev/${DISK[0]} of=/dev/${DISK[1]} bs=1K count=256 conv=notrunc for x in 0 1 ; do diff --git a/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_004_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_004_pos.ksh index 2b4057aa..91a5c979 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_004_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_004_pos.ksh @@ -45,17 +45,22 @@ function cleanup verify_runnable "global" verify_disk_count "$DISKS" 2 set -A DISK $DISKS +WHOLE_DISK=${DISK[0]} default_mirror_setup_noexit $DISKS -log_must zpool offline $TESTPOOL ${DISK[0]} +DEVS=$(get_pool_devices ${TESTPOOL} ${DEV_RDSKDIR}) +[[ -n $DEVS ]] && set -A DISK $DEVS + +log_must zpool offline $TESTPOOL ${WHOLE_DISK} log_must dd if=/dev/urandom of=$TESTDIR/testfile bs=1K count=2 log_must zpool export $TESTPOOL + log_must dd if=$DEV_RDSKDIR/${DISK[0]} of=$DEV_RDSKDIR/${DISK[1]} bs=1K count=256 conv=notrunc -ubs=$(zdb -lu $DEV_RDSKDIR/${DISK[1]} | grep -e LABEL -e Uberblock -e 'labels = ') +ubs=$(zdb -lu ${DISK[1]} | grep -e LABEL -e Uberblock -e 'labels = ') log_note "vdev 1: ubs $ubs" -ub_dump_counts=$(zdb -lu $DEV_RDSKDIR/${DISK[1]} | \ +ub_dump_counts=$(zdb -lu ${DISK[1]} | \ awk ' /LABEL/ {label=$NF; blocks[label]=0}; /Uberblock/ {blocks[label]++}; END {print blocks[0],blocks[1],blocks[2],blocks[3]}') diff --git a/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_005_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_005_pos.ksh index 60bbb561..f6730f61 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_005_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_005_pos.ksh @@ -44,6 +44,10 @@ verify_disk_count "$DISKS" 2 set -A DISK $DISKS default_mirror_setup_noexit $DISKS +DEVS=$(get_pool_devices ${TESTPOOL} ${DEV_RDSKDIR}) +log_note "$DEVS" +[[ -n $DEVS ]] && set -A DISK $DEVS + log_must dd if=/dev/zero of=$DEV_RDSKDIR/${DISK[1]} bs=1K count=256 conv=notrunc log_must truncate -s 0 $TEMPFILE diff --git a/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_006_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_006_pos.ksh new file mode 100755 index 00000000..97b00e9e --- /dev/null +++ b/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_006_pos.ksh @@ -0,0 +1,64 @@ +#!/bin/ksh + +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright (c) 2018 by Nutanix. All rights reserved. +# + +. $STF_SUITE/include/libtest.shlib + +# +# Description: +# zdb -d will work on imported/exported pool with pool/dataset argument +# +# Strategy: +# 1. Create a pool +# 2. Run zdb -d with pool and dataset arguments. +# 3. Export the pool +# 4. Run zdb -ed with pool and dataset arguments. +# + +function cleanup +{ + datasetexists $TESTPOOL && destroy_pool $TESTPOOL + for DISK in $DISKS; do + zpool labelclear -f $DEV_RDSKDIR/$DISK + done +} + +log_assert "Verify zdb -d works on imported/exported pool with pool/dataset argument" +log_onexit cleanup + +verify_runnable "global" +verify_disk_count "$DISKS" 2 + +default_mirror_setup_noexit $DISKS +log_must zfs snap $TESTPOOL/$TESTFS@snap + +log_must zdb -d $TESTPOOL +log_must zdb -d $TESTPOOL/ +log_must zdb -d $TESTPOOL/$TESTFS +log_must zdb -d $TESTPOOL/$TESTFS@snap + +log_must zpool export $TESTPOOL + +log_must zdb -ed $TESTPOOL +log_must zdb -ed $TESTPOOL/ +log_must zdb -ed $TESTPOOL/$TESTFS +log_must zdb -ed $TESTPOOL/$TESTFS@snap + +log_must zpool import $TESTPOOL + +cleanup + +log_pass "zdb -d works on imported/exported pool with pool/dataset argument" diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs/Makefile.in index c6e9c7e4..fb375a5c 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_clone/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs_clone/Makefile.in index 73945a3e..b37720a7 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_clone/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_clone/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_copies/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_copies/Makefile.am index 732126de..4ac103a8 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_copies/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_copies/Makefile.am @@ -1,7 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_copies dist_pkgdata_SCRIPTS = \ - zfs_copies.cfg \ - zfs_copies.kshlib \ setup.ksh \ cleanup.ksh \ zfs_copies_001_pos.ksh \ @@ -10,3 +8,7 @@ dist_pkgdata_SCRIPTS = \ zfs_copies_004_neg.ksh \ zfs_copies_005_neg.ksh \ zfs_copies_006_pos.ksh + +dist_pkgdata_DATA = \ + zfs_copies.cfg \ + zfs_copies.kshlib diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_copies/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs_copies/Makefile.in index 93f41bb2..bdfe01f3 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_copies/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_copies/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zfs_copies -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_copies ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,8 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zfs_copies.cfg \ - zfs_copies.kshlib \ setup.ksh \ cleanup.ksh \ zfs_copies_001_pos.ksh \ @@ -399,6 +416,10 @@ dist_pkgdata_SCRIPTS = \ zfs_copies_005_neg.ksh \ zfs_copies_006_pos.ksh +dist_pkgdata_DATA = \ + zfs_copies.cfg \ + zfs_copies.kshlib + all: all-am .SUFFIXES: @@ -472,6 +493,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -511,9 +552,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -561,7 +602,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -605,21 +646,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_create/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_create/Makefile.am index 998c7dca..97b2d4cc 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_create/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_create/Makefile.am @@ -1,8 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_create dist_pkgdata_SCRIPTS = \ - properties.kshlib \ - zfs_create_common.kshlib \ - zfs_create.cfg \ setup.ksh \ cleanup.ksh \ zfs_create_001_pos.ksh \ @@ -19,3 +16,8 @@ dist_pkgdata_SCRIPTS = \ zfs_create_012_pos.ksh \ zfs_create_013_pos.ksh \ zfs_create_014_pos.ksh + +dist_pkgdata_DATA = \ + properties.kshlib \ + zfs_create_common.kshlib \ + zfs_create.cfg diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_create/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs_create/Makefile.in index 42c9dd9e..8a1118fb 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_create/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_create/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zfs_create -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_create ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,9 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - properties.kshlib \ - zfs_create_common.kshlib \ - zfs_create.cfg \ setup.ksh \ cleanup.ksh \ zfs_create_001_pos.ksh \ @@ -408,6 +424,11 @@ dist_pkgdata_SCRIPTS = \ zfs_create_013_pos.ksh \ zfs_create_014_pos.ksh +dist_pkgdata_DATA = \ + properties.kshlib \ + zfs_create_common.kshlib \ + zfs_create.cfg + all: all-am .SUFFIXES: @@ -481,6 +502,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -520,9 +561,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -570,7 +611,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -614,21 +655,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/Makefile.am index 5a4bd70c..183578df 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/Makefile.am @@ -1,7 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_destroy dist_pkgdata_SCRIPTS = \ - zfs_destroy_common.kshlib \ - zfs_destroy.cfg \ setup.ksh \ cleanup.ksh \ zfs_destroy_001_pos.ksh \ @@ -20,3 +18,7 @@ dist_pkgdata_SCRIPTS = \ zfs_destroy_014_pos.ksh \ zfs_destroy_015_pos.ksh \ zfs_destroy_016_pos.ksh + +dist_pkgdata_DATA = \ + zfs_destroy_common.kshlib \ + zfs_destroy.cfg diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/Makefile.in index bf96c033..4edba53e 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zfs_destroy -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_destroy ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,8 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zfs_destroy_common.kshlib \ - zfs_destroy.cfg \ setup.ksh \ cleanup.ksh \ zfs_destroy_001_pos.ksh \ @@ -409,6 +426,10 @@ dist_pkgdata_SCRIPTS = \ zfs_destroy_015_pos.ksh \ zfs_destroy_016_pos.ksh +dist_pkgdata_DATA = \ + zfs_destroy_common.kshlib \ + zfs_destroy.cfg + all: all-am .SUFFIXES: @@ -482,6 +503,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -521,9 +562,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -571,7 +612,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -615,21 +656,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_002_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_002_pos.ksh index 594e3ad9..12892122 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_002_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_002_pos.ksh @@ -49,8 +49,7 @@ function cleanup { typeset -i i=0 while (( $i < ${#data_objs[*]} )); do - datasetexists "${data_objs[i]}" && \ - zfs destroy -rf ${data_objs[i]} + destroy_dataset "${data_objs[i]}" "-rf" ((i = i + 1)) done } @@ -87,7 +86,7 @@ done i=0 while (( $i < ${#data_objs[*]} )); do - log_must zfs destroy ${data_objs[i]} + destroy_dataset "${data_objs[i]}" datasetexists ${data_objs[i]} && \ log_fail "'zfs destroy ||' fail." ((i = i + 1)) diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_get/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_get/Makefile.am index 880a845a..22e95907 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_get/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_get/Makefile.am @@ -1,7 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_get dist_pkgdata_SCRIPTS = \ - zfs_get_common.kshlib \ - zfs_get_list_d.kshlib \ setup.ksh \ cleanup.ksh \ zfs_get_001_pos.ksh \ @@ -14,3 +12,7 @@ dist_pkgdata_SCRIPTS = \ zfs_get_008_pos.ksh \ zfs_get_009_pos.ksh \ zfs_get_010_neg.ksh + +dist_pkgdata_DATA = \ + zfs_get_common.kshlib \ + zfs_get_list_d.kshlib diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_get/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs_get/Makefile.in index 77c46f41..c6385cc8 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_get/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_get/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zfs_get -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_get ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,8 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zfs_get_common.kshlib \ - zfs_get_list_d.kshlib \ setup.ksh \ cleanup.ksh \ zfs_get_001_pos.ksh \ @@ -403,6 +420,10 @@ dist_pkgdata_SCRIPTS = \ zfs_get_009_pos.ksh \ zfs_get_010_neg.ksh +dist_pkgdata_DATA = \ + zfs_get_common.kshlib \ + zfs_get_list_d.kshlib + all: all-am .SUFFIXES: @@ -476,6 +497,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -515,9 +556,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -565,7 +606,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -609,21 +650,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_inherit/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs_inherit/Makefile.in index 0f583394..214691c3 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_inherit/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_inherit/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am index f8850406..746f87c0 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am @@ -1,7 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_mount dist_pkgdata_SCRIPTS = \ - zfs_mount.cfg \ - zfs_mount.kshlib \ setup.ksh \ cleanup.ksh \ zfs_mount_001_pos.ksh \ @@ -17,4 +15,9 @@ dist_pkgdata_SCRIPTS = \ zfs_mount_011_neg.ksh \ zfs_mount_012_neg.ksh \ zfs_mount_all_001_pos.ksh \ - zfs_mount_remount.ksh + zfs_mount_remount.ksh \ + zfs_multi_mount.ksh + +dist_pkgdata_DATA = \ + zfs_mount.cfg \ + zfs_mount.kshlib diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.in index 48722505..38b2a2dc 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zfs_mount -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_mount ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,8 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zfs_mount.cfg \ - zfs_mount.kshlib \ setup.ksh \ cleanup.ksh \ zfs_mount_001_pos.ksh \ @@ -405,7 +422,12 @@ dist_pkgdata_SCRIPTS = \ zfs_mount_011_neg.ksh \ zfs_mount_012_neg.ksh \ zfs_mount_all_001_pos.ksh \ - zfs_mount_remount.ksh + zfs_mount_remount.ksh \ + zfs_multi_mount.ksh + +dist_pkgdata_DATA = \ + zfs_mount.cfg \ + zfs_mount.kshlib all: all-am @@ -480,6 +502,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -519,9 +561,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -569,7 +611,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -613,21 +655,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_multi_mount.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_multi_mount.ksh new file mode 100755 index 00000000..e015d0af --- /dev/null +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_multi_mount.ksh @@ -0,0 +1,104 @@ +#!/bin/ksh -p +# +# CDDL HEADER START +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy is of the CDDL is also available via the Internet +# at http://www.illumos.org/license/CDDL. +# +# CDDL HEADER END +# + +# +# Copyright(c) 2018 Datto Inc. +# + +. $STF_SUITE/include/libtest.shlib + +# +# DESCRIPTION: +# Verify multi mount functionality +# +# STRATEGY: +# 1. Create fs +# 2. Create and hold open file in filesystem +# 3. Lazy unmount +# 4. Verify remounting fs that was lazily unmounted is possible +# 5. Verify multiple mounts of the same dataset are possible +# 6. Verify bind mount doesn't prevent rename +# + +verify_runnable "both" + +function cleanup +{ + ismounted $MNTPFS && log_must umount $MNTPFS + ismounted $MNTPFS2 && log_must umount $MNTPFS2 + ismounted $MNTPFS3 && log_must umount $MNTPFS3 + ismounted $MNTPFS4 && log_must umount $MNTPFS4 + ismounted $RENAMEMNT && log_must umount $RENAMEMNT + datasetexists $TESTDS && log_must destroy_dataset "$TESTDS" "-f" +} +log_onexit cleanup + +log_assert "Verify multiple mounts into one namespace are possible" + +# 1. Create fs +TESTDS="$TESTPOOL/multi-mount-test" +log_must zfs create $TESTDS + +# 2. Create and hold open file in filesystem +MNTPFS="$(get_prop mountpoint $TESTDS)" +FILENAME="$MNTPFS/file" +log_must mkfile 128k $FILENAME +log_must exec 9<> $FILENAME # open file + +# 3. Lazy umount +log_must umount -l $MNTPFS +if [ -f $FILENAME ]; then + log_fail "Lazy unmount failed" +fi + +# 4. Verify remounting fs that was lazily unmounted is possible +log_must zfs mount $TESTDS +if [ ! -f $FILENAME ]; then + log_fail "Lazy remount failed" +fi +log_must exec 9>&- # close fd + +# 5. Verify multiple mounts of the same dataset are possible +MNTPFS2="$MNTPFS-second" +FILENAME="$MNTPFS2/file" +log_must mkdir $MNTPFS2 +log_must mount -t zfs -o zfsutil $TESTDS $MNTPFS2 +if [ ! -f $FILENAME ]; then + log_fail "First multi mount failed" +fi + +MNTPFS3="$MNTPFS-third" +FILENAME="$MNTPFS3/file" +log_must mkdir $MNTPFS3 +log_must mount -t zfs -o zfsutil $TESTDS $MNTPFS3 +if [ ! -f $FILENAME ]; then + log_fail "Second multi mount failed" +fi + +# 6. Verify bind mount doesn't prevent rename +RENAMEFS="$TESTDS-newname" +MNTPFS4="$MNTPFS-fourth" +log_must mkdir $MNTPFS4 +log_must mount --bind $MNTPFS $MNTPFS4 +log_must zfs rename $TESTDS $RENAMEFS +RENAMEMNT="$(get_prop mountpoint $RENAMEFS)" +FILENAME="$RENAMEMNT/file" +if [ ! -f $FILENAME ]; then + log_fail "Rename failed" +fi +log_must zfs rename $RENAMEFS $TESTDS + +log_pass "Multiple mounts are possible" diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_promote/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_promote/Makefile.am index fa0eae74..10f62a26 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_promote/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_promote/Makefile.am @@ -1,6 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_promote dist_pkgdata_SCRIPTS = \ - zfs_promote.cfg \ setup.ksh \ cleanup.ksh \ zfs_promote_001_pos.ksh \ @@ -11,3 +10,6 @@ dist_pkgdata_SCRIPTS = \ zfs_promote_006_neg.ksh \ zfs_promote_007_neg.ksh \ zfs_promote_008_pos.ksh + +dist_pkgdata_DATA = \ + zfs_promote.cfg diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_promote/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs_promote/Makefile.in index f91dedf9..7d92adea 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_promote/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_promote/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zfs_promote -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_promote ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,7 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zfs_promote.cfg \ setup.ksh \ cleanup.ksh \ zfs_promote_001_pos.ksh \ @@ -400,6 +418,9 @@ dist_pkgdata_SCRIPTS = \ zfs_promote_007_neg.ksh \ zfs_promote_008_pos.ksh +dist_pkgdata_DATA = \ + zfs_promote.cfg + all: all-am .SUFFIXES: @@ -473,6 +494,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -512,9 +553,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -562,7 +603,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -606,21 +647,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_008_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_008_pos.ksh index 05d482c4..c37c9a62 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_008_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_008_pos.ksh @@ -49,7 +49,7 @@ function cleanup log_must zfs promote $vol fi - log_must zfs destroy -rR $snap + destroy_dataset "$snap" "-rR" } log_assert "'zfs promote' can promote a volume clone." diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_property/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs_property/Makefile.in index a9a6cd63..38fafc08 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_property/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_property/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile.in index e170a4d2..ab31b148 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile.am index fec9560c..5abc86c5 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile.am @@ -1,7 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_rename dist_pkgdata_SCRIPTS = \ - zfs_rename.cfg \ - zfs_rename.kshlib \ setup.ksh \ cleanup.ksh \ zfs_rename_001_pos.ksh \ @@ -17,3 +15,7 @@ dist_pkgdata_SCRIPTS = \ zfs_rename_011_pos.ksh \ zfs_rename_012_neg.ksh \ zfs_rename_013_pos.ksh + +dist_pkgdata_DATA = \ + zfs_rename.cfg \ + zfs_rename.kshlib diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile.in index 0b7a851e..ebeb1d42 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zfs_rename -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_rename ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,8 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zfs_rename.cfg \ - zfs_rename.kshlib \ setup.ksh \ cleanup.ksh \ zfs_rename_001_pos.ksh \ @@ -406,6 +423,10 @@ dist_pkgdata_SCRIPTS = \ zfs_rename_012_neg.ksh \ zfs_rename_013_pos.ksh +dist_pkgdata_DATA = \ + zfs_rename.cfg \ + zfs_rename.kshlib + all: all-am .SUFFIXES: @@ -479,6 +500,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -518,9 +559,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -568,7 +609,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -612,21 +653,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_reservation/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs_reservation/Makefile.in index e0dbec3e..f08f9a95 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_reservation/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_reservation/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_rollback/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_rollback/Makefile.am index 857959b2..4d278f72 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_rollback/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_rollback/Makefile.am @@ -1,10 +1,12 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_rollback dist_pkgdata_SCRIPTS = \ - zfs_rollback.cfg \ - zfs_rollback_common.kshlib \ setup.ksh \ cleanup.ksh \ zfs_rollback_001_pos.ksh \ zfs_rollback_002_pos.ksh \ zfs_rollback_003_neg.ksh \ zfs_rollback_004_neg.ksh + +dist_pkgdata_DATA = \ + zfs_rollback.cfg \ + zfs_rollback_common.kshlib diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_rollback/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs_rollback/Makefile.in index a21a2fbd..42c932e4 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_rollback/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_rollback/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zfs_rollback -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_rollback ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,8 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zfs_rollback.cfg \ - zfs_rollback_common.kshlib \ setup.ksh \ cleanup.ksh \ zfs_rollback_001_pos.ksh \ @@ -397,6 +414,10 @@ dist_pkgdata_SCRIPTS = \ zfs_rollback_003_neg.ksh \ zfs_rollback_004_neg.ksh +dist_pkgdata_DATA = \ + zfs_rollback.cfg \ + zfs_rollback_common.kshlib + all: all-am .SUFFIXES: @@ -470,6 +491,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -509,9 +550,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -559,7 +600,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -603,21 +644,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile.am index 13faeab1..cad48ed3 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile.am @@ -1,6 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_send dist_pkgdata_SCRIPTS = \ - zfs_send.cfg \ setup.ksh \ cleanup.ksh \ zfs_send_001_pos.ksh \ @@ -10,3 +9,6 @@ dist_pkgdata_SCRIPTS = \ zfs_send_005_pos.ksh \ zfs_send_006_pos.ksh \ zfs_send_007_pos.ksh + +dist_pkgdata_DATA = \ + zfs_send.cfg diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile.in index f41b8c91..d92f3a52 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zfs_send -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_send ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,7 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zfs_send.cfg \ setup.ksh \ cleanup.ksh \ zfs_send_001_pos.ksh \ @@ -399,6 +417,9 @@ dist_pkgdata_SCRIPTS = \ zfs_send_006_pos.ksh \ zfs_send_007_pos.ksh +dist_pkgdata_DATA = \ + zfs_send.cfg + all: all-am .SUFFIXES: @@ -472,6 +493,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -511,9 +552,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -561,7 +602,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -605,21 +646,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_set/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_set/Makefile.am index f47ff109..0067041d 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_set/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_set/Makefile.am @@ -1,6 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_set dist_pkgdata_SCRIPTS = \ - zfs_set_common.kshlib \ setup.ksh \ cleanup.ksh \ cache_001_pos.ksh \ @@ -29,3 +28,6 @@ dist_pkgdata_SCRIPTS = \ zfs_set_001_neg.ksh \ zfs_set_002_neg.ksh \ zfs_set_003_neg.ksh + +dist_pkgdata_DATA = \ + zfs_set_common.kshlib diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_set/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs_set/Makefile.in index 97acde4f..ead442e2 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_set/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_set/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zfs_set -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_set ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,7 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zfs_set_common.kshlib \ setup.ksh \ cleanup.ksh \ cache_001_pos.ksh \ @@ -418,6 +436,9 @@ dist_pkgdata_SCRIPTS = \ zfs_set_002_neg.ksh \ zfs_set_003_neg.ksh +dist_pkgdata_DATA = \ + zfs_set_common.kshlib + all: all-am .SUFFIXES: @@ -491,6 +512,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -530,9 +571,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -580,7 +621,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -624,21 +665,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_share/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_share/Makefile.am index 926531b4..e2001465 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_share/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_share/Makefile.am @@ -1,6 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_share dist_pkgdata_SCRIPTS = \ - zfs_share.cfg \ setup.ksh \ cleanup.ksh \ zfs_share_001_pos.ksh \ @@ -14,3 +13,6 @@ dist_pkgdata_SCRIPTS = \ zfs_share_009_neg.ksh \ zfs_share_010_neg.ksh \ zfs_share_011_pos.ksh + +dist_pkgdata_DATA = \ + zfs_share.cfg diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_share/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs_share/Makefile.in index 331dc226..7562218e 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_share/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_share/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zfs_share -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_share ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,7 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zfs_share.cfg \ setup.ksh \ cleanup.ksh \ zfs_share_001_pos.ksh \ @@ -403,6 +421,9 @@ dist_pkgdata_SCRIPTS = \ zfs_share_010_neg.ksh \ zfs_share_011_pos.ksh +dist_pkgdata_DATA = \ + zfs_share.cfg + all: all-am .SUFFIXES: @@ -476,6 +497,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -515,9 +556,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -565,7 +606,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -609,21 +650,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/Makefile.am index fd1db079..bc5b8012 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/Makefile.am @@ -1,6 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_snapshot dist_pkgdata_SCRIPTS = \ - zfs_snapshot.cfg \ setup.ksh \ cleanup.ksh \ zfs_snapshot_001_neg.ksh \ @@ -12,3 +11,6 @@ dist_pkgdata_SCRIPTS = \ zfs_snapshot_007_neg.ksh \ zfs_snapshot_008_neg.ksh \ zfs_snapshot_009_pos.ksh + +dist_pkgdata_DATA = \ + zfs_snapshot.cfg diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/Makefile.in index b615059e..cd9fda2d 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zfs_snapshot -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_snapshot ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,7 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zfs_snapshot.cfg \ setup.ksh \ cleanup.ksh \ zfs_snapshot_001_neg.ksh \ @@ -401,6 +419,9 @@ dist_pkgdata_SCRIPTS = \ zfs_snapshot_008_neg.ksh \ zfs_snapshot_009_pos.ksh +dist_pkgdata_DATA = \ + zfs_snapshot.cfg + all: all-am .SUFFIXES: @@ -474,6 +495,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -513,9 +554,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -563,7 +604,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -607,21 +648,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_unmount/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_unmount/Makefile.am index 57a78087..9ea809f2 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_unmount/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_unmount/Makefile.am @@ -1,7 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_unmount dist_pkgdata_SCRIPTS = \ - zfs_unmount.cfg \ - zfs_unmount.kshlib \ setup.ksh \ cleanup.ksh \ zfs_unmount_001_pos.ksh \ @@ -14,3 +12,7 @@ dist_pkgdata_SCRIPTS = \ zfs_unmount_008_neg.ksh \ zfs_unmount_009_pos.ksh \ zfs_unmount_all_001_pos.ksh + +dist_pkgdata_DATA = \ + zfs_unmount.cfg \ + zfs_unmount.kshlib diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_unmount/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs_unmount/Makefile.in index 6d76c35f..854caf14 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_unmount/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_unmount/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zfs_unmount -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_unmount ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,8 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zfs_unmount.cfg \ - zfs_unmount.kshlib \ setup.ksh \ cleanup.ksh \ zfs_unmount_001_pos.ksh \ @@ -403,6 +420,10 @@ dist_pkgdata_SCRIPTS = \ zfs_unmount_009_pos.ksh \ zfs_unmount_all_001_pos.ksh +dist_pkgdata_DATA = \ + zfs_unmount.cfg \ + zfs_unmount.kshlib + all: all-am .SUFFIXES: @@ -476,6 +497,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -515,9 +556,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -565,7 +606,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -609,21 +650,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_unshare/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs_unshare/Makefile.in index c94e4cb3..5f965e53 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_unshare/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_unshare/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/Makefile.am index cd7a4528..7a71bae4 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/Makefile.am @@ -1,6 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_upgrade dist_pkgdata_SCRIPTS = \ - zfs_upgrade.kshlib \ setup.ksh \ cleanup.ksh \ zfs_upgrade_001_pos.ksh \ @@ -10,3 +9,6 @@ dist_pkgdata_SCRIPTS = \ zfs_upgrade_005_pos.ksh \ zfs_upgrade_006_neg.ksh \ zfs_upgrade_007_neg.ksh + +dist_pkgdata_DATA = \ + zfs_upgrade.kshlib diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/Makefile.in index 79858938..1c77b97e 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zfs_upgrade -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_upgrade ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,7 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zfs_upgrade.kshlib \ setup.ksh \ cleanup.ksh \ zfs_upgrade_001_pos.ksh \ @@ -399,6 +417,9 @@ dist_pkgdata_SCRIPTS = \ zfs_upgrade_006_neg.ksh \ zfs_upgrade_007_neg.ksh +dist_pkgdata_DATA = \ + zfs_upgrade.kshlib + all: all-am .SUFFIXES: @@ -472,6 +493,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -511,9 +552,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -561,7 +602,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -605,21 +646,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool/Makefile.in index e1b4c77a..a2049fa2 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_add/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_add/Makefile.am index 06202829..a7f62b6f 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_add/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_add/Makefile.am @@ -1,7 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_add dist_pkgdata_SCRIPTS = \ - zpool_add.cfg \ - zpool_add.kshlib \ setup.ksh \ cleanup.ksh \ zpool_add_001_pos.ksh \ @@ -17,3 +15,7 @@ dist_pkgdata_SCRIPTS = \ add-o_ashift.ksh \ add_prop_ashift.ksh \ add_nested_replacing_spare.ksh + +dist_pkgdata_DATA = \ + zpool_add.cfg \ + zpool_add.kshlib diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_add/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_add/Makefile.in index e2e3735d..a4623c93 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_add/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_add/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zpool_add -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_add ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,8 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zpool_add.cfg \ - zpool_add.kshlib \ setup.ksh \ cleanup.ksh \ zpool_add_001_pos.ksh \ @@ -406,6 +423,10 @@ dist_pkgdata_SCRIPTS = \ add_prop_ashift.ksh \ add_nested_replacing_spare.ksh +dist_pkgdata_DATA = \ + zpool_add.cfg \ + zpool_add.kshlib + all: all-am .SUFFIXES: @@ -479,6 +500,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -518,9 +559,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -568,7 +609,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -612,21 +653,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_attach/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_attach/Makefile.in index ab7747a5..29add714 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_attach/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_attach/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile.am index cfd4534c..6986d38e 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile.am @@ -1,9 +1,11 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_clear dist_pkgdata_SCRIPTS = \ - zpool_clear.cfg \ setup.ksh \ cleanup.ksh \ zpool_clear_001_pos.ksh \ zpool_clear_002_neg.ksh \ zpool_clear_003_neg.ksh \ zpool_clear_readonly.ksh + +dist_pkgdata_DATA = \ + zpool_clear.cfg diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile.in index 8b825e73..270e648c 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zpool_clear -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_clear ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,7 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zpool_clear.cfg \ setup.ksh \ cleanup.ksh \ zpool_clear_001_pos.ksh \ @@ -396,6 +414,9 @@ dist_pkgdata_SCRIPTS = \ zpool_clear_003_neg.ksh \ zpool_clear_readonly.ksh +dist_pkgdata_DATA = \ + zpool_clear.cfg + all: all-am .SUFFIXES: @@ -469,6 +490,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -508,9 +549,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -558,7 +599,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -602,21 +643,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile.am index 5af41e6a..8ceb650d 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile.am @@ -1,7 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_create dist_pkgdata_SCRIPTS = \ - zpool_create.cfg \ - zpool_create.shlib \ setup.ksh \ cleanup.ksh \ zpool_create_001_pos.ksh \ @@ -33,3 +31,7 @@ dist_pkgdata_SCRIPTS = \ zpool_create_features_004_neg.ksh \ zpool_create_features_005_pos.ksh \ create-o_ashift.ksh + +dist_pkgdata_DATA = \ + zpool_create.cfg \ + zpool_create.shlib diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile.in index 8aa95efb..a05053bf 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zpool_create -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_create ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,8 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zpool_create.cfg \ - zpool_create.shlib \ setup.ksh \ cleanup.ksh \ zpool_create_001_pos.ksh \ @@ -422,6 +439,10 @@ dist_pkgdata_SCRIPTS = \ zpool_create_features_005_pos.ksh \ create-o_ashift.ksh +dist_pkgdata_DATA = \ + zpool_create.cfg \ + zpool_create.shlib + all: all-am .SUFFIXES: @@ -495,6 +516,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -534,9 +575,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -584,7 +625,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -628,21 +669,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_create/create-o_ashift.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_create/create-o_ashift.ksh index 6449c8a9..6a9c3e28 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_create/create-o_ashift.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_create/create-o_ashift.ksh @@ -44,47 +44,45 @@ verify_runnable "global" function cleanup { - poolexists $TESTPOOL && destroy_pool $TESTPOOL + destroy_pool $TESTPOOL log_must rm -f $disk } # -# Commit the specified number of TXGs to the provided pool -# We use 'zpool sync' here because we can't force it via sync(1) like on illumos -# $1 pool name -# $2 number of txg syncs +# Fill the uberblock ring in every label: we do this by committing +# TXGs to the provided until every slot contains a valid uberblock. +# NOTE: We use 'zpool sync' here because we can't force it via sync(1) like on +# illumos # -function txg_sync +function write_device_uberblocks # { - typeset pool=$1 - typeset -i count=$2 - typeset -i i=0; + typeset device=$1 + typeset pool=$2 - while [ $i -lt $count ] + while [ "$(zdb -quuul $device | grep -c 'invalid')" -ne 0 ] do - log_must sync_pool $pool true - ((i = i + 1)) + sync_pool $pool true done } # -# Verify device $1 labels contains $2 valid uberblocks in every label -# $1 device -# $2 uberblocks count +# Verify every label on contains (valid) uberblocks # -function verify_device_uberblocks +function verify_device_uberblocks # { typeset device=$1 typeset ubcount=$2 zdb -quuul $device | egrep '^(\s+)?Uberblock' | - egrep -v 'invalid$' | awk \ - -v ubcount=$ubcount '{ uberblocks[$0]++; } - END { for (i in uberblocks) { - count++; - if (uberblocks[i] != 4) { exit 1; } - } - if (count != ubcount) { exit 1; } }' + awk -v ubcount=$ubcount 'BEGIN { count=0 } { uberblocks[$0]++; } + END { + for (i in uberblocks) { + if (i ~ /invalid/) { continue; } + if (uberblocks[i] != 4) { exit 1; } + count++; + } + if (count != ubcount) { exit 1; } + }' return $? } @@ -110,8 +108,7 @@ do log_fail "Pool was created without setting ashift value to "\ "$ashift (current = $pprop)" fi - # force 128 txg sync to fill the uberblock ring - txg_sync $TESTPOOL 128 + write_device_uberblocks $disk $TESTPOOL verify_device_uberblocks $disk ${ubcount[$i]} if [[ $? -ne 0 ]] then diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_destroy/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_destroy/Makefile.am index 5130bcc3..7f9e00d5 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_destroy/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_destroy/Makefile.am @@ -1,6 +1,8 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_destroy dist_pkgdata_SCRIPTS = \ - zpool_destroy.cfg \ zpool_destroy_001_pos.ksh \ zpool_destroy_002_pos.ksh \ zpool_destroy_003_neg.ksh + +dist_pkgdata_DATA = \ + zpool_destroy.cfg diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_destroy/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_destroy/Makefile.in index 8cc3db36..b49bb367 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_destroy/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_destroy/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zpool_destroy -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_destroy ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,11 +407,13 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zpool_destroy.cfg \ zpool_destroy_001_pos.ksh \ zpool_destroy_002_pos.ksh \ zpool_destroy_003_neg.ksh +dist_pkgdata_DATA = \ + zpool_destroy.cfg + all: all-am .SUFFIXES: @@ -466,6 +487,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -505,9 +546,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -555,7 +596,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -599,21 +640,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_detach/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_detach/Makefile.in index ff51e227..ebec1b7d 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_detach/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_detach/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_expand/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_expand/Makefile.am index 67226171..2fae015b 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_expand/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_expand/Makefile.am @@ -1,9 +1,11 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_expand dist_pkgdata_SCRIPTS = \ - zpool_expand.cfg \ setup.ksh \ cleanup.ksh \ zpool_expand_001_pos.ksh \ zpool_expand_002_pos.ksh \ zpool_expand_003_neg.ksh \ zpool_expand_004_pos.ksh + +dist_pkgdata_DATA = \ + zpool_expand.cfg diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_expand/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_expand/Makefile.in index 27fba81d..e6c628fd 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_expand/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_expand/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zpool_expand -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_expand ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,7 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zpool_expand.cfg \ setup.ksh \ cleanup.ksh \ zpool_expand_001_pos.ksh \ @@ -396,6 +414,9 @@ dist_pkgdata_SCRIPTS = \ zpool_expand_003_neg.ksh \ zpool_expand_004_pos.ksh +dist_pkgdata_DATA = \ + zpool_expand.cfg + all: all-am .SUFFIXES: @@ -469,6 +490,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -508,9 +549,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -558,7 +599,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -602,21 +643,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_export/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_export/Makefile.am index d0af877f..86452e8a 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_export/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_export/Makefile.am @@ -2,8 +2,10 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_expo dist_pkgdata_SCRIPTS = \ setup.ksh \ cleanup.ksh \ - zpool_export.cfg \ zpool_export_001_pos.ksh \ zpool_export_002_pos.ksh \ zpool_export_003_neg.ksh \ zpool_export_004_pos.ksh + +dist_pkgdata_DATA = \ + zpool_export.cfg diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_export/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_export/Makefile.in index 3196a861..5ae68844 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_export/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_export/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zpool_export -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_export ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -390,12 +409,14 @@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ setup.ksh \ cleanup.ksh \ - zpool_export.cfg \ zpool_export_001_pos.ksh \ zpool_export_002_pos.ksh \ zpool_export_003_neg.ksh \ zpool_export_004_pos.ksh +dist_pkgdata_DATA = \ + zpool_export.cfg + all: all-am .SUFFIXES: @@ -469,6 +490,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -508,9 +549,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -558,7 +599,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -602,21 +643,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_get/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_get/Makefile.am index bc42ee40..36a7f231 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_get/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_get/Makefile.am @@ -1,9 +1,11 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_get dist_pkgdata_SCRIPTS = \ - zpool_get.cfg \ setup.ksh \ cleanup.ksh \ zpool_get_001_pos.ksh \ zpool_get_002_pos.ksh \ zpool_get_003_pos.ksh \ zpool_get_004_neg.ksh + +dist_pkgdata_DATA = \ + zpool_get.cfg diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_get/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_get/Makefile.in index e5407864..b0b06946 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_get/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_get/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zpool_get -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_get ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,7 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zpool_get.cfg \ setup.ksh \ cleanup.ksh \ zpool_get_001_pos.ksh \ @@ -396,6 +414,9 @@ dist_pkgdata_SCRIPTS = \ zpool_get_003_pos.ksh \ zpool_get_004_neg.ksh +dist_pkgdata_DATA = \ + zpool_get.cfg + all: all-am .SUFFIXES: @@ -469,6 +490,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -508,9 +549,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -558,7 +599,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -602,21 +643,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_history/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_history/Makefile.in index 7763ac40..61bea056 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_history/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_history/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_import/Makefile.am index c7e5c759..faeb33e6 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/Makefile.am @@ -1,6 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_import dist_pkgdata_SCRIPTS = \ - zpool_import.cfg \ setup.ksh \ cleanup.ksh \ zpool_import_001_pos.ksh \ @@ -29,5 +28,7 @@ dist_pkgdata_SCRIPTS = \ BLOCKFILES = \ unclean_export.dat.bz2 -dist_pkgdata_DATA = $(BLOCKFILES) +dist_pkgdata_DATA = $(BLOCKFILES) \ + zpool_import.cfg + EXTRA_DIST = $(BLOCKFILES) diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_import/Makefile.in index 6604e8dd..e41471e7 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -203,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -214,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -229,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -242,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -263,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -390,7 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zpool_import.cfg \ setup.ksh \ cleanup.ksh \ zpool_import_001_pos.ksh \ @@ -419,7 +435,9 @@ dist_pkgdata_SCRIPTS = \ BLOCKFILES = \ unclean_export.dat.bz2 -dist_pkgdata_DATA = $(BLOCKFILES) +dist_pkgdata_DATA = $(BLOCKFILES) \ + zpool_import.cfg + EXTRA_DIST = $(BLOCKFILES) all: all-am diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/Makefile.am index a8bea686..dc4a0277 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/Makefile.am @@ -1,5 +1,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_labelclear dist_pkgdata_SCRIPTS = \ - labelclear.cfg \ zpool_labelclear_active.ksh \ zpool_labelclear_exported.ksh + +dist_pkgdata_DATA = \ + labelclear.cfg diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/Makefile.in index b8f1e73b..0c58f8e7 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zpool_labelclear -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_labelclear ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,10 +407,12 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - labelclear.cfg \ zpool_labelclear_active.ksh \ zpool_labelclear_exported.ksh +dist_pkgdata_DATA = \ + labelclear.cfg + all: all-am .SUFFIXES: @@ -465,6 +486,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -504,9 +545,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -554,7 +595,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -598,21 +639,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/labelclear.cfg b/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/labelclear.cfg index 62d39b05..8bf03827 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/labelclear.cfg +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/labelclear.cfg @@ -1,5 +1,3 @@ -#!/bin/ksh -p -# # # This file and its contents are supplied under the terms of the # Common Development and Distribution License ("CDDL"), version 1.0. diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_offline/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_offline/Makefile.in index 2031580d..8df77c0a 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_offline/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_offline/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_online/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_online/Makefile.in index 526707bf..11adcaf5 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_online/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_online/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_remove/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_remove/Makefile.am index 9890265c..e30e3f60 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_remove/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_remove/Makefile.am @@ -1,8 +1,10 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_remove dist_pkgdata_SCRIPTS = \ - zpool_remove.cfg \ setup.ksh \ cleanup.ksh \ zpool_remove_001_neg.ksh \ zpool_remove_002_pos.ksh \ zpool_remove_003_pos.ksh + +dist_pkgdata_DATA = \ + zpool_remove.cfg diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_remove/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_remove/Makefile.in index 4bb773ba..8049ecde 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_remove/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_remove/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zpool_remove -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_remove ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,13 +407,15 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zpool_remove.cfg \ setup.ksh \ cleanup.ksh \ zpool_remove_001_neg.ksh \ zpool_remove_002_pos.ksh \ zpool_remove_003_pos.ksh +dist_pkgdata_DATA = \ + zpool_remove.cfg + all: all-am .SUFFIXES: @@ -468,6 +489,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -507,9 +548,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -557,7 +598,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -601,21 +642,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_replace/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_replace/Makefile.in index 1db06e85..d2d6e07d 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_replace/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_replace/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_scrub/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_scrub/Makefile.am index ee6a839f..a2d56851 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_scrub/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_scrub/Makefile.am @@ -1,6 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_scrub dist_pkgdata_SCRIPTS = \ - zpool_scrub.cfg \ setup.ksh \ cleanup.ksh \ zpool_scrub_001_neg.ksh \ @@ -8,3 +7,6 @@ dist_pkgdata_SCRIPTS = \ zpool_scrub_003_pos.ksh \ zpool_scrub_004_pos.ksh \ zpool_scrub_005_pos.ksh + +dist_pkgdata_DATA = \ + zpool_scrub.cfg diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_scrub/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_scrub/Makefile.in index 4b3bfe5c..745466e1 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_scrub/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_scrub/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_root/zpool_scrub -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_scrub ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,7 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zpool_scrub.cfg \ setup.ksh \ cleanup.ksh \ zpool_scrub_001_neg.ksh \ @@ -397,6 +415,9 @@ dist_pkgdata_SCRIPTS = \ zpool_scrub_004_pos.ksh \ zpool_scrub_005_pos.ksh +dist_pkgdata_DATA = \ + zpool_scrub.cfg + all: all-am .SUFFIXES: @@ -470,6 +491,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -509,9 +550,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -559,7 +600,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -603,21 +644,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_set/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_set/Makefile.in index 16cc5aaf..a9735e42 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_set/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_set/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_status/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_status/Makefile.in index 5b6a8574..5541b8b0 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_status/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_status/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_sync/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_sync/Makefile.in index a9f282a5..f32f5485 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_sync/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_sync/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile.am index 71cdb29a..1b08f487 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile.am @@ -1,7 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_upgrade dist_pkgdata_SCRIPTS = \ - zpool_upgrade.cfg \ - zpool_upgrade.kshlib \ setup.ksh \ cleanup.ksh \ zpool_upgrade_001_pos.ksh \ @@ -68,5 +66,8 @@ BLOCKFILES = \ zfs-pool-v999.dat.bz2 \ zfs-pool-vBROKEN.dat.bz2 -dist_pkgdata_DATA = $(BLOCKFILES) +dist_pkgdata_DATA = $(BLOCKFILES) \ + zpool_upgrade.cfg \ + zpool_upgrade.kshlib + EXTRA_DIST = $(BLOCKFILES) diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile.in b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile.in index d405c5a5..e68a9320 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile.in @@ -42,6 +42,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -57,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -85,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -104,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -120,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -133,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -203,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -214,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -229,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -242,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -263,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -390,8 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zpool_upgrade.cfg \ - zpool_upgrade.kshlib \ setup.ksh \ cleanup.ksh \ zpool_upgrade_001_pos.ksh \ @@ -458,7 +473,10 @@ BLOCKFILES = \ zfs-pool-v999.dat.bz2 \ zfs-pool-vBROKEN.dat.bz2 -dist_pkgdata_DATA = $(BLOCKFILES) +dist_pkgdata_DATA = $(BLOCKFILES) \ + zpool_upgrade.cfg \ + zpool_upgrade.kshlib + EXTRA_DIST = $(BLOCKFILES) all: all-am diff --git a/tests/zfs-tests/tests/functional/cli_user/Makefile.in b/tests/zfs-tests/tests/functional/cli_user/Makefile.in index fa216c4e..3bf670b5 100644 --- a/tests/zfs-tests/tests/functional/cli_user/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_user/Makefile.in @@ -40,6 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -55,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -83,14 +86,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -102,7 +109,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -118,9 +124,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -131,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -216,6 +222,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -227,6 +239,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -242,6 +255,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -255,9 +270,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -276,6 +292,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/cli_user/misc/Makefile.am b/tests/zfs-tests/tests/functional/cli_user/misc/Makefile.am index 75a3d088..29c03429 100644 --- a/tests/zfs-tests/tests/functional/cli_user/misc/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_user/misc/Makefile.am @@ -1,6 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_user/misc dist_pkgdata_SCRIPTS = \ - misc.cfg \ setup.ksh \ cleanup.ksh \ zdb_001_neg.ksh \ @@ -48,3 +47,6 @@ dist_pkgdata_SCRIPTS = \ arc_summary_001_pos.ksh \ arc_summary_002_neg.ksh \ dbufstat_001_pos.ksh + +dist_pkgdata_DATA = \ + misc.cfg diff --git a/tests/zfs-tests/tests/functional/cli_user/misc/Makefile.in b/tests/zfs-tests/tests/functional/cli_user/misc/Makefile.in index 1f7be1fe..546ff2ca 100644 --- a/tests/zfs-tests/tests/functional/cli_user/misc/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_user/misc/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_user/misc -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_user/misc ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,7 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - misc.cfg \ setup.ksh \ cleanup.ksh \ zdb_001_neg.ksh \ @@ -437,6 +455,9 @@ dist_pkgdata_SCRIPTS = \ arc_summary_002_neg.ksh \ dbufstat_001_pos.ksh +dist_pkgdata_DATA = \ + misc.cfg + all: all-am .SUFFIXES: @@ -510,6 +531,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -549,9 +590,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -599,7 +640,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -643,21 +684,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_user/zfs_list/Makefile.am b/tests/zfs-tests/tests/functional/cli_user/zfs_list/Makefile.am index 34390af6..8393072a 100644 --- a/tests/zfs-tests/tests/functional/cli_user/zfs_list/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_user/zfs_list/Makefile.am @@ -1,7 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_user/zfs_list dist_pkgdata_SCRIPTS = \ - zfs_list.cfg \ - zfs_list.kshlib \ setup.ksh \ cleanup.ksh \ zfs_list_001_pos.ksh \ @@ -10,3 +8,7 @@ dist_pkgdata_SCRIPTS = \ zfs_list_004_neg.ksh \ zfs_list_007_pos.ksh \ zfs_list_008_neg.ksh + +dist_pkgdata_DATA = \ + zfs_list.cfg \ + zfs_list.kshlib diff --git a/tests/zfs-tests/tests/functional/cli_user/zfs_list/Makefile.in b/tests/zfs-tests/tests/functional/cli_user/zfs_list/Makefile.in index eb8e142b..892e33ac 100644 --- a/tests/zfs-tests/tests/functional/cli_user/zfs_list/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_user/zfs_list/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/cli_user/zfs_list -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_user/zfs_list ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,8 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - zfs_list.cfg \ - zfs_list.kshlib \ setup.ksh \ cleanup.ksh \ zfs_list_001_pos.ksh \ @@ -399,6 +416,10 @@ dist_pkgdata_SCRIPTS = \ zfs_list_007_pos.ksh \ zfs_list_008_neg.ksh +dist_pkgdata_DATA = \ + zfs_list.cfg \ + zfs_list.kshlib + all: all-am .SUFFIXES: @@ -472,6 +493,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -511,9 +552,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -561,7 +602,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -605,21 +646,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/cli_user/zpool_iostat/Makefile.in b/tests/zfs-tests/tests/functional/cli_user/zpool_iostat/Makefile.in index f7001987..afee1551 100644 --- a/tests/zfs-tests/tests/functional/cli_user/zpool_iostat/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_user/zpool_iostat/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/cli_user/zpool_list/Makefile.in b/tests/zfs-tests/tests/functional/cli_user/zpool_list/Makefile.in index 830e3331..fefb3ac4 100644 --- a/tests/zfs-tests/tests/functional/cli_user/zpool_list/Makefile.in +++ b/tests/zfs-tests/tests/functional/cli_user/zpool_list/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/compression/Makefile.am b/tests/zfs-tests/tests/functional/compression/Makefile.am index d11b0a7a..25a5bca2 100644 --- a/tests/zfs-tests/tests/functional/compression/Makefile.am +++ b/tests/zfs-tests/tests/functional/compression/Makefile.am @@ -1,9 +1,11 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/compression dist_pkgdata_SCRIPTS = \ - compress.cfg \ cleanup.ksh \ setup.ksh \ compress_001_pos.ksh \ compress_002_pos.ksh \ compress_003_pos.ksh \ compress_004_pos.ksh + +dist_pkgdata_DATA = \ + compress.cfg diff --git a/tests/zfs-tests/tests/functional/compression/Makefile.in b/tests/zfs-tests/tests/functional/compression/Makefile.in index bfcc7ee2..e0e84f08 100644 --- a/tests/zfs-tests/tests/functional/compression/Makefile.in +++ b/tests/zfs-tests/tests/functional/compression/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/compression -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/compression ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,7 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - compress.cfg \ cleanup.ksh \ setup.ksh \ compress_001_pos.ksh \ @@ -396,6 +414,9 @@ dist_pkgdata_SCRIPTS = \ compress_003_pos.ksh \ compress_004_pos.ksh +dist_pkgdata_DATA = \ + compress.cfg + all: all-am .SUFFIXES: @@ -469,6 +490,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -508,9 +549,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -558,7 +599,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -602,21 +643,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/ctime/Makefile.in b/tests/zfs-tests/tests/functional/ctime/Makefile.in index 553bf2d7..cd2e6fbd 100644 --- a/tests/zfs-tests/tests/functional/ctime/Makefile.in +++ b/tests/zfs-tests/tests/functional/ctime/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -231,6 +237,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -242,6 +254,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -257,6 +270,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -270,9 +285,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -291,6 +307,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -421,14 +438,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) dist_pkgdata_SCRIPTS = \ ctime_001_pos.ksh \ cleanup.ksh \ diff --git a/tests/zfs-tests/tests/functional/ctime/ctime_001_pos.ksh b/tests/zfs-tests/tests/functional/ctime/ctime_001_pos.ksh old mode 100644 new mode 100755 diff --git a/tests/zfs-tests/tests/functional/delegate/Makefile.am b/tests/zfs-tests/tests/functional/delegate/Makefile.am index 6ccd65d5..c33da337 100644 --- a/tests/zfs-tests/tests/functional/delegate/Makefile.am +++ b/tests/zfs-tests/tests/functional/delegate/Makefile.am @@ -1,7 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/delegate dist_pkgdata_SCRIPTS = \ - delegate.cfg \ - delegate_common.kshlib \ cleanup.ksh \ setup.ksh \ zfs_allow_001_pos.ksh \ @@ -24,3 +22,7 @@ dist_pkgdata_SCRIPTS = \ zfs_unallow_006_pos.ksh \ zfs_unallow_007_neg.ksh \ zfs_unallow_008_neg.ksh + +dist_pkgdata_DATA = \ + delegate.cfg \ + delegate_common.kshlib diff --git a/tests/zfs-tests/tests/functional/delegate/Makefile.in b/tests/zfs-tests/tests/functional/delegate/Makefile.in index df852c49..8ec7549f 100644 --- a/tests/zfs-tests/tests/functional/delegate/Makefile.in +++ b/tests/zfs-tests/tests/functional/delegate/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/delegate -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/delegate ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,8 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - delegate.cfg \ - delegate_common.kshlib \ cleanup.ksh \ setup.ksh \ zfs_allow_001_pos.ksh \ @@ -413,6 +430,10 @@ dist_pkgdata_SCRIPTS = \ zfs_unallow_007_neg.ksh \ zfs_unallow_008_neg.ksh +dist_pkgdata_DATA = \ + delegate.cfg \ + delegate_common.kshlib + all: all-am .SUFFIXES: @@ -486,6 +507,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -525,9 +566,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -575,7 +616,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -619,21 +660,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib b/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib index 8dd60185..ebe2f4ba 100644 --- a/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib +++ b/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib @@ -53,15 +53,11 @@ function cleanup_user_group # function restore_root_datasets { - if datasetexists $ROOT_TESTFS ; then - log_must zfs destroy -Rf $ROOT_TESTFS - fi + destroy_dataset "$ROOT_TESTFS" "-Rf" log_must zfs create $ROOT_TESTFS if is_global_zone ; then - if datasetexists $ROOT_TESTVOL ; then - log_must zfs destroy -Rf $ROOT_TESTVOL - fi + destroy_dataset "$ROOT_TESTVOL" "-Rf" log_must zfs create -V $VOLSIZE $ROOT_TESTVOL block_device_wait fi diff --git a/tests/zfs-tests/tests/functional/devices/Makefile.am b/tests/zfs-tests/tests/functional/devices/Makefile.am index ebbfa9ab..42f59428 100644 --- a/tests/zfs-tests/tests/functional/devices/Makefile.am +++ b/tests/zfs-tests/tests/functional/devices/Makefile.am @@ -1,9 +1,11 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/devices dist_pkgdata_SCRIPTS = \ - devices.cfg \ - devices_common.kshlib \ cleanup.ksh \ setup.ksh \ devices_001_pos.ksh \ devices_002_neg.ksh \ devices_003_pos.ksh + +dist_pkgdata_DATA = \ + devices.cfg \ + devices_common.kshlib diff --git a/tests/zfs-tests/tests/functional/devices/Makefile.in b/tests/zfs-tests/tests/functional/devices/Makefile.in index 5636a290..0c704bd3 100644 --- a/tests/zfs-tests/tests/functional/devices/Makefile.in +++ b/tests/zfs-tests/tests/functional/devices/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/devices -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/devices ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,14 +407,16 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - devices.cfg \ - devices_common.kshlib \ cleanup.ksh \ setup.ksh \ devices_001_pos.ksh \ devices_002_neg.ksh \ devices_003_pos.ksh +dist_pkgdata_DATA = \ + devices.cfg \ + devices_common.kshlib + all: all-am .SUFFIXES: @@ -469,6 +490,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -508,9 +549,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -558,7 +599,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -602,21 +643,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/events/Makefile.am b/tests/zfs-tests/tests/functional/events/Makefile.am index 7813c18b..e1fe4908 100644 --- a/tests/zfs-tests/tests/functional/events/Makefile.am +++ b/tests/zfs-tests/tests/functional/events/Makefile.am @@ -2,7 +2,10 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/events dist_pkgdata_SCRIPTS = \ setup.ksh \ cleanup.ksh \ - events.cfg \ - events_common.kshlib \ events_001_pos.ksh \ - events_002_pos.ksh + events_002_pos.ksh \ + zed_rc_filter.ksh + +dist_pkgdata_DATA = \ + events.cfg \ + events_common.kshlib diff --git a/tests/zfs-tests/tests/functional/events/Makefile.in b/tests/zfs-tests/tests/functional/events/Makefile.in index 10143970..705f53ea 100644 --- a/tests/zfs-tests/tests/functional/events/Makefile.in +++ b/tests/zfs-tests/tests/functional/events/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/events -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/events ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -390,10 +409,13 @@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ setup.ksh \ cleanup.ksh \ - events.cfg \ - events_common.kshlib \ events_001_pos.ksh \ - events_002_pos.ksh + events_002_pos.ksh \ + zed_rc_filter.ksh + +dist_pkgdata_DATA = \ + events.cfg \ + events_common.kshlib all: all-am @@ -468,6 +490,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -507,9 +549,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -557,7 +599,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -601,21 +643,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/events/cleanup.ksh b/tests/zfs-tests/tests/functional/events/cleanup.ksh index bc536e26..4905342b 100755 --- a/tests/zfs-tests/tests/functional/events/cleanup.ksh +++ b/tests/zfs-tests/tests/functional/events/cleanup.ksh @@ -26,6 +26,6 @@ . $STF_SUITE/include/libtest.shlib -zed_cleanup +zed_cleanup all-debug.sh all-syslog.sh default_cleanup diff --git a/tests/zfs-tests/tests/functional/events/setup.ksh b/tests/zfs-tests/tests/functional/events/setup.ksh index 7113c1f3..2f81d16b 100755 --- a/tests/zfs-tests/tests/functional/events/setup.ksh +++ b/tests/zfs-tests/tests/functional/events/setup.ksh @@ -28,6 +28,6 @@ DISK=${DISKS%% *} -zed_setup +zed_setup all-debug.sh all-syslog.sh default_setup $DISK diff --git a/tests/zfs-tests/tests/functional/events/zed_rc_filter.ksh b/tests/zfs-tests/tests/functional/events/zed_rc_filter.ksh new file mode 100755 index 00000000..44652ee4 --- /dev/null +++ b/tests/zfs-tests/tests/functional/events/zed_rc_filter.ksh @@ -0,0 +1,104 @@ +#!/bin/ksh -p +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2018 by Lawrence Livermore National Security, LLC. +# Use is subject to license terms. +# + +# DESCRIPTION: +# Verify zed.rc ZED_SYSLOG_SUBCLASS_INCLUDE/EXCLUDE event filtering works. +# +# STRATEGY: +# 1. Execute zpool sub-commands on a pool. +# 2. Test different combinations of ZED_SYSLOG_SUBCLASS_INCLUDE filtering. +# 3. Execute zpool sub-commands on a pool. +# 4. Test different combinations of ZED_SYSLOG_SUBCLASS_EXCLUDE filtering. + +. $STF_SUITE/include/libtest.shlib +. $STF_SUITE/tests/functional/events/events_common.kshlib + +verify_runnable "both" + +function cleanup +{ + log_must zed_stop + zed_rc_restore $zedrc_backup +} + +log_assert "Verify zpool sub-commands generate expected events" +log_onexit cleanup + +log_must zpool events -c +log_must zed_start + +# Backup our zed.rc +zedrc_backup=$(zed_rc_backup) + +log_note "Include a single event type" +zed_rc_set ZED_SYSLOG_SUBCLASS_INCLUDE history_event +run_and_verify -p "$TESTPOOL" -e "sysevent.fs.zfs.history_event" \ + "zfs set compression=off $TESTPOOL/$TESTFS" + +log_note "Include a single event type with wildcards" +zed_rc_set ZED_SYSLOG_SUBCLASS_INCLUDE '*history_event*' +run_and_verify -p "$TESTPOOL" -e "sysevent.fs.zfs.history_event" \ + "zfs set compression=off $TESTPOOL/$TESTFS" + +log_note "Test a filter of a non-match and a match" +zed_rc_set ZED_SYSLOG_SUBCLASS_INCLUDE 'foobar|*history_event*' +run_and_verify -p "$TESTPOOL" -e "sysevent.fs.zfs.history_event" \ + "zfs set compression=off $TESTPOOL/$TESTFS" + +log_note "Include multiple events" +zed_rc_set ZED_SYSLOG_SUBCLASS_INCLUDE 'scrub_start|scrub_finish' +run_and_verify -p "$TESTPOOL" -e "sysevent.fs.zfs.scrub_start" \ + -e "sysevent.fs.zfs.scrub_finish" \ + "zpool scrub $TESTPOOL && wait_scrubbed $TESTPOOL" + +# We can't use run_and_verify() for exclusions, so run the rest of the tests +# manually. +log_note "Test one exclusion" +zed_rc_set ZED_SYSLOG_SUBCLASS_EXCLUDE 'history_event' +truncate -s 0 $ZED_DEBUG_LOG +log_must zfs set compression=off $TESTPOOL/$TESTFS +log_must file_wait $ZED_DEBUG_LOG 3 +log_mustnot grep -q history_event $ZED_DEBUG_LOG + +log_note "Test one exclusion with wildcards" +zed_rc_set ZED_SYSLOG_SUBCLASS_EXCLUDE '*history_event*' +truncate -s 0 $ZED_DEBUG_LOG +log_must zfs set compression=off $TESTPOOL/$TESTFS +log_must file_wait $ZED_DEBUG_LOG 3 +log_mustnot grep -q history_event $ZED_DEBUG_LOG + +log_note "Test one inclusion and one exclusion" +zed_rc_set ZED_SYSLOG_SUBCLASS_INCLUDE 'scrub_start' +zed_rc_set ZED_SYSLOG_SUBCLASS_EXCLUDE 'scrub_finish' +truncate -s 0 $ZED_DEBUG_LOG +zpool scrub $TESTPOOL +wait_scrubbed $TESTPOOL +log_must file_wait $ZED_DEBUG_LOG 3 +log_must grep -q scrub_start $ZED_DEBUG_LOG +log_mustnot grep -q scrub_finish $ZED_DEBUG_LOG + +log_pass "zed.rc event filtering works correctly." diff --git a/tests/zfs-tests/tests/functional/exec/Makefile.in b/tests/zfs-tests/tests/functional/exec/Makefile.in index dd7df43e..7650d46c 100644 --- a/tests/zfs-tests/tests/functional/exec/Makefile.in +++ b/tests/zfs-tests/tests/functional/exec/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -391,14 +408,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) dist_pkgdata_SCRIPTS = \ cleanup.ksh \ setup.ksh \ diff --git a/tests/zfs-tests/tests/functional/fault/Makefile.am b/tests/zfs-tests/tests/functional/fault/Makefile.am index eeff3126..99356932 100644 --- a/tests/zfs-tests/tests/functional/fault/Makefile.am +++ b/tests/zfs-tests/tests/functional/fault/Makefile.am @@ -1,7 +1,10 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/fault dist_pkgdata_SCRIPTS = \ - fault.cfg \ setup.ksh \ cleanup.ksh \ auto_online_001_pos.ksh \ - auto_replace_001_pos.ksh + auto_replace_001_pos.ksh \ + scrub_after_resilver.ksh + +dist_pkgdata_DATA = \ + fault.cfg diff --git a/tests/zfs-tests/tests/functional/fault/Makefile.in b/tests/zfs-tests/tests/functional/fault/Makefile.in index faa85f6d..f216eb85 100644 --- a/tests/zfs-tests/tests/functional/fault/Makefile.in +++ b/tests/zfs-tests/tests/functional/fault/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/fault -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/fault ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,11 +407,14 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - fault.cfg \ setup.ksh \ cleanup.ksh \ auto_online_001_pos.ksh \ - auto_replace_001_pos.ksh + auto_replace_001_pos.ksh \ + scrub_after_resilver.ksh + +dist_pkgdata_DATA = \ + fault.cfg all: all-am @@ -467,6 +489,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -506,9 +548,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -556,7 +598,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -600,21 +642,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/fault/cleanup.ksh b/tests/zfs-tests/tests/functional/fault/cleanup.ksh index f39f05d6..d3de742b 100755 --- a/tests/zfs-tests/tests/functional/fault/cleanup.ksh +++ b/tests/zfs-tests/tests/functional/fault/cleanup.ksh @@ -31,7 +31,7 @@ verify_runnable "global" cleanup_devices $DISKS zed_stop -zed_cleanup +zed_cleanup resilver_finish-start-scrub.sh SD=$(lsscsi | nawk '/scsi_debug/ {print $6; exit}') SDDEVICE=$(echo $SD | nawk -F / '{print $3}') diff --git a/tests/zfs-tests/tests/functional/fault/fault.cfg b/tests/zfs-tests/tests/functional/fault/fault.cfg index e6e4fe58..81777692 100644 --- a/tests/zfs-tests/tests/functional/fault/fault.cfg +++ b/tests/zfs-tests/tests/functional/fault/fault.cfg @@ -1,4 +1,3 @@ -#!/bin/ksh -p # # CDDL HEADER START # diff --git a/tests/zfs-tests/tests/functional/fault/scrub_after_resilver.ksh b/tests/zfs-tests/tests/functional/fault/scrub_after_resilver.ksh new file mode 100755 index 00000000..3b124bdd --- /dev/null +++ b/tests/zfs-tests/tests/functional/fault/scrub_after_resilver.ksh @@ -0,0 +1,64 @@ +#!/bin/ksh -p +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright (c) 2018 by Lawrence Livermore National Security, LLC. +# All rights reserved. +# + +. $STF_SUITE/include/libtest.shlib +. $STF_SUITE/tests/functional/fault/fault.cfg + +# +# DESCRIPTION: +# Test the scrub after resilver zedlet +# +# STRATEGY: +# 1. Create a mirrored pool +# 2. Fault a disk +# 3. Replace the disk, starting a resilver +# 4. Verify that a scrub happens after the resilver finishes +# + +log_assert "Testing the scrub after resilver zedlet" + +# Backup our zed.rc +zedrc_backup=$(zed_rc_backup) + +# Enable ZED_SCRUB_AFTER_RESILVER in zed.rc +zed_rc_set ZED_SCRUB_AFTER_RESILVER 1 + +function cleanup +{ + # Restore our zed.rc + log_must zed_rc_restore $zedrc_backup + default_cleanup_noexit +} + +log_onexit cleanup + +verify_disk_count "$DISKS" 3 +default_mirror_setup_noexit $DISK1 $DISK2 + +log_must zpool offline -f $TESTPOOL $DISK1 + +# Write to our degraded pool so we have some data to resilver +log_must mkfile 16M $TESTDIR/file1 + +# Replace the failed disks, forcing a resilver +log_must zpool replace $TESTPOOL $DISK1 $DISK3 + +# Wait for the resilver to finish, and then the subsequent scrub to finish. +# Waiting for the scrub has the effect of waiting for both. Timeout after 10 +# seconds if nothing is happening. +log_must wait_scrubbed $TESTPOOL 10 +log_pass "Successfully ran the scrub after resilver zedlet" diff --git a/tests/zfs-tests/tests/functional/fault/setup.ksh b/tests/zfs-tests/tests/functional/fault/setup.ksh index 3d54d4f2..484bc458 100755 --- a/tests/zfs-tests/tests/functional/fault/setup.ksh +++ b/tests/zfs-tests/tests/functional/fault/setup.ksh @@ -28,7 +28,7 @@ verify_runnable "global" -zed_setup +zed_setup resilver_finish-start-scrub.sh zed_start # Create a scsi_debug device to be used with auto-online (if using loop devices) diff --git a/tests/zfs-tests/tests/functional/features/Makefile.in b/tests/zfs-tests/tests/functional/features/Makefile.in index de192310..9a52ee5d 100644 --- a/tests/zfs-tests/tests/functional/features/Makefile.in +++ b/tests/zfs-tests/tests/functional/features/Makefile.in @@ -40,6 +40,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -55,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -83,14 +86,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -102,7 +109,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -118,9 +124,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -131,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -216,6 +222,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -227,6 +239,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -242,6 +255,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -255,9 +270,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -276,6 +292,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/features/async_destroy/Makefile.in b/tests/zfs-tests/tests/functional/features/async_destroy/Makefile.in index f41eee59..8ade2726 100644 --- a/tests/zfs-tests/tests/functional/features/async_destroy/Makefile.in +++ b/tests/zfs-tests/tests/functional/features/async_destroy/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/features/large_dnode/Makefile.in b/tests/zfs-tests/tests/functional/features/large_dnode/Makefile.in index 68dd49a6..b9d8e19f 100644 --- a/tests/zfs-tests/tests/functional/features/large_dnode/Makefile.in +++ b/tests/zfs-tests/tests/functional/features/large_dnode/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/grow_pool/Makefile.am b/tests/zfs-tests/tests/functional/grow_pool/Makefile.am index cdad6175..1e5ba31b 100644 --- a/tests/zfs-tests/tests/functional/grow_pool/Makefile.am +++ b/tests/zfs-tests/tests/functional/grow_pool/Makefile.am @@ -2,5 +2,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/grow_pool dist_pkgdata_SCRIPTS = \ setup.ksh \ cleanup.ksh \ - grow_pool.cfg \ grow_pool_001_pos.ksh + +dist_pkgdata_DATA = \ + grow_pool.cfg diff --git a/tests/zfs-tests/tests/functional/grow_pool/Makefile.in b/tests/zfs-tests/tests/functional/grow_pool/Makefile.in index 7a623f53..0176a870 100644 --- a/tests/zfs-tests/tests/functional/grow_pool/Makefile.in +++ b/tests/zfs-tests/tests/functional/grow_pool/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/grow_pool -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/grow_pool ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -390,9 +409,11 @@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ setup.ksh \ cleanup.ksh \ - grow_pool.cfg \ grow_pool_001_pos.ksh +dist_pkgdata_DATA = \ + grow_pool.cfg + all: all-am .SUFFIXES: @@ -466,6 +487,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -505,9 +546,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -555,7 +596,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -599,21 +640,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/grow_replicas/Makefile.am b/tests/zfs-tests/tests/functional/grow_replicas/Makefile.am index 7fdcd952..bd8ccd0e 100644 --- a/tests/zfs-tests/tests/functional/grow_replicas/Makefile.am +++ b/tests/zfs-tests/tests/functional/grow_replicas/Makefile.am @@ -1,4 +1,6 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/grow_replicas dist_pkgdata_SCRIPTS = \ - grow_replicas.cfg \ grow_replicas_001_pos.ksh + +dist_pkgdata_DATA = \ + grow_replicas.cfg diff --git a/tests/zfs-tests/tests/functional/grow_replicas/Makefile.in b/tests/zfs-tests/tests/functional/grow_replicas/Makefile.in index 3505a01d..b5b1bee7 100644 --- a/tests/zfs-tests/tests/functional/grow_replicas/Makefile.in +++ b/tests/zfs-tests/tests/functional/grow_replicas/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/grow_replicas -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/grow_replicas ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,9 +407,11 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - grow_replicas.cfg \ grow_replicas_001_pos.ksh +dist_pkgdata_DATA = \ + grow_replicas.cfg + all: all-am .SUFFIXES: @@ -464,6 +485,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -503,9 +544,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -553,7 +594,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -597,21 +638,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/history/Makefile.am b/tests/zfs-tests/tests/functional/history/Makefile.am index 861f4129..b865a319 100644 --- a/tests/zfs-tests/tests/functional/history/Makefile.am +++ b/tests/zfs-tests/tests/functional/history/Makefile.am @@ -1,7 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/history dist_pkgdata_SCRIPTS = \ - history.cfg \ - history_common.kshlib \ cleanup.ksh \ setup.ksh \ history_001_pos.ksh \ @@ -13,7 +11,11 @@ dist_pkgdata_SCRIPTS = \ history_007_pos.ksh \ history_008_pos.ksh \ history_009_pos.ksh \ - history_010_pos.ksh \ + history_010_pos.ksh + +dist_pkgdata_DATA = \ + history.cfg \ + history_common.kshlib \ i386.migratedpool.DAT.Z \ i386.orig_history.txt \ sparc.migratedpool.DAT.Z \ diff --git a/tests/zfs-tests/tests/functional/history/Makefile.in b/tests/zfs-tests/tests/functional/history/Makefile.in index ab302b50..f01375a9 100644 --- a/tests/zfs-tests/tests/functional/history/Makefile.in +++ b/tests/zfs-tests/tests/functional/history/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/history -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/history ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,8 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - history.cfg \ - history_common.kshlib \ cleanup.ksh \ setup.ksh \ history_001_pos.ksh \ @@ -401,7 +418,11 @@ dist_pkgdata_SCRIPTS = \ history_007_pos.ksh \ history_008_pos.ksh \ history_009_pos.ksh \ - history_010_pos.ksh \ + history_010_pos.ksh + +dist_pkgdata_DATA = \ + history.cfg \ + history_common.kshlib \ i386.migratedpool.DAT.Z \ i386.orig_history.txt \ sparc.migratedpool.DAT.Z \ @@ -481,6 +502,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -520,9 +561,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -570,7 +611,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -614,21 +655,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/inheritance/Makefile.am b/tests/zfs-tests/tests/functional/inheritance/Makefile.am index d07e2b11..82de708d 100644 --- a/tests/zfs-tests/tests/functional/inheritance/Makefile.am +++ b/tests/zfs-tests/tests/functional/inheritance/Makefile.am @@ -1,8 +1,10 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/inheritance dist_pkgdata_SCRIPTS = \ - inherit.kshlib \ cleanup.ksh \ - inherit_001_pos.ksh \ + inherit_001_pos.ksh + +dist_pkgdata_DATA = \ + inherit.kshlib \ config001.cfg \ config002.cfg \ config003.cfg \ diff --git a/tests/zfs-tests/tests/functional/inheritance/Makefile.in b/tests/zfs-tests/tests/functional/inheritance/Makefile.in index 5288dbee..288ce876 100644 --- a/tests/zfs-tests/tests/functional/inheritance/Makefile.in +++ b/tests/zfs-tests/tests/functional/inheritance/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/inheritance -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/inheritance ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,9 +407,11 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - inherit.kshlib \ cleanup.ksh \ - inherit_001_pos.ksh \ + inherit_001_pos.ksh + +dist_pkgdata_DATA = \ + inherit.kshlib \ config001.cfg \ config002.cfg \ config003.cfg \ @@ -513,6 +534,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -552,9 +593,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -602,7 +643,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -646,21 +687,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/inuse/Makefile.am b/tests/zfs-tests/tests/functional/inuse/Makefile.am index efc00eac..c541e57e 100644 --- a/tests/zfs-tests/tests/functional/inuse/Makefile.am +++ b/tests/zfs-tests/tests/functional/inuse/Makefile.am @@ -1,6 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/inuse dist_pkgdata_SCRIPTS = \ - inuse.cfg \ setup.ksh \ inuse_001_pos.ksh \ inuse_003_pos.ksh \ @@ -10,3 +9,6 @@ dist_pkgdata_SCRIPTS = \ inuse_007_pos.ksh \ inuse_008_pos.ksh \ inuse_009_pos.ksh + +dist_pkgdata_DATA = \ + inuse.cfg diff --git a/tests/zfs-tests/tests/functional/inuse/Makefile.in b/tests/zfs-tests/tests/functional/inuse/Makefile.in index bef8c014..906cfb7f 100644 --- a/tests/zfs-tests/tests/functional/inuse/Makefile.in +++ b/tests/zfs-tests/tests/functional/inuse/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/inuse -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/inuse ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,7 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - inuse.cfg \ setup.ksh \ inuse_001_pos.ksh \ inuse_003_pos.ksh \ @@ -399,6 +417,9 @@ dist_pkgdata_SCRIPTS = \ inuse_008_pos.ksh \ inuse_009_pos.ksh +dist_pkgdata_DATA = \ + inuse.cfg + all: all-am .SUFFIXES: @@ -472,6 +493,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -511,9 +552,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -561,7 +602,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -605,21 +646,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/inuse/inuse_005_pos.ksh b/tests/zfs-tests/tests/functional/inuse/inuse_005_pos.ksh index 9dd1e25b..6b0abf42 100755 --- a/tests/zfs-tests/tests/functional/inuse/inuse_005_pos.ksh +++ b/tests/zfs-tests/tests/functional/inuse/inuse_005_pos.ksh @@ -82,19 +82,18 @@ typeset -i i=0 unset NOINUSE_CHECK while (( i < ${#vdevs[*]} )); do - for num in 0 1 2 3 ; do eval typeset disk=\${FS_DISK$num} zero_partitions $disk done - typeset cyl="" for num in 0 1 2 3 ; do eval typeset slice=\${FS_SIDE$num} disk=${slice%${SLICE_PREFIX}*} - slice=${slice##*${SLICE_PREFIX}} + [[ -z $SLICE_PREFIX ]] && eval typeset disk=\${FS_DISK$num} + slice=$(echo $slice | awk '{ print substr($1,length($1),1) }') log_must set_partition $slice "$cyl" $FS_SIZE $disk - cyl=$(get_endslice $disk $slice) + [[ $num < 3 ]] && cyl=$(get_endslice $disk $slice) done if [[ -n $SINGLE_DISK && -n ${vdevs[i]} ]]; then @@ -115,7 +114,6 @@ while (( i < ${#vdevs[*]} )); do (( i = i + 1 )) continue fi - create_pool $TESTPOOL1 ${vdevs[i]} $vdisks spare $sdisks verify_assertion "$rawtargets" destroy_pool $TESTPOOL1 diff --git a/tests/zfs-tests/tests/functional/inuse/inuse_008_pos.ksh b/tests/zfs-tests/tests/functional/inuse/inuse_008_pos.ksh index 95d39d95..ddc8fa7a 100755 --- a/tests/zfs-tests/tests/functional/inuse/inuse_008_pos.ksh +++ b/tests/zfs-tests/tests/functional/inuse/inuse_008_pos.ksh @@ -92,9 +92,10 @@ done for num in 0 1 2 3 ; do eval typeset slice=\${FS_SIDE$num} disk=${slice%${SLICE_PREFIX}*} - slice=${slice##*${SLICE_PREFIX}} + [[ -z $SLICE_PREFIX ]] && eval typeset disk=\${FS_DISK$num} + slice=$(echo $slice | awk '{ print substr($1,length($1),1) }') log_must set_partition $slice "$cyl" $FS_SIZE $disk - cyl=$(get_endslice $disk $slice) + [[ $num < 3 ]] && cyl=$(get_endslice $disk $slice) done while (( i < ${#vdevs[*]} )); do diff --git a/tests/zfs-tests/tests/functional/inuse/inuse_009_pos.ksh b/tests/zfs-tests/tests/functional/inuse/inuse_009_pos.ksh index 6a9b9623..a5e9fda5 100755 --- a/tests/zfs-tests/tests/functional/inuse/inuse_009_pos.ksh +++ b/tests/zfs-tests/tests/functional/inuse/inuse_009_pos.ksh @@ -82,13 +82,19 @@ typeset -i i=0 while (( i < ${#vdevs[*]} )); do + for num in 0 1 2 3 ; do + eval typeset disk=\${FS_DISK$num} + zero_partitions $disk + done + typeset cyl="" for num in 0 1 2 3 ; do eval typeset slice=\${FS_SIDE$num} disk=${slice%${SLICE_PREFIX}*} - slice=${slice##*${SLICE_PREFIX}} + [[ -z $SLICE_PREFIX ]] && eval typeset disk=\${FS_DISK$num} + slice=$(echo $slice | awk '{ print substr($1,length($1),1) }') log_must set_partition $slice "$cyl" $FS_SIZE $disk - cyl=$(get_endslice $disk $slice) + [[ $num < 3 ]] && cyl=$(get_endslice $disk $slice) done if [[ -n $SINGLE_DISK && -n ${vdevs[i]} ]]; then diff --git a/tests/zfs-tests/tests/functional/large_files/Makefile.in b/tests/zfs-tests/tests/functional/large_files/Makefile.in index 4f0b5d45..717e386f 100644 --- a/tests/zfs-tests/tests/functional/large_files/Makefile.in +++ b/tests/zfs-tests/tests/functional/large_files/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/largest_pool/Makefile.am b/tests/zfs-tests/tests/functional/largest_pool/Makefile.am index 474a15ab..5f1473de 100644 --- a/tests/zfs-tests/tests/functional/largest_pool/Makefile.am +++ b/tests/zfs-tests/tests/functional/largest_pool/Makefile.am @@ -1,4 +1,6 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/largest_pool dist_pkgdata_SCRIPTS = \ - largest_pool.cfg \ largest_pool_001_pos.ksh + +dist_pkgdata_DATA = \ + largest_pool.cfg diff --git a/tests/zfs-tests/tests/functional/largest_pool/Makefile.in b/tests/zfs-tests/tests/functional/largest_pool/Makefile.in index 749b3eb2..2abc58da 100644 --- a/tests/zfs-tests/tests/functional/largest_pool/Makefile.in +++ b/tests/zfs-tests/tests/functional/largest_pool/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/largest_pool -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/largest_pool ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,9 +407,11 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - largest_pool.cfg \ largest_pool_001_pos.ksh +dist_pkgdata_DATA = \ + largest_pool.cfg + all: all-am .SUFFIXES: @@ -464,6 +485,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -503,9 +544,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -553,7 +594,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -597,21 +638,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/libzfs/Makefile.in b/tests/zfs-tests/tests/functional/libzfs/Makefile.in index 0093b0c3..0389ef62 100644 --- a/tests/zfs-tests/tests/functional/libzfs/Makefile.in +++ b/tests/zfs-tests/tests/functional/libzfs/Makefile.in @@ -43,6 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -58,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -86,14 +89,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -105,7 +112,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -121,9 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -134,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -235,6 +241,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -246,6 +258,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -261,6 +274,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -274,9 +289,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -295,6 +311,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -426,14 +443,14 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ AM_LIBTOOLFLAGS = --silent AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes \ ${NO_UNUSED_BUT_SET_VARIABLE} ${NO_BOOL_COMPARE} \ - -fno-strict-aliasing -std=gnu99 + -fno-strict-aliasing -std=gnu99 $(CODE_COVERAGE_CFLAGS) AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1 \ -DTEXT_DOMAIN=\"zfs-linux-user\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" + -DSYSCONFDIR=\"$(sysconfdir)\" $(CODE_COVERAGE_CPPFLAGS) pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/libzfs dist_pkgdata_SCRIPTS = \ cleanup.ksh \ diff --git a/tests/zfs-tests/tests/functional/link_count/Makefile.in b/tests/zfs-tests/tests/functional/link_count/Makefile.in index 2ce3bb8f..c3f4865d 100644 --- a/tests/zfs-tests/tests/functional/link_count/Makefile.in +++ b/tests/zfs-tests/tests/functional/link_count/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/migration/Makefile.am b/tests/zfs-tests/tests/functional/migration/Makefile.am index 53fb30bc..9c4f2441 100644 --- a/tests/zfs-tests/tests/functional/migration/Makefile.am +++ b/tests/zfs-tests/tests/functional/migration/Makefile.am @@ -1,7 +1,5 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/migration dist_pkgdata_SCRIPTS = \ - migration.cfg \ - migration.kshlib \ setup.ksh \ cleanup.ksh \ migration_001_pos.ksh \ @@ -16,3 +14,7 @@ dist_pkgdata_SCRIPTS = \ migration_010_pos.ksh \ migration_011_pos.ksh \ migration_012_pos.ksh + +dist_pkgdata_DATA = \ + migration.cfg \ + migration.kshlib diff --git a/tests/zfs-tests/tests/functional/migration/Makefile.in b/tests/zfs-tests/tests/functional/migration/Makefile.in index 3bd22a2a..20bca91f 100644 --- a/tests/zfs-tests/tests/functional/migration/Makefile.in +++ b/tests/zfs-tests/tests/functional/migration/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/migration -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/migration ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,8 +407,6 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - migration.cfg \ - migration.kshlib \ setup.ksh \ cleanup.ksh \ migration_001_pos.ksh \ @@ -405,6 +422,10 @@ dist_pkgdata_SCRIPTS = \ migration_011_pos.ksh \ migration_012_pos.ksh +dist_pkgdata_DATA = \ + migration.cfg \ + migration.kshlib + all: all-am .SUFFIXES: @@ -478,6 +499,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -517,9 +558,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -567,7 +608,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -611,21 +652,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/migration/migration_001_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_001_pos.ksh index 4d5fbb9f..875d2f7c 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_001_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_001_pos.ksh @@ -60,7 +60,7 @@ prepare $DNAME "tar cf $TESTDIR/tar$$.tar $BNAME" (( $? != 0 )) && log_fail "Unable to create src archive" migrate $TESTDIR $SUMA $SUMB "tar xf $TESTDIR/tar$$.tar" -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "ZFS fs to ZFS fs" -log_pass "Successully migrated test file from ZFS fs to ZFS fs". +log_pass "Successfully migrated test file from ZFS fs to ZFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_002_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_002_pos.ksh index e0655248..6b97e2a4 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_002_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_002_pos.ksh @@ -60,7 +60,7 @@ prepare $DNAME "tar cf $TESTDIR/tar$$.tar $BNAME" (( $? != 0 )) && log_fail "Unable to create src archive" migrate $NONZFS_TESTDIR $SUMA $SUMB "tar xf $TESTDIR/tar$$.tar" -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "ZFS fs to UFS fs" -log_pass "Successully migrated test file from ZFS fs to UFS fs". +log_pass "Successfully migrated test file from ZFS fs to UFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_003_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_003_pos.ksh index 904a2b1a..dd0baeaa 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_003_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_003_pos.ksh @@ -60,7 +60,7 @@ prepare $DNAME "tar cf $NONZFS_TESTDIR/tar$$.tar $BNAME" (( $? != 0 )) && log_fail "Unable to create src archive" migrate $TESTDIR $SUMA $SUMB "tar xvf $NONZFS_TESTDIR/tar$$.tar" -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "UFS fs to ZFS fs" -log_pass "Successully migrated test file from UFS fs to ZFS fs". +log_pass "Successfully migrated test file from UFS fs to ZFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_004_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_004_pos.ksh index 6d33dd5b..00a6cc17 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_004_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_004_pos.ksh @@ -67,7 +67,7 @@ cd $cwd (( $? != 0 )) && log_untested "Could not change directory to $cwd" migrate_cpio $TESTDIR "$TESTDIR/cpio$$.cpio" $SUMA $SUMB -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "ZFS fs to ZFS fs" -log_pass "Successully migrated test file from ZFS fs to ZFS fs". +log_pass "Successfully migrated test file from ZFS fs to ZFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_005_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_005_pos.ksh index a41b19b5..4386596f 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_005_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_005_pos.ksh @@ -67,7 +67,7 @@ cd $cwd (( $? != 0 )) && log_untested "Could not change directory to $cwd" migrate_cpio $NONZFS_TESTDIR "$TESTDIR/cpio$$.cpio" $SUMA $SUMB -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "ZFS fs to UFS fs" -log_pass "Successully migrated test file from ZFS fs to UFS fs". +log_pass "Successfully migrated test file from ZFS fs to UFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_006_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_006_pos.ksh index 5b444421..9b5c9166 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_006_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_006_pos.ksh @@ -67,7 +67,7 @@ cd $cwd (( $? != 0 )) && log_untested "Could not change directory to $cwd" migrate_cpio $TESTDIR "$NONZFS_TESTDIR/cpio$$.cpio" $SUMA $SUMB -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "ZFS fs to ZFS fs" -log_pass "Successully migrated test file from UFS fs to ZFS fs". +log_pass "Successfully migrated test file from UFS fs to ZFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_007_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_007_pos.ksh index c3197052..0d136550 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_007_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_007_pos.ksh @@ -60,7 +60,7 @@ prepare $DNAME "dd if=$BNAME obs=128k of=$TESTDIR/dd$$.dd" (( $? != 0 )) && log_fail "Unable to create src archive" migrate $TESTDIR $SUMA $SUMB "dd if=$TESTDIR/dd$$.dd obs=128k of=$BNAME" -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "ZFS fs to ZFS fs" -log_pass "Successully migrated test file from ZFS fs to ZFS fs". +log_pass "Successfully migrated test file from ZFS fs to ZFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_008_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_008_pos.ksh index 2e51eef3..f62b1f33 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_008_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_008_pos.ksh @@ -60,7 +60,7 @@ prepare $DNAME "dd if=$BNAME obs=128k of=$TESTDIR/dd$$.dd" (( $? != 0 )) && log_fail "Unable to create src archive" migrate $NONZFS_TESTDIR $SUMA $SUMB "dd if=$TESTDIR/dd$$.dd obs=128k of=$BNAME" -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "ZFS fs to ZFS fs" -log_pass "Successully migrated test file from ZFS fs to UFS fs". +log_pass "Successfully migrated test file from ZFS fs to UFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_009_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_009_pos.ksh index 7749494e..907be39e 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_009_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_009_pos.ksh @@ -60,7 +60,7 @@ prepare $DNAME "dd if=$BNAME obs=128k of=$NONZFS_TESTDIR/dd$$.dd" (( $? != 0 )) && log_fail "Unable to create src archive" migrate $TESTDIR $SUMA $SUMB "dd if=$NONZFS_TESTDIR/dd$$.dd obs=128k of=$BNAME" -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "ZFS fs to ZFS fs" -log_pass "Successully migrated test file from UFS fs to ZFS fs". +log_pass "Successfully migrated test file from UFS fs to ZFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_010_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_010_pos.ksh index a11ab72d..e80dd67c 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_010_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_010_pos.ksh @@ -60,7 +60,7 @@ prepare $DNAME "cp $BNAME $TESTDIR/cp$$.cp" (( $? != 0 )) && log_fail "Unable to create src archive" migrate $TESTDIR $SUMA $SUMB "cp $TESTDIR/cp$$.cp $BNAME" -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "ZFS fs to ZFS fs" -log_pass "Successully migrated test file from ZFS fs to ZFS fs". +log_pass "Successfully migrated test file from ZFS fs to ZFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_011_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_011_pos.ksh index 17e1c78f..2d7ecb45 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_011_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_011_pos.ksh @@ -60,7 +60,7 @@ prepare $DNAME "cp $BNAME $TESTDIR/cp$$.cp" (( $? != 0 )) && log_fail "Unable to create src archive" migrate $NONZFS_TESTDIR $SUMA $SUMB "cp $TESTDIR/cp$$.cp $BNAME" -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "ZFS fs to UFS fs" -log_pass "Successully migrated test file from ZFS fs to UFS fs". +log_pass "Successfully migrated test file from ZFS fs to UFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_012_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_012_pos.ksh index 823dabea..fd9c4549 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_012_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_012_pos.ksh @@ -60,7 +60,7 @@ prepare $DNAME "cp $BNAME $NONZFS_TESTDIR/cp$$.cp" (( $? != 0 )) && log_fail "Unable to create src archive" migrate $TESTDIR $SUMA $SUMB "cp $NONZFS_TESTDIR/cp$$.cp $BNAME" -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "UFS fs to ZFS fs" -log_pass "Successully migrated test file from UFS fs to ZFS fs". +log_pass "Successfully migrated test file from UFS fs to ZFS fs". diff --git a/tests/zfs-tests/tests/functional/mmap/Makefile.am b/tests/zfs-tests/tests/functional/mmap/Makefile.am index cb444ec3..2adc398b 100644 --- a/tests/zfs-tests/tests/functional/mmap/Makefile.am +++ b/tests/zfs-tests/tests/functional/mmap/Makefile.am @@ -2,6 +2,9 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/mmap dist_pkgdata_SCRIPTS = \ setup.ksh \ cleanup.ksh \ - mmap.cfg \ mmap_read_001_pos.ksh \ - mmap_write_001_pos.ksh + mmap_write_001_pos.ksh \ + mmap_libaio_001_pos.ksh + +dist_pkgdata_DATA = \ + mmap.cfg diff --git a/tests/zfs-tests/tests/functional/mmap/Makefile.in b/tests/zfs-tests/tests/functional/mmap/Makefile.in index fef20b88..c8240290 100644 --- a/tests/zfs-tests/tests/functional/mmap/Makefile.in +++ b/tests/zfs-tests/tests/functional/mmap/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/mmap -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/mmap ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -390,9 +409,12 @@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ setup.ksh \ cleanup.ksh \ - mmap.cfg \ mmap_read_001_pos.ksh \ - mmap_write_001_pos.ksh + mmap_write_001_pos.ksh \ + mmap_libaio_001_pos.ksh + +dist_pkgdata_DATA = \ + mmap.cfg all: all-am @@ -467,6 +489,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -506,9 +548,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -556,7 +598,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -600,21 +642,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/mmap/mmap_libaio_001_pos.ksh b/tests/zfs-tests/tests/functional/mmap/mmap_libaio_001_pos.ksh new file mode 100755 index 00000000..36a7e76f --- /dev/null +++ b/tests/zfs-tests/tests/functional/mmap/mmap_libaio_001_pos.ksh @@ -0,0 +1,61 @@ +#!/bin/ksh -p +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2018 Canonical. All rights reserved. +# + +. $STF_SUITE/include/libtest.shlib +. $STF_SUITE/tests/functional/mmap/mmap.cfg + +# +# DESCRIPTION: +# Verify libaio functions correctly with mmap()'d files. +# +# STRATEGY: +# 1. Call mmap_libaio binary +# 2. Verify the file exists and is the expected size +# 3. Verify the filesystem is intact and not hung in any way +# + +verify_runnable "global" + +log_assert "verify mmap'd pages work with libaio" + +# mmap_libaio is built when the libaio-devel package is installed. +if ! which mmap_libaio; then + log_unsupported "This test requires mmap_libaio." +fi + +log_must chmod 777 $TESTDIR + +for size in 512 4096 8192; do + log_mustnot stat $TESTDIR/test-libaio-file + log_must mmap_libaio $TESTDIR/test-libaio-file $size + log_must verify_eq $(stat --format=%s $TESTDIR/test-libaio-file) $size + log_must rm $TESTDIR/test-libaio-file +done + +typeset dir=$(get_device_dir $DISKS) +verify_filesys "$TESTPOOL" "$TESTPOOL/$TESTFS" "$dir" + +log_pass "mmap'd pages work with libaio" diff --git a/tests/zfs-tests/tests/functional/mmp/Makefile.am b/tests/zfs-tests/tests/functional/mmp/Makefile.am index f81f07fe..ecf16f80 100644 --- a/tests/zfs-tests/tests/functional/mmp/Makefile.am +++ b/tests/zfs-tests/tests/functional/mmp/Makefile.am @@ -1,5 +1,6 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/mmp dist_pkgdata_SCRIPTS = \ + multihost_history.ksh \ mmp_on_thread.ksh \ mmp_on_uberblocks.ksh \ mmp_on_off.ksh \ @@ -10,6 +11,8 @@ dist_pkgdata_SCRIPTS = \ mmp_write_uberblocks.ksh \ mmp_reset_interval.ksh \ setup.ksh \ - cleanup.ksh \ + cleanup.ksh + +dist_pkgdata_DATA = \ mmp.kshlib \ mmp.cfg diff --git a/tests/zfs-tests/tests/functional/mmp/Makefile.in b/tests/zfs-tests/tests/functional/mmp/Makefile.in index 3c40c423..caf5997f 100644 --- a/tests/zfs-tests/tests/functional/mmp/Makefile.in +++ b/tests/zfs-tests/tests/functional/mmp/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/mmp -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/mmp ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,6 +407,7 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ + multihost_history.ksh \ mmp_on_thread.ksh \ mmp_on_uberblocks.ksh \ mmp_on_off.ksh \ @@ -398,7 +418,9 @@ dist_pkgdata_SCRIPTS = \ mmp_write_uberblocks.ksh \ mmp_reset_interval.ksh \ setup.ksh \ - cleanup.ksh \ + cleanup.ksh + +dist_pkgdata_DATA = \ mmp.kshlib \ mmp.cfg @@ -475,6 +497,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -514,9 +556,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -564,7 +606,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -608,21 +650,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/mmp/mmp.cfg b/tests/zfs-tests/tests/functional/mmp/mmp.cfg index 36f99544..52680c27 100644 --- a/tests/zfs-tests/tests/functional/mmp/mmp.cfg +++ b/tests/zfs-tests/tests/functional/mmp/mmp.cfg @@ -38,5 +38,3 @@ export MMP_HISTORY_OFF=0 export MMP_INTERVAL_HOUR=$((60*60*1000)) export MMP_INTERVAL_DEFAULT=1000 export MMP_INTERVAL_MIN=100 - -export ZPOOL_IMPORT_DURATION=9 diff --git a/tests/zfs-tests/tests/functional/mmp/mmp.kshlib b/tests/zfs-tests/tests/functional/mmp/mmp.kshlib index 4c46ae7a..e74f04a5 100644 --- a/tests/zfs-tests/tests/functional/mmp/mmp.kshlib +++ b/tests/zfs-tests/tests/functional/mmp/mmp.kshlib @@ -93,11 +93,10 @@ function mmp_clear_hostid rm -f $HOSTID_FILE } -function mmp_pool_create # pool dir +function mmp_pool_create_simple # pool dir { typeset pool=${1:-$MMP_POOL} typeset dir=${2:-$MMP_DIR} - typeset opts="-VVVVV -T120 -M -k0 -f $dir -E -p $pool" log_must mkdir -p $dir log_must rm -f $dir/* @@ -108,6 +107,16 @@ function mmp_pool_create # pool dir log_must zpool create -f -o cachefile=$MMP_CACHE $pool \ mirror $dir/vdev1 $dir/vdev2 log_must zpool set multihost=on $pool +} + +function mmp_pool_create # pool dir +{ + typeset pool=${1:-$MMP_POOL} + typeset dir=${2:-$MMP_DIR} + typeset opts="-VVVVV -T120 -M -k0 -f $dir -E -p $pool" + + mmp_pool_create_simple $pool $dir + log_must mv $MMP_CACHE ${MMP_CACHE}.stale log_must zpool export $pool log_must mmp_clear_hostid @@ -154,17 +163,32 @@ function mmp_pool_set_hostid # pool hostid return 0 } +# Return the number of seconds the activity check portion of the import process +# will take. Does not include the time to find devices and assemble the +# preliminary pool configuration passed into the kernel. +function seconds_mmp_waits_for_activity +{ + typeset import_intervals=$(get_tunable zfs_multihost_import_intervals) + typeset interval=$(get_tunable zfs_multihost_interval) + typeset seconds=$((interval*import_intervals/1000)) + + echo $seconds +} + function import_no_activity_check # pool opts { typeset pool=$1 typeset opts=$2 + typeset max_duration=$(seconds_mmp_waits_for_activity) + SECONDS=0 zpool import $opts $pool typeset rc=$? - if [[ $SECONDS -gt $ZPOOL_IMPORT_DURATION ]]; then - log_fail "unexpected activity check (${SECONDS}s)" + if [[ $SECONDS -gt $max_duration ]]; then + log_fail "unexpected activity check (${SECONDS}s gt \ +$max_duration)" fi return $rc @@ -175,12 +199,15 @@ function import_activity_check # pool opts typeset pool=$1 typeset opts=$2 + typeset min_duration=$(seconds_mmp_waits_for_activity) + SECONDS=0 zpool import $opts $pool typeset rc=$? - if [[ $SECONDS -le $ZPOOL_IMPORT_DURATION ]]; then - log_fail "expected activity check (${SECONDS}s)" + if [[ $SECONDS -le $min_duration ]]; then + log_fail "expected activity check (${SECONDS}s le \ +$min_duration)" fi return $rc @@ -192,12 +219,22 @@ function clear_mmp_history log_must set_tunable64 zfs_multihost_history $MMP_HISTORY } -function count_uberblocks # pool duration +function count_skipped_mmp_writes # pool duration +{ + typeset pool=$1 + typeset -i duration=$2 + typeset hist_path="/proc/spl/kstat/zfs/$pool/multihost" + + sleep $duration + awk 'BEGIN {count=0}; $NF == "-" {count++}; END {print count};' "$hist_path" +} + +function count_mmp_writes # pool duration { typeset pool=$1 typeset -i duration=$2 typeset hist_path="/proc/spl/kstat/zfs/$pool/multihost" - log_must sleep $duration - echo $(cat "$hist_path" | sed '1,2d' | wc -l) + sleep $duration + awk 'BEGIN {count=0}; $NF != "-" {count++}; END {print count};' "$hist_path" } diff --git a/tests/zfs-tests/tests/functional/mmp/mmp_active_import.ksh b/tests/zfs-tests/tests/functional/mmp/mmp_active_import.ksh index 035264fe..e39c5ab3 100755 --- a/tests/zfs-tests/tests/functional/mmp/mmp_active_import.ksh +++ b/tests/zfs-tests/tests/functional/mmp/mmp_active_import.ksh @@ -103,6 +103,9 @@ MMP_IMPORTED_MSG="pool was previously in use from another system." log_must try_pool_import $MMP_POOL "-d $MMP_DIR" "$MMP_IMPORTED_MSG" # 7. Verify 'zpool import -f $MMP_POOL' can now import the pool. +# Default interval results in minimum activity test 10s which +# makes detection of the activity test reliable. +log_must set_tunable64 zfs_multihost_interval $MMP_INTERVAL_DEFAULT log_must import_activity_check $MMP_POOL "-f -d $MMP_DIR" # 8 Verify pool may be exported/imported without -f argument. diff --git a/tests/zfs-tests/tests/functional/mmp/mmp_on_uberblocks.ksh b/tests/zfs-tests/tests/functional/mmp/mmp_on_uberblocks.ksh index df4ab888..0cb38f88 100755 --- a/tests/zfs-tests/tests/functional/mmp/mmp_on_uberblocks.ksh +++ b/tests/zfs-tests/tests/functional/mmp/mmp_on_uberblocks.ksh @@ -58,7 +58,7 @@ log_must mmp_set_hostid $HOSTID1 default_setup_noexit "$DISKS" log_must zpool set multihost=on $TESTPOOL clear_mmp_history -UBER_CHANGES=$(count_uberblocks $TESTPOOL 10) +UBER_CHANGES=$(count_mmp_writes $TESTPOOL 10) log_note "Uberblock changed $UBER_CHANGES times" diff --git a/tests/zfs-tests/tests/functional/mmp/mmp_reset_interval.ksh b/tests/zfs-tests/tests/functional/mmp/mmp_reset_interval.ksh index e98b1621..3c8f00cd 100755 --- a/tests/zfs-tests/tests/functional/mmp/mmp_reset_interval.ksh +++ b/tests/zfs-tests/tests/functional/mmp/mmp_reset_interval.ksh @@ -55,7 +55,7 @@ log_must zpool set multihost=on $TESTPOOL clear_mmp_history log_must set_tunable64 zfs_multihost_interval $MMP_INTERVAL_DEFAULT -uber_count=$(count_uberblocks $TESTPOOL 1) +uber_count=$(count_mmp_writes $TESTPOOL 1) if [ $uber_count -eq 0 ]; then log_fail "mmp writes did not start when zfs_multihost_interval reduced" diff --git a/tests/zfs-tests/tests/functional/mmp/mmp_write_uberblocks.ksh b/tests/zfs-tests/tests/functional/mmp/mmp_write_uberblocks.ksh index 71b5c391..e287f419 100755 --- a/tests/zfs-tests/tests/functional/mmp/mmp_write_uberblocks.ksh +++ b/tests/zfs-tests/tests/functional/mmp/mmp_write_uberblocks.ksh @@ -49,7 +49,7 @@ default_mirror_setup_noexit $DISKS log_must zpool set multihost=on $TESTPOOL log_must zinject -d ${DISK[0]} -e io -T write -f 50 $TESTPOOL -L uber clear_mmp_history -uber_count=$(count_uberblocks $TESTPOOL 3) +uber_count=$(count_mmp_writes $TESTPOOL 3) if [ $uber_count -eq 0 ]; then log_fail "mmp writes did not occur when uberblock IO errors injected" diff --git a/tests/zfs-tests/tests/functional/mmp/multihost_history.ksh b/tests/zfs-tests/tests/functional/mmp/multihost_history.ksh new file mode 100755 index 00000000..e831475d --- /dev/null +++ b/tests/zfs-tests/tests/functional/mmp/multihost_history.ksh @@ -0,0 +1,67 @@ +#!/bin/ksh -p +# +# CDDL HEADER START +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# +# CDDL HEADER END +# + +# +# Copyright (c) 2017 by Lawrence Livermore National Security, LLC. +# + +# DESCRIPTION: +# zfs_multihost_history should report both writes issued and gaps +# +# STRATEGY: +# 1. Create a 2-vdev pool with mmp enabled +# 2. Delay writes by 2*MMP_INTERVAL_DEFAULT +# 3. Check multihost_history for both issued writes, and for gaps where +# no write could be issued because all vdevs are busy +# +# During the first MMP_INTERVAL period 2 MMP writes will be issued - one to +# each vdev. At the third scheduled attempt to write, at time t0+MMP_INTERVAL, +# both vdevs will still have outstanding writes, so a skipped write entry will +# be recorded in the multihost_history. + + +. $STF_SUITE/include/libtest.shlib +. $STF_SUITE/tests/functional/mmp/mmp.cfg +. $STF_SUITE/tests/functional/mmp/mmp.kshlib + +verify_runnable "both" + +function cleanup +{ + log_must zinject -c all + mmp_pool_destroy $MMP_POOL $MMP_DIR + log_must mmp_clear_hostid +} + +log_assert "zfs_multihost_history records writes and skipped writes" +log_onexit cleanup + +mmp_pool_create_simple $MMP_POOL $MMP_DIR +log_must zinject -d $MMP_DIR/vdev1 -D$((2*MMP_INTERVAL_DEFAULT)):10 $MMP_POOL +log_must zinject -d $MMP_DIR/vdev2 -D$((2*MMP_INTERVAL_DEFAULT)):10 $MMP_POOL + +mmp_writes=$(count_mmp_writes $MMP_POOL $((MMP_INTERVAL_DEFAULT/1000))) +mmp_skips=$(count_skipped_mmp_writes $MMP_POOL $((MMP_INTERVAL_DEFAULT/1000))) + +if [ $mmp_writes -lt 1 ]; then + log_fail "mmp writes entries missing when delays injected" +fi + +if [ $mmp_skips -lt 1 ]; then + log_fail "mmp skipped write entries missing when delays injected" +fi + +log_pass "zfs_multihost_history records writes and skipped writes" diff --git a/tests/zfs-tests/tests/functional/mount/Makefile.in b/tests/zfs-tests/tests/functional/mount/Makefile.in index 9380262d..4cf05883 100644 --- a/tests/zfs-tests/tests/functional/mount/Makefile.in +++ b/tests/zfs-tests/tests/functional/mount/Makefile.in @@ -41,6 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +87,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +125,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -201,6 +207,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +224,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +240,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +255,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +277,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ diff --git a/tests/zfs-tests/tests/functional/mv_files/Makefile.am b/tests/zfs-tests/tests/functional/mv_files/Makefile.am index 574af156..cec02140 100644 --- a/tests/zfs-tests/tests/functional/mv_files/Makefile.am +++ b/tests/zfs-tests/tests/functional/mv_files/Makefile.am @@ -1,8 +1,11 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/mv_files dist_pkgdata_SCRIPTS = \ - mv_files.cfg \ - mv_files_common.kshlib \ setup.ksh \ cleanup.ksh \ mv_files_001_pos.ksh \ - mv_files_002_pos.ksh + mv_files_002_pos.ksh \ + random_creation.ksh + +dist_pkgdata_DATA = \ + mv_files.cfg \ + mv_files_common.kshlib diff --git a/tests/zfs-tests/tests/functional/mv_files/Makefile.in b/tests/zfs-tests/tests/functional/mv_files/Makefile.in index a18ad765..6fd0b78a 100644 --- a/tests/zfs-tests/tests/functional/mv_files/Makefile.in +++ b/tests/zfs-tests/tests/functional/mv_files/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +36,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = tests/zfs-tests/tests/functional/mv_files -DIST_COMMON = $(dist_pkgdata_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(dist_pkgdata_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/always-no-bool-compare.m4 \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/ax_code_coverage.m4 \ + $(top_srcdir)/config/kernel-acl-refcount.m4 \ $(top_srcdir)/config/kernel-acl.m4 \ $(top_srcdir)/config/kernel-aio-fsync.m4 \ $(top_srcdir)/config/kernel-automount.m4 \ @@ -56,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-bio-rw-discard.m4 \ $(top_srcdir)/config/kernel-bio_set_dev.m4 \ $(top_srcdir)/config/kernel-blk-queue-bdi.m4 \ + $(top_srcdir)/config/kernel-blk-queue-flags.m4 \ $(top_srcdir)/config/kernel-blk-queue-flush.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \ $(top_srcdir)/config/kernel-blk-queue-max-segments.m4 \ @@ -84,14 +88,18 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-follow-down-one.m4 \ $(top_srcdir)/config/kernel-fpu.m4 \ + $(top_srcdir)/config/kernel-fst-mount.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-generic_io_acct.m4 \ $(top_srcdir)/config/kernel-generic_readlink.m4 \ + $(top_srcdir)/config/kernel-get-disk-and-module.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-get-link.m4 \ + $(top_srcdir)/config/kernel-global_page_state.m4 \ $(top_srcdir)/config/kernel-inode-getattr.m4 \ $(top_srcdir)/config/kernel-inode-set-flags.m4 \ + $(top_srcdir)/config/kernel-inode-set-iversion.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-is_owner_or_cap.m4 \ @@ -103,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-mk-request-fn.m4 \ $(top_srcdir)/config/kernel-mkdir-umode-t.m4 \ $(top_srcdir)/config/kernel-mod-param.m4 \ - $(top_srcdir)/config/kernel-mount-nodev.m4 \ $(top_srcdir)/config/kernel-objtool.m4 \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-put-link.m4 \ @@ -119,9 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/kernel-tmpfile.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ + $(top_srcdir)/config/kernel-userns-capabilities.m4 \ $(top_srcdir)/config/kernel-vfs-iterate.m4 \ $(top_srcdir)/config/kernel-vfs-rw-iterate.m4 \ - $(top_srcdir)/config/kernel-vm_node_stat.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 $(top_srcdir)/config/libtool.m4 \ $(top_srcdir)/config/ltoptions.m4 \ @@ -132,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libattr.m4 \ + $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ $(top_srcdir)/config/user-libudev.m4 \ @@ -173,7 +180,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(dist_pkgdata_SCRIPTS) AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -183,6 +190,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/mv_files ACLOCAL = @ACLOCAL@ @@ -201,6 +209,12 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -212,6 +226,7 @@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ DEFINE_INITRAMFS = @DEFINE_INITRAMFS@ +DEFINE_SYSTEMD = @DEFINE_SYSTEMD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DPKG = @DPKG@ @@ -227,6 +242,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FRAME_LARGER_THAN = @FRAME_LARGER_THAN@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_ALIEN = @HAVE_ALIEN@ HAVE_DPKG = @HAVE_DPKG@ @@ -240,9 +257,10 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBATTR = @LIBATTR@ +LIBAIO = @LIBAIO@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -261,6 +279,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MULTIARCH_LIBDIR = @MULTIARCH_LIBDIR@ NM = @NM@ NMEDIT = @NMEDIT@ NO_BOOL_COMPARE = @NO_BOOL_COMPARE@ @@ -388,12 +407,15 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ dist_pkgdata_SCRIPTS = \ - mv_files.cfg \ - mv_files_common.kshlib \ setup.ksh \ cleanup.ksh \ mv_files_001_pos.ksh \ - mv_files_002_pos.ksh + mv_files_002_pos.ksh \ + random_creation.ksh + +dist_pkgdata_DATA = \ + mv_files.cfg \ + mv_files_common.kshlib all: all-am @@ -468,6 +490,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -507,9 +549,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -557,7 +599,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataSCRIPTS +install-data-am: install-dist_pkgdataDATA install-dist_pkgdataSCRIPTS install-dvi: install-dvi-am @@ -601,21 +643,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_pkgdataSCRIPTS +uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_pkgdataSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_pkgdataSCRIPTS + install-data install-data-am install-dist_pkgdataDATA \ + install-dist_pkgdataSCRIPTS install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_pkgdataDATA uninstall-dist_pkgdataSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/zfs-tests/tests/functional/mv_files/mv_files.cfg b/tests/zfs-tests/tests/functional/mv_files/mv_files.cfg index ac81bd36..ed28ff1e 100644 --- a/tests/zfs-tests/tests/functional/mv_files/mv_files.cfg +++ b/tests/zfs-tests/tests/functional/mv_files/mv_files.cfg @@ -44,3 +44,7 @@ export NEWDIR_ACROSS_FS=$TESTDIR_TGT/newdir export MVNUMFILES=2000 # export MVNUMINCR=1000 # export GANGPIDS=50 # + +# controls the "random_creation" test +export RC_PASS1=65536 # +export RC_PASS2=8192 # automount() exists */ #undef HAVE_AUTOMOUNT @@ -108,6 +111,12 @@ /* blk queue backing_dev_info is dynamic */ #undef HAVE_BLK_QUEUE_BDI_DYNAMIC +/* blk_queue_flag_clear() exists */ +#undef HAVE_BLK_QUEUE_FLAG_CLEAR + +/* blk_queue_flag_set() exists */ +#undef HAVE_BLK_QUEUE_FLAG_SET + /* blk_queue_flush() is available */ #undef HAVE_BLK_QUEUE_FLUSH @@ -159,6 +168,9 @@ /* iops->create() passes nameidata */ #undef HAVE_CREATE_NAMEIDATA +/* cred_t->user_ns exists */ +#undef HAVE_CRED_USER_NS + /* current->bio_list exists */ #undef HAVE_CURRENT_BIO_LIST @@ -234,6 +246,9 @@ /* sops->free_cached_objects() exists */ #undef HAVE_FREE_CACHED_OBJECTS +/* fst->mount() exists */ +#undef HAVE_FST_MOUNT + /* fops->fsync() with range */ #undef HAVE_FSYNC_RANGE @@ -261,6 +276,9 @@ /* iops->get_acl() exists */ #undef HAVE_GET_ACL +/* get_disk_and_module() is available */ +#undef HAVE_GET_DISK_AND_MODULE + /* blk_disk_ro() is available */ #undef HAVE_GET_DISK_RO @@ -282,6 +300,9 @@ /* inode_set_flags() exists */ #undef HAVE_INODE_SET_FLAGS +/* inode_set_iversion() exists */ +#undef HAVE_INODE_SET_IVERSION + /* iops->truncate_range() exists */ #undef HAVE_INODE_TRUNCATE_RANGE @@ -300,14 +321,17 @@ /* kernel does stack verification */ #undef HAVE_KERNEL_OBJTOOL +/* kuid_has_mapping/kgid_has_mapping exist */ +#undef HAVE_KUID_HAS_MAPPING + /* i_(uid|gid)_(read|write) exist */ #undef HAVE_KUID_HELPERS /* kernel has large stacks */ #undef HAVE_LARGE_STACKS -/* Define if you have libattr */ -#undef HAVE_LIBATTR +/* Define if you have libaio */ +#undef HAVE_LIBAIO /* Define if you have libblkid */ #undef HAVE_LIBBLKID @@ -351,15 +375,15 @@ /* Define to 1 if you have the `mlockall' function. */ #undef HAVE_MLOCKALL -/* mount_nodev() is available */ -#undef HAVE_MOUNT_NODEV - /* new_sync_read()/new_sync_write() are available */ #undef HAVE_NEW_SYNC_READ /* sops->nr_cached_objects() exists */ #undef HAVE_NR_CACHED_OBJECTS +/* ns_capable exists */ +#undef HAVE_NS_CAPABLE + /* open_bdev_exclusive() is available */ #undef HAVE_OPEN_BDEV_EXCLUSIVE @@ -595,9 +619,36 @@ /* zfs debugging enabled */ #undef ZFS_DEBUG -/* using global_node_page_state() */ +/* enum node_stat_item contains NR_FILE_PAGES */ +#undef ZFS_ENUM_NODE_STAT_ITEM_NR_FILE_PAGES + +/* enum node_stat_item contains NR_INACTIVE_ANON */ +#undef ZFS_ENUM_NODE_STAT_ITEM_NR_INACTIVE_ANON + +/* enum node_stat_item contains NR_INACTIVE_FILE */ +#undef ZFS_ENUM_NODE_STAT_ITEM_NR_INACTIVE_FILE + +/* enum node_stat_item contains NR_SLAB_RECLAIMABLE */ +#undef ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE + +/* enum zone_stat_item contains NR_FILE_PAGES */ +#undef ZFS_ENUM_ZONE_STAT_ITEM_NR_FILE_PAGES + +/* enum zone_stat_item contains NR_INACTIVE_ANON */ +#undef ZFS_ENUM_ZONE_STAT_ITEM_NR_INACTIVE_ANON + +/* enum zone_stat_item contains NR_INACTIVE_FILE */ +#undef ZFS_ENUM_ZONE_STAT_ITEM_NR_INACTIVE_FILE + +/* enum zone_stat_item contains NR_SLAB_RECLAIMABLE */ +#undef ZFS_ENUM_ZONE_STAT_ITEM_NR_SLAB_RECLAIMABLE + +/* global_node_page_state() exists */ #undef ZFS_GLOBAL_NODE_PAGE_STATE +/* global_zone_page_state() exists */ +#undef ZFS_GLOBAL_ZONE_PAGE_STATE + /* Define to 1 if GPL-only symbols can be used */ #undef ZFS_IS_GPL_COMPATIBLE -- 2.39.2