Author: mav
Date: Sat Oct 3 11:18:30 2015
New Revision: 288588
URL: https://svnweb.freebsd.org/changeset/base/288588
Log:
MFC r286951: Restore part of r274628, reverted at r286776.
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sat Oct
3 11:17:31 2015 (r288587)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sat Oct
3 11:18:30 2015 (r288588)
@@ -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;
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
