X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fvdev.c;h=afff4d423deac58ef1770f61c28010774ac7cee0;hb=e013670550641610dc09b6b58f0ea9fd00169d07;hp=06097f355767d7f9f74cb7feda0469ca40ee98c7;hpb=295304bed6fa6744b8d011e36b9c2180311cedb2;p=zfs.git

diff --git a/module/zfs/vdev.c b/module/zfs/vdev.c
index 06097f3..afff4d4 100644
--- a/module/zfs/vdev.c
+++ b/module/zfs/vdev.c
@@ -1258,11 +1258,12 @@ vdev_open(vdev_t *vd)
 	if (vd->vdev_asize == 0) {
 		/*
 		 * This is the first-ever open, so use the computed values.
-		 * For testing purposes, a higher ashift can be requested.
+		 * For compatibility, a different ashift can be requested.
 		 */
 		vd->vdev_asize = asize;
 		vd->vdev_max_asize = max_asize;
-		vd->vdev_ashift = MAX(ashift, vd->vdev_ashift);
+		if (vd->vdev_ashift == 0)
+			vd->vdev_ashift = ashift;
 	} else {
 		/*
 		 * Detect if the alignment requirement has increased.