Illumos #3498 panic in arc_read()

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

diff --git a/module/zfs/spa.c b/module/zfs/spa.c
index ba376fb..e986e92 100644 (file)
--- a/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@ -920,7 +920,7 @@ spa_taskq_dispatch_ent(spa_t *spa, zio_type_t t, zio_taskq_type_t q,
        if (tqs->stqs_count == 1) {
                tq = tqs->stqs_taskq[0];
        } else {
-               tq = tqs->stqs_taskq[gethrtime() % tqs->stqs_count];
+               tq = tqs->stqs_taskq[((uint64_t)gethrtime()) % tqs->stqs_count];
        }
 
        taskq_dispatch_ent(tq, func, arg, flags, ent);
@@ -943,7 +943,7 @@ spa_taskq_dispatch_sync(spa_t *spa, zio_type_t t, zio_taskq_type_t q,
        if (tqs->stqs_count == 1) {
                tq = tqs->stqs_taskq[0];
        } else {
-               tq = tqs->stqs_taskq[gethrtime() % tqs->stqs_count];
+               tq = tqs->stqs_taskq[((uint64_t)gethrtime()) % tqs->stqs_count];
        }
 
        id = taskq_dispatch(tq, func, arg, flags);
@@ -1856,7 +1856,7 @@ spa_load_verify_done(zio_t *zio)
 /*ARGSUSED*/
 static int
 spa_load_verify_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    arc_buf_t *pbuf, const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
 {
        if (bp != NULL) {
                zio_t *rio = arg;