summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Ahrens <mahrens@delphix.com>2017-04-13 11:56:16 -0700
committerPrakash Surya <prakash.surya@delphix.com>2018-05-01 12:57:38 -0700
commit93a1902e519bf492c071b48ffb93e5c1c7b53fb9 (patch)
treed93a3c03b6ab9b1d85e5b1667210bd259274a8f5
parentaa321b3cd36298fca4306c4e06284d250e998cf7 (diff)
downloadillumos-joyent-93a1902e519bf492c071b48ffb93e5c1c7b53fb9.tar.gz
9194 mechanism to override ashift at pool creation time
Reviewed by: Serapheim Dimitropoulos <serapheim@delphix.com> Reviewed by: Prakash Surya <prakash.surya@delphix.com> Reviewed by: Allan Jude <allanjude@freebsd.org> Reviewed by: Igor Kozhukhov <igor@dilos.org> Reviewed by: Richard Elling <Richard.Elling@RichardElling.com> Approved by: Dan McDonald <danmcd@joyent.com>
-rw-r--r--usr/src/uts/common/fs/zfs/vdev.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/usr/src/uts/common/fs/zfs/vdev.c b/usr/src/uts/common/fs/zfs/vdev.c
index 0c0057e9b6..6fee8109e0 100644
--- a/usr/src/uts/common/fs/zfs/vdev.c
+++ b/usr/src/uts/common/fs/zfs/vdev.c
@@ -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.