summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2018-02-22 13:28:03 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2018-02-22 13:28:03 +0000
commit44db5f1c904128c3fd7c7ec37e9d894a10e93f8c (patch)
treea862382421c1af5798768ee9c7f0a2b171b71613
parentf49f984d73e73b99d7388dfffa647c0d2f406d31 (diff)
parentb037f3dbd69cef4a7ffd576ad33e07bfaf0b1e84 (diff)
downloadillumos-joyent-44db5f1c904128c3fd7c7ec37e9d894a10e93f8c.tar.gz
[illumos-gate merge]
commit b037f3dbd69cef4a7ffd576ad33e07bfaf0b1e84 9084 spa_*_ashift must ignore spare devices
-rw-r--r--usr/src/uts/common/fs/zfs/vdev.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/usr/src/uts/common/fs/zfs/vdev.c b/usr/src/uts/common/fs/zfs/vdev.c
index 73306aec85..0df76e22a4 100644
--- a/usr/src/uts/common/fs/zfs/vdev.c
+++ b/usr/src/uts/common/fs/zfs/vdev.c
@@ -1478,14 +1478,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.
*/