diff options
| author | Matthew Ahrens <mahrens@delphix.com> | 2015-06-26 20:11:23 -0700 |
|---|---|---|
| committer | Matthew Ahrens <mahrens@delphix.com> | 2015-06-26 20:11:23 -0700 |
| commit | 4f990aabd6e52e37bec8b37aa7cbcd35d9a32f62 (patch) | |
| tree | 868aeb97e68af74cd03ca3245256b7f34cd2f725 /usr/src/uts/common/fs/zfs/vdev.c | |
| parent | 1d3f896f5469c69c1339890ec3d68e9feddb0343 (diff) | |
| download | illumos-gate-4f990aabd6e52e37bec8b37aa7cbcd35d9a32f62.tar.gz | |
backout 5997: breaks "zpool add"
Diffstat (limited to 'usr/src/uts/common/fs/zfs/vdev.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/vdev.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/usr/src/uts/common/fs/zfs/vdev.c b/usr/src/uts/common/fs/zfs/vdev.c index 1c57fce4dc..9e27578f8e 100644 --- a/usr/src/uts/common/fs/zfs/vdev.c +++ b/usr/src/uts/common/fs/zfs/vdev.c @@ -2357,7 +2357,6 @@ int vdev_online(spa_t *spa, uint64_t guid, uint64_t flags, vdev_state_t *newstate) { vdev_t *vd, *tvd, *pvd, *rvd = spa->spa_root_vdev; - boolean_t postevent = B_FALSE; spa_vdev_state_enter(spa, SCL_NONE); @@ -2367,10 +2366,6 @@ vdev_online(spa_t *spa, uint64_t guid, uint64_t flags, vdev_state_t *newstate) if (!vd->vdev_ops->vdev_op_leaf) return (spa_vdev_state_exit(spa, NULL, ENOTSUP)); - postevent = - (vd->vdev_offline == B_TRUE || vd->vdev_tmpoffline == B_TRUE) ? - B_TRUE : B_FALSE; - tvd = vd->vdev_top; vd->vdev_offline = B_FALSE; vd->vdev_tmpoffline = B_FALSE; @@ -2406,10 +2401,6 @@ vdev_online(spa_t *spa, uint64_t guid, uint64_t flags, vdev_state_t *newstate) return (spa_vdev_state_exit(spa, vd, ENOTSUP)); spa_async_request(spa, SPA_ASYNC_CONFIG_UPDATE); } - - if (postevent) - spa_event_notify(spa, vd, ESC_ZFS_VDEV_ONLINE); - return (spa_vdev_state_exit(spa, vd, 0)); } |