83 changes: 65 additions & 18 deletions module/zfs/spa.c
2 changes: 1 addition & 1 deletion module/zfs/spa_config.c
3 changes: 1 addition & 2 deletions module/zfs/spa_errlog.c
7 changes: 6 additions & 1 deletion module/zfs/spa_history.c
12 changes: 11 additions & 1 deletion module/zfs/spa_misc.c
9 changes: 5 additions & 4 deletions module/zfs/vdev.c
9 changes: 5 additions & 4 deletions module/zfs/vdev_raidz.c
4 changes: 2 additions & 2 deletions module/zfs/zfeature.c
2 changes: 1 addition & 1 deletion module/zfs/zfs_acl.c
54 changes: 25 additions & 29 deletions module/zfs/zfs_fm.c
268 changes: 235 additions & 33 deletions module/zfs/zfs_ioctl.c
12 changes: 7 additions & 5 deletions module/zfs/zfs_vfsops.c
66 changes: 45 additions & 21 deletions module/zfs/zil.c
355 changes: 330 additions & 25 deletions module/zfs/zio.c
65 changes: 56 additions & 9 deletions module/zfs/zio_checksum.c
2,037 changes: 2,037 additions & 0 deletions module/zfs/zio_crypt.c
20 changes: 10 additions & 10 deletions module/zfs/zvol.c
6 changes: 3 additions & 3 deletions module/zpios/pios.c
1 change: 1 addition & 0 deletions rpm/generic/zfs.spec.in
42 changes: 31 additions & 11 deletions tests/runfiles/linux.run
3 changes: 3 additions & 0 deletions tests/zfs-tests/tests/functional/cli_root/Makefile.am
32 changes: 32 additions & 0 deletions tests/zfs-tests/tests/functional/cli_root/zfs_change-key/setup.ksh
12 changes: 12 additions & 0 deletions tests/zfs-tests/tests/functional/cli_root/zfs_load-key/Makefile.am
30 changes: 30 additions & 0 deletions tests/zfs-tests/tests/functional/cli_root/zfs_load-key/cleanup.ksh
32 changes: 32 additions & 0 deletions tests/zfs-tests/tests/functional/cli_root/zfs_load-key/setup.ksh
32 changes: 32 additions & 0 deletions tests/zfs-tests/tests/functional/cli_root/zfs_unload-key/setup.ksh
1 change: 1 addition & 0 deletions tests/zfs-tests/tests/functional/rsend/Makefile.am
2 changes: 1 addition & 1 deletion tests/zfs-tests/tests/functional/rsend/rsend.kshlib