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

[Alexander Motin]

Author: mav
Date: Mon Mar 21 00:29:00 2016
New Revision: 297123
URL: https://svnweb.freebsd.org/changeset/base/297123

Log:
  MFC r296615: Make ZFS ignore stripe sizes above SPA_MAXASHIFT (8KB).
  
  If device has stripe size bigger then maximal sector size supported by
  ZFS, there is nothing can be done to avoid read-modify-write cycles.
  Taking that stripe size into account will only reduce space efficiency
  and pointlessly bother user with warnings that can not be fixed.

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c	Mon Mar 21 00:28:13 2016	(r297122)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c	Mon Mar 21 00:29:00 2016	(r297123)
@@ -803,7 +803,7 @@ vdev_geom_open(vdev_t *vd, uint64_t *psi
 	*logical_ashift = highbit(MAX(pp->sectorsize, SPA_MINBLOCKSIZE)) - 1;
 	*physical_ashift = 0;
 	if (pp->stripesize > (1 << *logical_ashift) && ISP2(pp->stripesize) &&
-	    pp->stripeoffset == 0)
+	    pp->stripesize <= (1 << SPA_MAXASHIFT) && pp->stripeoffset == 0)
 		*physical_ashift = highbit(pp->stripesize) - 1;
 
 	/*