Illumos #3006

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

diff --git a/module/zfs/vdev_raidz.c b/module/zfs/vdev_raidz.c
index af2de40..3e1878d 100644 (file)
--- a/module/zfs/vdev_raidz.c
+++ b/module/zfs/vdev_raidz.c
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012 by Delphix. All rights reserved.
  */
 
 #include <sys/zfs_context.h>
@@ -280,7 +281,7 @@ vdev_raidz_map_free_vsd(zio_t *zio)
 {
        raidz_map_t *rm = zio->io_vsd;
 
-       ASSERT3U(rm->rm_freed, ==, 0);
+       ASSERT0(rm->rm_freed);
        rm->rm_freed = 1;
 
        if (rm->rm_reports == 0)
@@ -456,7 +457,7 @@ vdev_raidz_map_alloc(zio_t *zio, uint64_t unit_shift, uint64_t dcols,
 
        ASSERT3U(acols, <=, scols);
 
-       rm = kmem_alloc(offsetof(raidz_map_t, rm_col[scols]), KM_SLEEP);
+       rm = kmem_alloc(offsetof(raidz_map_t, rm_col[scols]), KM_PUSHPAGE);
 
        rm->rm_cols = acols;
        rm->rm_scols = scols;
@@ -1133,7 +1134,7 @@ vdev_raidz_matrix_invert(raidz_map_t *rm, int n, int nmissing, int *missing,
         */
        for (i = 0; i < nmissing; i++) {
                for (j = 0; j < missing[i]; j++) {
-                       ASSERT3U(rows[i][j], ==, 0);
+                       ASSERT0(rows[i][j]);
                }
                ASSERT3U(rows[i][missing[i]], !=, 0);
 
@@ -1174,7 +1175,7 @@ vdev_raidz_matrix_invert(raidz_map_t *rm, int n, int nmissing, int *missing,
                        if (j == missing[i]) {
                                ASSERT3U(rows[i][j], ==, 1);
                        } else {
-                               ASSERT3U(rows[i][j], ==, 0);
+                               ASSERT0(rows[i][j]);
                        }
                }
        }
@@ -1189,14 +1190,14 @@ vdev_raidz_matrix_reconstruct(raidz_map_t *rm, int n, int nmissing,
        uint64_t ccount;
        uint8_t *dst[VDEV_RAIDZ_MAXPARITY];
        uint64_t dcount[VDEV_RAIDZ_MAXPARITY];
-       uint8_t log, val;
+       uint8_t log = 0, val;
        int ll;
        uint8_t *invlog[VDEV_RAIDZ_MAXPARITY];
        uint8_t *p, *pp;
        size_t psize;
 
        psize = sizeof (invlog[0][0]) * n * nmissing;
-       p = kmem_alloc(psize, KM_SLEEP);
+       p = kmem_alloc(psize, KM_PUSHPAGE);
 
        for (pp = p, i = 0; i < nmissing; i++) {
                invlog[i] = pp;
@@ -1313,7 +1314,7 @@ vdev_raidz_reconstruct_general(raidz_map_t *rm, int *tgts, int ntgts)
 
        psize = (sizeof (rows[0][0]) + sizeof (invrows[0][0])) *
            nmissing_rows * n + sizeof (used[0]) * n;
-       p = kmem_alloc(psize, KM_SLEEP);
+       p = kmem_alloc(psize, KM_PUSHPAGE);
 
        for (pp = p, i = 0; i < nmissing_rows; i++) {
                rows[i] = pp;
@@ -1441,7 +1442,8 @@ vdev_raidz_reconstruct(raidz_map_t *rm, int *t, int nt)
 }
 
 static int
-vdev_raidz_open(vdev_t *vd, uint64_t *asize, uint64_t *ashift)
+vdev_raidz_open(vdev_t *vd, uint64_t *asize, uint64_t *max_asize,
+    uint64_t *ashift)
 {
        vdev_t *cvd;
        uint64_t nparity = vd->vdev_nparity;
@@ -1469,10 +1471,12 @@ vdev_raidz_open(vdev_t *vd, uint64_t *asize, uint64_t *ashift)
                }
 
                *asize = MIN(*asize - 1, cvd->vdev_asize - 1) + 1;
+               *max_asize = MIN(*max_asize - 1, cvd->vdev_max_asize - 1) + 1;
                *ashift = MAX(*ashift, cvd->vdev_ashift);
        }
 
        *asize *= vd->vdev_children;
+       *max_asize *= vd->vdev_children;
 
        if (numerrors > nparity) {
                vd->vdev_stat.vs_aux = VDEV_AUX_NO_REPLICAS;
@@ -1638,8 +1642,11 @@ raidz_checksum_verify(zio_t *zio)
 {
        zio_bad_cksum_t zbc;
        raidz_map_t *rm = zio->io_vsd;
+       int ret;
 
-       int ret = zio_checksum_error(zio, &zbc);
+       bzero(&zbc, sizeof (zio_bad_cksum_t));
+
+       ret = zio_checksum_error(zio, &zbc);
        if (ret != 0 && zbc.zbc_injected != 0)
                rm->rm_ecksuminjected = 1;
 
@@ -1716,7 +1723,7 @@ vdev_raidz_combrec(zio_t *zio, int total_errors, int data_errors)
        void *orig[VDEV_RAIDZ_MAXPARITY];
        int tstore[VDEV_RAIDZ_MAXPARITY + 2];
        int *tgts = &tstore[1];
-       int current, next, i, c, n;
+       int curr, next, i, c, n;
        int code, ret = 0;
 
        ASSERT(total_errors < rm->rm_firstdatacol);
@@ -1764,12 +1771,12 @@ vdev_raidz_combrec(zio_t *zio, int total_errors, int data_errors)
 
                orig[n - 1] = zio_buf_alloc(rm->rm_col[0].rc_size);
 
-               current = 0;
-               next = tgts[current];
+               curr = 0;
+               next = tgts[curr];
 
-               while (current != n) {
-                       tgts[current] = next;
-                       current = 0;
+               while (curr != n) {
+                       tgts[curr] = next;
+                       curr = 0;
 
                        /*
                         * Save off the original data that we're going to
@@ -1817,34 +1824,34 @@ vdev_raidz_combrec(zio_t *zio, int total_errors, int data_errors)
 
                        do {
                                /*
-                                * Find the next valid column after the current
+                                * Find the next valid column after the curr
                                 * position..
                                 */
-                               for (next = tgts[current] + 1;
+                               for (next = tgts[curr] + 1;
                                    next < rm->rm_cols &&
                                    rm->rm_col[next].rc_error != 0; next++)
                                        continue;
 
-                               ASSERT(next <= tgts[current + 1]);
+                               ASSERT(next <= tgts[curr + 1]);
 
                                /*
                                 * If that spot is available, we're done here.
                                 */
-                               if (next != tgts[current + 1])
+                               if (next != tgts[curr + 1])
                                        break;
 
                                /*
                                 * Otherwise, find the next valid column after
                                 * the previous position.
                                 */
-                               for (c = tgts[current - 1] + 1;
+                               for (c = tgts[curr - 1] + 1;
                                    rm->rm_col[c].rc_error != 0; c++)
                                        continue;
 
-                               tgts[current] = c;
-                               current++;
+                               tgts[curr] = c;
+                               curr++;
 
-                       } while (current != n);
+                       } while (curr != n);
                }
        }
        n--;
@@ -1862,7 +1869,7 @@ vdev_raidz_io_done(zio_t *zio)
        vdev_t *vd = zio->io_vd;
        vdev_t *cvd;
        raidz_map_t *rm = zio->io_vsd;
-       raidz_col_t *rc;
+       raidz_col_t *rc = NULL;
        int unexpected_errors = 0;
        int parity_errors = 0;
        int parity_untried = 0;