svn commit: r332541 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Mon Apr 16 03:53:34 2018
New Revision: 332541
URL: https://svnweb.freebsd.org/changeset/base/332541

Log:
  MFC r331406: MFV r331405: 9084 spa_*_ashift must ignore spare devices
  
  illumos/illumos-gate at b037f3dbd69cef4a7ffd576ad33e07bfaf0b1e84
  
  Reviewed by: Prashanth Sreenivasa <pks at delphix.com>
  Reviewed by: George Wilson <george.wilson at delphix.com>
  Approved by: Dan McDonald <danmcd at joyent.com>
  Author: Prakash Surya <prakash.surya at delphix.com>

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

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c	Mon Apr 16 03:52:54 2018	(r332540)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c	Mon Apr 16 03:53:34 2018	(r332541)
@@ -1589,14 +1589,6 @@ vdev_open(vdev_t *vd)
 		return (error);
 	}
 
-	if (vd->vdev_top == vd && vd->vdev_ashift != 0 &&
-	    !vd->vdev_isl2cache && !vd->vdev_islog) {
-		if (vd->vdev_ashift > spa->spa_max_ashift)
-			spa->spa_max_ashift = vd->vdev_ashift;
-		if (vd->vdev_ashift < spa->spa_min_ashift)
-			spa->spa_min_ashift = vd->vdev_ashift;
-	}
-
 	/*
 	 * Track the min and max ashift values for normal data devices.
 	 */