diff options
| author | mm <mm@FreeBSD.org> | 2013-04-06 08:21:37 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2013-04-06 08:21:37 +0000 |
| commit | e879e2e6e2e89a6d1693873adf8e83051c54a9b1 (patch) | |
| tree | e0150a24d73ce011c812ad30b30bbcba04689bee /sys/cddl | |
| parent | c348483a3d777c4d855e2e44a53700fe9ef0813d (diff) | |
| download | FreeBSD-src-e879e2e6e2e89a6d1693873adf8e83051c54a9b1.zip FreeBSD-src-e879e2e6e2e89a6d1693873adf8e83051c54a9b1.tar.gz | |
MFV r242816:
Import vendor change to reduce diff, no effect on FreeBSD.
Illumos ZFS issues:
3517 importing pool with autoreplace=on and "hole" vdevs crashes syseventd
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c index 880b18f..d20633a 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c @@ -22,6 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright 2013 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2013 Martin Matuska <mm@FreeBSD.org>. All rights reserved. */ @@ -1525,7 +1526,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); } |
