svn commit: r260153 - vendor-sys/illumos/dist/uts/common/fs/zfs

[Xin LI]

Author: delphij
Date: Wed Jan  1 01:05:38 2014
New Revision: 260153
URL: http://svnweb.freebsd.org/changeset/base/260153

Log:
  4121 vdev_label_init should treat request as succeeded when pool
       is read only
  
  llumos/illumos-gate at 973c78e94bf9634782164382c9e291bf81161fa5

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_label.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_label.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_label.c	Wed Jan  1 01:00:04 2014	(r260152)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_label.c	Wed Jan  1 01:05:38 2014	(r260153)
@@ -640,7 +640,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);
 
 	/*