diff options
| author | delphij <delphij@FreeBSD.org> | 2014-01-01 01:26:39 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-01-01 01:26:39 +0000 |
| commit | 843c1c95adbb59b90772ccb36241906ccf1923ed (patch) | |
| tree | eb5532ed7fc8f52500b62b81306514308a99460a /sys/cddl | |
| parent | bc4b7f418637b15d51b0da64431854664eb92455 (diff) | |
| download | FreeBSD-src-843c1c95adbb59b90772ccb36241906ccf1923ed.zip FreeBSD-src-843c1c95adbb59b90772ccb36241906ccf1923ed.tar.gz | |
MFV r260153:
4121 vdev_label_init should treat request as succeeded when pool
is read only
Illumos/illumos-gate@973c78e94bf9634782164382c9e291bf81161fa5
MFC after: 2 weeks
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c index c7dd3ad..014b851 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c @@ -646,7 +646,7 @@ vdev_label_init(vdev_t *vd, uint64_t crtxg, vdev_labeltype_t reason) /* Track the creation time for this vdev */ vd->vdev_crtxg = crtxg; - if (!vd->vdev_ops->vdev_op_leaf) + if (!vd->vdev_ops->vdev_op_leaf || !spa_writeable(spa)) return (0); /* |
