svn commit: r260157 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Xin LI]

Author: delphij
Date: Wed Jan  1 01:26:39 2014
New Revision: 260157
URL: http://svnweb.freebsd.org/changeset/base/260157

Log:
  MFV r260153:
  
  4121 vdev_label_init should treat request as succeeded when pool
       is read only
  
  Illumos/illumos-gate at 973c78e94bf9634782164382c9e291bf81161fa5
  
  MFC after:	2 weeks

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
Directory Properties:
  head/sys/cddl/contrib/opensolaris/   (props changed)

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c	Wed Jan  1 01:23:40 2014	(r260156)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c	Wed Jan  1 01:26:39 2014	(r260157)
@@ -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);
 
 	/*