diff options
| author | mm <mm@FreeBSD.org> | 2013-03-12 21:42:55 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2013-03-12 21:42:55 +0000 |
| commit | cabc494cc19627efb1289b18b58da6d30faacd4d (patch) | |
| tree | 9a7de1e39d9c5fcf2d92d8402a34b754bce132f4 | |
| parent | dac548279b6823b3b3589d37d7fa824330e02405 (diff) | |
| download | FreeBSD-src-cabc494cc19627efb1289b18b58da6d30faacd4d.zip FreeBSD-src-cabc494cc19627efb1289b18b58da6d30faacd4d.tar.gz | |
Update vendor-sys/illumos/dist to illumos-gate 13979:b01a4832cdf9
Illumos ZFS issues:
3517 importing pool with autoreplace=on and "hole" vdevs crashes syseventd
| -rw-r--r-- | uts/common/fs/zfs/spa.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/uts/common/fs/zfs/spa.c b/uts/common/fs/zfs/spa.c index 544a040..004dfe9 100644 --- a/uts/common/fs/zfs/spa.c +++ b/uts/common/fs/zfs/spa.c @@ -21,8 +21,8 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright 2013 Nexenta Systems, Inc. All rights reserved. */ /* @@ -1556,7 +1556,8 @@ spa_check_removed(vdev_t *vd) for (int c = 0; c < vd->vdev_children; c++) spa_check_removed(vd->vdev_child[c]); - if (vd->vdev_ops->vdev_op_leaf && vdev_is_dead(vd)) { + if (vd->vdev_ops->vdev_op_leaf && vdev_is_dead(vd) && + !vd->vdev_ishole) { zfs_post_autoreplace(vd->vdev_spa, vd); spa_event_notify(vd->vdev_spa, vd, ESC_ZFS_VDEV_CHECK); } |
