Add -p switch to "zpool get"

[zfs.git] / module / zfs / vdev_root.c

diff --git a/module/zfs/vdev_root.c b/module/zfs/vdev_root.c
index 88383f0..5241b02 100644 (file)
--- a/module/zfs/vdev_root.c
+++ b/module/zfs/vdev_root.c
@@ -19,10 +19,14 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2012 by Delphix. All rights reserved.
+ */
+
 #include <sys/zfs_context.h>
 #include <sys/spa.h>
 #include <sys/vdev_impl.h>
@@ -50,26 +54,26 @@ too_many_errors(vdev_t *vd, int numerrors)
 }
 
 static int
-vdev_root_open(vdev_t *vd, uint64_t *asize, uint64_t *ashift)
+vdev_root_open(vdev_t *vd, uint64_t *asize, uint64_t *max_asize,
+    uint64_t *ashift)
 {
-       int c;
        int lasterror = 0;
        int numerrors = 0;
+       int c;
 
        if (vd->vdev_children == 0) {
                vd->vdev_stat.vs_aux = VDEV_AUX_BAD_LABEL;
                return (EINVAL);
        }
 
+       vdev_open_children(vd);
+
        for (c = 0; c < vd->vdev_children; c++) {
                vdev_t *cvd = vd->vdev_child[c];
-               int error;
 
-               if ((error = vdev_open(cvd)) != 0 &&
-                   !cvd->vdev_islog) {
-                       lasterror = error;
+               if (cvd->vdev_open_error && !cvd->vdev_islog) {
+                       lasterror = cvd->vdev_open_error;
                        numerrors++;
-                       continue;
                }
        }
 
@@ -79,6 +83,7 @@ vdev_root_open(vdev_t *vd, uint64_t *asize, uint64_t *ashift)
        }
 
        *asize = 0;
+       *max_asize = 0;
        *ashift = 0;
 
        return (0);
@@ -113,6 +118,8 @@ vdev_ops_t vdev_root_ops = {
        NULL,                   /* io_start - not applicable to the root */
        NULL,                   /* io_done - not applicable to the root */
        vdev_root_state_change,
+       NULL,
+       NULL,
        VDEV_TYPE_ROOT,         /* name of this vdev type */
        B_FALSE                 /* not a leaf vdev */
 };