Author: delphij
Date: Thu Mar 20 00:02:14 2014
New Revision: 263400
URL: http://svnweb.freebsd.org/changeset/base/263400
Log:
MFC r260157: MFV r260153:
4121 vdev_label_init should treat request as succeeded when pool
is read only
illumos/illumos-gate@973c78e94bf9634782164382c9e291bf81161fa5
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/cddl/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
Thu Mar 20 00:01:19 2014 (r263399)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
Thu Mar 20 00:02:14 2014 (r263400)
@@ -646,7 +646,7 @@ vdev_label_init(vdev_t *vd, uint64_t crt
/* 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);
/*
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
