diff options
| author | Robert Mustacchi <rm@joyent.com> | 2017-04-25 22:06:29 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2017-04-25 23:27:23 +0000 |
| commit | 4ee0199ec059ca9417a72125beae8d89fbc5a9df (patch) | |
| tree | 0809e89496231e2ec87c99b9e5da85d6e0eed363 /usr/src/lib/libzfs/common/libzfs_sendrecv.c | |
| parent | a3848ed0a29283946b7129498d914f532442a95f (diff) | |
| download | illumos-gate-4ee0199ec059ca9417a72125beae8d89fbc5a9df.tar.gz | |
backout: 8021 ARC buf data scatter-ization (causes 8100)
Diffstat (limited to 'usr/src/lib/libzfs/common/libzfs_sendrecv.c')
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_sendrecv.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_sendrecv.c b/usr/src/lib/libzfs/common/libzfs_sendrecv.c index 4e89dc053d..2641d53e00 100644 --- a/usr/src/lib/libzfs/common/libzfs_sendrecv.c +++ b/usr/src/lib/libzfs/common/libzfs_sendrecv.c @@ -192,19 +192,19 @@ dump_record(dmu_replay_record_t *drr, void *payload, int payload_len, { ASSERT3U(offsetof(dmu_replay_record_t, drr_u.drr_checksum.drr_checksum), ==, sizeof (dmu_replay_record_t) - sizeof (zio_cksum_t)); - (void) fletcher_4_incremental_native(drr, + fletcher_4_incremental_native(drr, offsetof(dmu_replay_record_t, drr_u.drr_checksum.drr_checksum), zc); if (drr->drr_type != DRR_BEGIN) { ASSERT(ZIO_CHECKSUM_IS_ZERO(&drr->drr_u. drr_checksum.drr_checksum)); drr->drr_u.drr_checksum.drr_checksum = *zc; } - (void) fletcher_4_incremental_native( - &drr->drr_u.drr_checksum.drr_checksum, sizeof (zio_cksum_t), zc); + fletcher_4_incremental_native(&drr->drr_u.drr_checksum.drr_checksum, + sizeof (zio_cksum_t), zc); if (write(outfd, drr, sizeof (*drr)) == -1) return (errno); if (payload_len != 0) { - (void) fletcher_4_incremental_native(payload, payload_len, zc); + fletcher_4_incremental_native(payload, payload_len, zc); if (write(outfd, payload, payload_len) == -1) return (errno); } @@ -2093,9 +2093,9 @@ recv_read(libzfs_handle_t *hdl, int fd, void *buf, int ilen, if (zc) { if (byteswap) - (void) fletcher_4_incremental_byteswap(buf, ilen, zc); + fletcher_4_incremental_byteswap(buf, ilen, zc); else - (void) fletcher_4_incremental_native(buf, ilen, zc); + fletcher_4_incremental_native(buf, ilen, zc); } return (0); } @@ -3649,8 +3649,7 @@ zfs_receive_impl(libzfs_handle_t *hdl, const char *tosnap, * recv_read() above; do it again correctly. */ bzero(&zcksum, sizeof (zio_cksum_t)); - (void) fletcher_4_incremental_byteswap(&drr, - sizeof (drr), &zcksum); + fletcher_4_incremental_byteswap(&drr, sizeof (drr), &zcksum); flags->byteswap = B_TRUE; drr.drr_type = BSWAP_32(drr.drr_type); |