diff options
| author | delphij <delphij@FreeBSD.org> | 2014-03-20 00:01:19 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-03-20 00:01:19 +0000 |
| commit | e5948aa6c84c3b3417fa313985e746af7672af7e (patch) | |
| tree | aad45a649f94609ff1d12adc037ad25ec9cfac74 | |
| parent | ede49d4106ad9e6d34a2592322e48604f72605bd (diff) | |
| download | FreeBSD-src-e5948aa6c84c3b3417fa313985e746af7672af7e.zip FreeBSD-src-e5948aa6c84c3b3417fa313985e746af7672af7e.tar.gz | |
MFC r260157: MFV r260153:
4121 vdev_label_init should treat request as succeeded when pool
is read only
illumos/illumos-gate@973c78e94bf9634782164382c9e291bf81161fa5
| -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); /* |
