svn commit: r257058 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Steven Hartland]

Author: smh
Date: Thu Oct 24 15:21:20 2013
New Revision: 257058
URL: http://svnweb.freebsd.org/changeset/base/257058

Log:
  MFC r256889:
  
  Use the vdev's ashift to calculate the supported min block size passed to
  zio_compress_data(..) when compressing l2arc buffers.
  
  This eliminates L2ARC I/O errors, which resulted in very poor performance on
  vdev's configured with block size greater than 512b due to compression
  assuming a smaller min block size than the vdev supports.
  
  Approved by:	re (glebius)

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
Directory Properties:
  stable/10/sys/   (props changed)
  stable/10/sys/cddl/contrib/opensolaris/   (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	Thu Oct 24 15:11:30 2013	(r257057)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Thu Oct 24 15:21:20 2013	(r257058)
@@ -5147,7 +5147,7 @@ l2arc_compress_buf(l2arc_buf_hdr_t *l2hd
 	len = l2hdr->b_asize;
 	cdata = zio_data_buf_alloc(len);
 	csize = zio_compress_data(ZIO_COMPRESS_LZ4, l2hdr->b_tmp_cdata,
-	    cdata, l2hdr->b_asize, (size_t)SPA_MINBLOCKSIZE);
+	    cdata, l2hdr->b_asize, (size_t)(1ULL << l2hdr->b_dev->l2ad_vdev->vdev_ashift));
 
 	if (csize == 0) {
 		/* zero block, indicate that there's nothing to write */