diff options
| author | mav <mav@FreeBSD.org> | 2015-08-20 07:41:33 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2015-08-20 07:41:33 +0000 |
| commit | cd9f09063219514c99a74a2a57dfb61133f586f2 (patch) | |
| tree | 9e336f44c23aa07a8ca7de8fdf697f0f30bb3756 | |
| parent | af628b3eaf68df21bfa3075004a42f4caeed43f3 (diff) | |
| download | FreeBSD-src-cd9f09063219514c99a74a2a57dfb61133f586f2.zip FreeBSD-src-cd9f09063219514c99a74a2a57dfb61133f586f2.tar.gz | |
Restore part of r274628, reverted at r286776.
Submitted by: avg
| -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 07fcb51..e44c043 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c @@ -6509,7 +6509,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; |
