svn commit: r256889 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Steven Hartland]

Author: smh
Date: Tue Oct 22 13:31:36 2013
New Revision: 256889
URL: http://svnweb.freebsd.org/changeset/base/256889

Log:
  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.
  
  MFC after:	2 days

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	Tue Oct 22 12:58:22 2013	(r256888)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Tue Oct 22 13:31:36 2013	(r256889)
@@ -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 */