svn commit: r337013 - vendor-sys/illumos/dist/uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Tue Jul 31 21:26:03 2018
New Revision: 337013
URL: https://svnweb.freebsd.org/changeset/base/337013

Log:
  9194 mechanism to override ashift at pool creation time
  
  illumos/illumos-gate at 93a1902e519bf492c071b48ffb93e5c1c7b53fb9
  
  Reviewed by: Serapheim Dimitropoulos <serapheim at delphix.com>
  Reviewed by: Prakash Surya <prakash.surya at delphix.com>
  Reviewed by: Allan Jude <allanjude at freebsd.org>
  Reviewed by: Igor Kozhukhov <igor at dilos.org>
  Reviewed by: Richard Elling <Richard.Elling at RichardElling.com>
  Approved by: Dan McDonald <danmcd at joyent.com>
  Author:     Matthew Ahrens <mahrens at delphix.com>

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c	Tue Jul 31 21:09:32 2018	(r337012)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c	Tue Jul 31 21:26:03 2018	(r337013)
@@ -96,6 +96,8 @@ int vdev_dtl_sm_blksz = (1 << 12);
  */
 int vdev_standard_sm_blksz = (1 << 17);
 
+int zfs_ashift_min;
+
 /*PRINTFLIKE2*/
 void
 vdev_dbgmsg(vdev_t *vd, const char *fmt, ...)
@@ -1511,6 +1513,7 @@ vdev_open(vdev_t *vd)
 		vd->vdev_asize = asize;
 		vd->vdev_max_asize = max_asize;
 		vd->vdev_ashift = MAX(ashift, vd->vdev_ashift);
+		vd->vdev_ashift = MAX(zfs_ashift_min, vd->vdev_ashift);
 	} else {
 		/*
 		 * Detect if the alignment requirement has increased.