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

[Doug Rabson]

Author: dfr
Date: Sun May 31 11:59:32 2009
New Revision: 193163
URL: http://svn.freebsd.org/changeset/base/193163

Log:
  Allow the bootfs property to be set for raidz pools on FreeBSD.
  
  Reviewed by:	pjd

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c	Sun May 31 11:57:51 2009	(r193162)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c	Sun May 31 11:59:32 2009	(r193163)
@@ -2392,13 +2392,23 @@ vdev_set_state(vdev_t *vd, boolean_t iso
 
 /*
  * Check the vdev configuration to ensure that it's capable of supporting
- * a root pool. Currently, we do not support RAID-Z or partial configuration.
- * In addition, only a single top-level vdev is allowed and none of the leaves
- * can be wholedisks.
+ * a root pool.
+ *
+ * On Solaris, we do not support RAID-Z or partial configuration.  In
+ * addition, only a single top-level vdev is allowed and none of the
+ * leaves can be wholedisks.
+ *
+ * For FreeBSD, we can boot from any configuration. There is a
+ * limitation that the boot filesystem must be either uncompressed or
+ * compresses with lzjb compression but I'm not sure how to enforce
+ * that here.
  */
 boolean_t
 vdev_is_bootable(vdev_t *vd)
 {
+#ifdef __FreeBSD_version
+	return (B_TRUE);
+#else
 	int c;
 
 	if (!vd->vdev_ops->vdev_op_leaf) {
@@ -2420,4 +2430,5 @@ vdev_is_bootable(vdev_t *vd)
 			return (B_FALSE);
 	}
 	return (B_TRUE);
+#endif
 }