Merge OpenZFS 4185

OpenZFS 4185 - add new cryptographic checksums to ZFS: SHA-512, Skein, Edon-R

Reviewed-by: Chunwei Chen <david.chen@osnexus.com>
Reviewed-by: Tom Caputi <tcaputi@datto.com>
Reviewed-by: David Quigley <david.quigley@intel.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes #4760
This commit is contained in:
Brian Behlendorf
2016-10-04 11:20:38 -07:00
committed by GitHub
79 changed files with 9129 additions and 203 deletions
+19
View File
@@ -19,3 +19,22 @@ s:usr/src/test/zfs-tests/runfiles:tests/runfiles:g
s:usr/src/test/zfs-tests/tests/functional:tests/zfs-tests/tests/functional:g
s:usr/src/test/zfs-tests/tests/perf:tests/zfs-tests/tests/perf:g
s:usr/src/test/test-runner/cmd/run.py:tests/test-runner/cmd/test-runner.py:g
#
# The usr/src/common/zfs/ files go in a couple different dirs.
# usr/src/common/zfs/zfeature_common.c goes in module/zfs
#
s:usr/src/common/zfs/zfeature_common.c:module/zfs/zfeature_common.c:g
# ...but most of the rest of the C files go in module/zcommon
s/usr\/src\/common\/zfs\/\(.*\)\.c/module\/zcommon\/\1.c/g
# crypto framework
s:usr/src/common/crypto:module/icp/algs:g
s:usr/src/uts/common/crypto/io:module/icp/io:g
# Headers
s:usr/src/common/zfs/\(.*\)\.h:include/\1.h:g
# Man pages
s:usr/src/man:man:g