diff options
| author | Patrick Mooney <patrick.f.mooney@gmail.com> | 2015-09-17 14:42:49 +0000 |
|---|---|---|
| committer | Patrick Mooney <patrick.f.mooney@gmail.com> | 2015-09-17 15:15:49 +0000 |
| commit | 634d34a4560c78755739f904248f3adb463c2adf (patch) | |
| tree | 193142bbab669e57a5ee90c12e63b85b1219e331 /usr/src/common/zfs/zfs_fletcher.c | |
| parent | df3b36f3d97df979fb68b68560b333c9714fac70 (diff) | |
| parent | 03bad06fbb261fd4a7151a70dfeff2f5041cce1f (diff) | |
| download | illumos-joyent-634d34a4560c78755739f904248f3adb463c2adf.tar.gz | |
[illumos-gate merge]
commit 03bad06fbb261fd4a7151a70dfeff2f5041cce1f
6171 dsl_prop_unregister() slows down dataset eviction.
commit a725189c0accbf47b39f735d1f32a7b54ae91c6d
5433 at(1) doesn't properly handle being invoked from a path containing spaces
commit caf590b518921f14033a11d17fafa827bb2caa4b
6216 prtdiag could display hardware in slots
commit c7c0ceafd167e558cd8cb8195b8bd63cbc817b27
6085 export libbe installboot function
6086 add install bootblock option for bootadm
commit be32284091554a41d4706e6653adeec1d9127a87
4185 add new cryptographic checksums to ZFS: SHA-512, Skein, Edon-R (fix studio build)
commit 45818ee124adeaaf947698996b4f4c722afc6d1f
4185 add new cryptographic checksums to ZFS: SHA-512, Skein, Edon-R
Conflicts:
usr/src/cmd/prtdiag/i386/smbios.c
usr/src/uts/common/Makefile.rules
usr/src/uts/common/sys/Makefile
Diffstat (limited to 'usr/src/common/zfs/zfs_fletcher.c')
| -rw-r--r-- | usr/src/common/zfs/zfs_fletcher.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/usr/src/common/zfs/zfs_fletcher.c b/usr/src/common/zfs/zfs_fletcher.c index fa43ce6bdb..a58fa14b7c 100644 --- a/usr/src/common/zfs/zfs_fletcher.c +++ b/usr/src/common/zfs/zfs_fletcher.c @@ -22,6 +22,9 @@ * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ +/* + * Copyright 2013 Saso Kiselkov. All rights reserved. + */ /* * Fletcher Checksums @@ -131,8 +134,10 @@ #include <sys/zio.h> #include <sys/spa.h> +/*ARGSUSED*/ void -fletcher_2_native(const void *buf, uint64_t size, zio_cksum_t *zcp) +fletcher_2_native(const void *buf, uint64_t size, + const void *ctx_template, zio_cksum_t *zcp) { const uint64_t *ip = buf; const uint64_t *ipend = ip + (size / sizeof (uint64_t)); @@ -148,8 +153,10 @@ fletcher_2_native(const void *buf, uint64_t size, zio_cksum_t *zcp) ZIO_SET_CHECKSUM(zcp, a0, a1, b0, b1); } +/*ARGSUSED*/ void -fletcher_2_byteswap(const void *buf, uint64_t size, zio_cksum_t *zcp) +fletcher_2_byteswap(const void *buf, uint64_t size, + const void *ctx_template, zio_cksum_t *zcp) { const uint64_t *ip = buf; const uint64_t *ipend = ip + (size / sizeof (uint64_t)); @@ -165,8 +172,10 @@ fletcher_2_byteswap(const void *buf, uint64_t size, zio_cksum_t *zcp) ZIO_SET_CHECKSUM(zcp, a0, a1, b0, b1); } +/*ARGSUSED*/ void -fletcher_4_native(const void *buf, uint64_t size, zio_cksum_t *zcp) +fletcher_4_native(const void *buf, uint64_t size, + const void *ctx_template, zio_cksum_t *zcp) { const uint32_t *ip = buf; const uint32_t *ipend = ip + (size / sizeof (uint32_t)); @@ -182,8 +191,10 @@ fletcher_4_native(const void *buf, uint64_t size, zio_cksum_t *zcp) ZIO_SET_CHECKSUM(zcp, a, b, c, d); } +/*ARGSUSED*/ void -fletcher_4_byteswap(const void *buf, uint64_t size, zio_cksum_t *zcp) +fletcher_4_byteswap(const void *buf, uint64_t size, + const void *ctx_template, zio_cksum_t *zcp) { const uint32_t *ip = buf; const uint32_t *ipend = ip + (size / sizeof (uint32_t)); |