From e5948aa6c84c3b3417fa313985e746af7672af7e Mon Sep 17 00:00:00 2001 From: delphij Date: Thu, 20 Mar 2014 00:01:19 +0000 Subject: MFC r260157: MFV r260153: 4121 vdev_label_init should treat request as succeeded when pool is read only illumos/illumos-gate@973c78e94bf9634782164382c9e291bf81161fa5 --- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); /* -- cgit v1.1