diff options
| author | mm <mm@FreeBSD.org> | 2010-06-12 11:28:46 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2010-06-12 11:28:46 +0000 |
| commit | ba82206079916c66329a3b6b011cc173104972be (patch) | |
| tree | 4951a4778d1d93db41b2059086c1c80a9e256473 /sys/cddl | |
| parent | ddf29dd30c0895aa99718954a81d35dbdf4f99a4 (diff) | |
| download | FreeBSD-src-ba82206079916c66329a3b6b011cc173104972be.zip FreeBSD-src-ba82206079916c66329a3b6b011cc173104972be.tar.gz | |
Fix arc_read_done may try to byteswap undefined data (sparc related)
OpenSolaris onnv-revision: 10839:cf83b553a2ab
Obtained from: OpenSolaris (Bug ID 6836714)
Approved by: pjd, delphij (mentor)
MFC after: 3 days
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c index de24c0b..5137d64 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c @@ -2687,7 +2687,7 @@ arc_read_done(zio_t *zio) /* byteswap if necessary */ callback_list = hdr->b_acb; ASSERT(callback_list != NULL); - if (BP_SHOULD_BYTESWAP(zio->io_bp)) { + if (BP_SHOULD_BYTESWAP(zio->io_bp) && zio->io_error == 0) { arc_byteswap_func_t *func = BP_GET_LEVEL(zio->io_bp) > 0 ? byteswap_uint64_array : dmu_ot[BP_GET_TYPE(zio->io_bp)].ot_byteswap; |
