diff options
| author | mav <mav@FreeBSD.org> | 2015-10-03 11:18:30 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2015-10-03 11:18:30 +0000 |
| commit | ff0cc52beded8983b3730cbd22e2aab586a2ee4d (patch) | |
| tree | 6af9df21de92f6c8bd63f3e4521e7f9733baed04 | |
| parent | 634be06c9d751d4de3b1d68dcf8efc3f1cc6e798 (diff) | |
| download | FreeBSD-src-ff0cc52beded8983b3730cbd22e2aab586a2ee4d.zip FreeBSD-src-ff0cc52beded8983b3730cbd22e2aab586a2ee4d.tar.gz | |
MFC r286951: Restore part of r274628, reverted at r286776.
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c | 3 |
1 files changed, 2 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 2a26994..c756e39 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c @@ -6532,7 +6532,8 @@ l2arc_compress_buf(arc_buf_hdr_t *hdr) csize = zio_compress_data(ZIO_COMPRESS_LZ4, hdr->b_l1hdr.b_tmp_cdata, cdata, l2hdr->b_asize); - rounded = P2ROUNDUP(csize, (size_t)SPA_MINBLOCKSIZE); + rounded = P2ROUNDUP(csize, + (size_t)1 << l2hdr->b_dev->l2ad_vdev->vdev_ashift); if (rounded > csize) { bzero((char *)cdata + csize, rounded - csize); csize = rounded; |
