Imported Upstream version 0.6.5.3

[mirror_zfs-debian.git] / module / zfs / vdev_mirror.c

diff --git a/module/zfs/vdev_mirror.c b/module/zfs/vdev_mirror.c
index e0884dc3ce63915ffae6509563cb09eefa5acc54..6b699e883e37a8c90e1e3ee95a34db8b741cc45d 100644 (file)
--- a/module/zfs/vdev_mirror.c
+++ b/module/zfs/vdev_mirror.c
@@ -24,7 +24,7 @@
  */
 
 /*
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/zfs_context.h>
@@ -89,17 +89,14 @@ static const zio_vsd_ops_t vdev_mirror_vsd_ops = {
 static int
 vdev_mirror_pending(vdev_t *vd)
 {
-       vdev_queue_t *vq = &vd->vdev_queue;
-       int pending;
-
-       mutex_enter(&vq->vq_lock);
-       pending = avl_numnodes(&vq->vq_pending_tree);
-       mutex_exit(&vq->vq_lock);
-
-       return (pending);
+       return (avl_numnodes(&vd->vdev_queue.vq_active_tree));
 }
 
-static mirror_map_t *
+/*
+ * Avoid inlining the function to keep vdev_mirror_io_start(), which
+ * is this functions only caller, as small as possible on the stack.
+ */
+noinline static mirror_map_t *
 vdev_mirror_map_alloc(zio_t *zio)
 {
        mirror_map_t *mm = NULL;
@@ -113,7 +110,8 @@ vdev_mirror_map_alloc(zio_t *zio)
 
                c = BP_GET_NDVAS(zio->io_bp);
 
-               mm = kmem_zalloc(offsetof(mirror_map_t, mm_child[c]), KM_PUSHPAGE);
+               mm = kmem_zalloc(offsetof(mirror_map_t, mm_child[c]),
+                   KM_SLEEP);
                mm->mm_children = c;
                mm->mm_replacing = B_FALSE;
                mm->mm_preferred = spa_get_random(c);
@@ -143,7 +141,8 @@ vdev_mirror_map_alloc(zio_t *zio)
 
                c = vd->vdev_children;
 
-               mm = kmem_zalloc(offsetof(mirror_map_t, mm_child[c]), KM_PUSHPAGE);
+               mm = kmem_zalloc(offsetof(mirror_map_t, mm_child[c]),
+                   KM_SLEEP);
                mm->mm_children = c;
                mm->mm_replacing = (vd->vdev_ops == &vdev_replacing_ops ||
                    vd->vdev_ops == &vdev_spare_ops);
@@ -159,7 +158,7 @@ vdev_mirror_map_alloc(zio_t *zio)
                                continue;
 
                        if (!vdev_readable(mc->mc_vd)) {
-                               mc->mc_error = ENXIO;
+                               mc->mc_error = SET_ERROR(ENXIO);
                                mc->mc_tried = 1;
                                mc->mc_skipped = 1;
                                mc->mc_pending = INT_MAX;
@@ -205,7 +204,7 @@ vdev_mirror_open(vdev_t *vd, uint64_t *asize, uint64_t *max_asize,
 
        if (vd->vdev_children == 0) {
                vd->vdev_stat.vs_aux = VDEV_AUX_BAD_LABEL;
-               return (EINVAL);
+               return (SET_ERROR(EINVAL));
        }
 
        vdev_open_children(vd);
@@ -301,15 +300,15 @@ vdev_mirror_child_select(zio_t *zio)
                mc = &mm->mm_child[c];
                if (mc->mc_tried || mc->mc_skipped)
                        continue;
-               if (!vdev_readable(mc->mc_vd)) {
-                       mc->mc_error = ENXIO;
+               if (mc->mc_vd == NULL || !vdev_readable(mc->mc_vd)) {
+                       mc->mc_error = SET_ERROR(ENXIO);
                        mc->mc_tried = 1;       /* don't even try */
                        mc->mc_skipped = 1;
                        continue;
                }
                if (!vdev_dtl_contains(mc->mc_vd, DTL_MISSING, txg, 1))
                        return (c);
-               mc->mc_error = ESTALE;
+               mc->mc_error = SET_ERROR(ESTALE);
                mc->mc_skipped = 1;
                mc->mc_speculative = 1;
        }
@@ -328,7 +327,7 @@ vdev_mirror_child_select(zio_t *zio)
        return (-1);
 }
 
-static int
+static void
 vdev_mirror_io_start(zio_t *zio)
 {
        mirror_map_t *mm;
@@ -353,7 +352,8 @@ vdev_mirror_io_start(zio_t *zio)
                                    zio->io_type, zio->io_priority, 0,
                                    vdev_mirror_scrub_done, mc));
                        }
-                       return (ZIO_PIPELINE_CONTINUE);
+                       zio_execute(zio);
+                       return;
                }
                /*
                 * For normal reads just pick one child.
@@ -379,7 +379,7 @@ vdev_mirror_io_start(zio_t *zio)
                c++;
        }
 
-       return (ZIO_PIPELINE_CONTINUE);
+       zio_execute(zio);
 }
 
 static int
@@ -494,13 +494,13 @@ vdev_mirror_io_done(zio_t *zio)
                                    !vdev_dtl_contains(mc->mc_vd, DTL_PARTIAL,
                                    zio->io_txg, 1))
                                        continue;
-                               mc->mc_error = ESTALE;
+                               mc->mc_error = SET_ERROR(ESTALE);
                        }
 
                        zio_nowait(zio_vdev_child_io(zio, zio->io_bp,
                            mc->mc_vd, mc->mc_offset,
                            zio->io_data, zio->io_size,
-                           ZIO_TYPE_WRITE, zio->io_priority,
+                           ZIO_TYPE_WRITE, ZIO_PRIORITY_ASYNC_WRITE,
                            ZIO_FLAG_IO_REPAIR | (unexpected_errors ?
                            ZIO_FLAG_SELF_HEAL : 0), NULL, NULL));
                }