Author: mav
Date: Thu Aug 20 07:41:33 2015
New Revision: 286951
URL: https://svnweb.freebsd.org/changeset/base/286951

Log:
  Restore part of r274628, reverted at r286776.
  
  Submitted by: avg

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c   Thu Aug 20 
05:13:54 2015        (r286950)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c   Thu Aug 20 
07:41:33 2015        (r286951)
@@ -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;
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to