Illumos #3498 panic in arc_read()

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

diff --git a/module/zfs/dmu_send.c b/module/zfs/dmu_send.c
index b2c6bfe..54e7597 100644 (file)
--- a/module/zfs/dmu_send.c
+++ b/module/zfs/dmu_send.c
@@ -67,7 +67,7 @@ dump_bytes_strategy(void *arg)
        dmu_sendarg_t *dsp = dbi->dbi_dsp;
        dsl_dataset_t *ds = dsp->dsa_os->os_dsl_dataset;
        ssize_t resid; /* have to get resid to get detailed errno */
-       ASSERT3U(dbi->dbi_len % 8, ==, 0);
+       ASSERT0(dbi->dbi_len % 8);
 
        fletcher_4_incremental_native(dbi->dbi_buf, dbi->dbi_len, &dsp->dsa_zc);
        dsp->dsa_err = vn_rdwr(UIO_WRITE, dsp->dsa_vp,
@@ -330,7 +330,7 @@ dump_dnode(dmu_sendarg_t *dsp, uint64_t object, dnode_phys_t *dnp)
 
 /* ARGSUSED */
 static int
-backup_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, arc_buf_t *pbuf,
+backup_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
     const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
 {
        dmu_sendarg_t *dsp = arg;
@@ -359,9 +359,9 @@ backup_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, arc_buf_t *pbuf,
                uint32_t aflags = ARC_WAIT;
                arc_buf_t *abuf;
 
-               if (dsl_read(NULL, spa, bp, pbuf,
-                   arc_getbuf_func, &abuf, ZIO_PRIORITY_ASYNC_READ,
-                   ZIO_FLAG_CANFAIL, &aflags, zb) != 0)
+               if (arc_read(NULL, spa, bp, arc_getbuf_func, &abuf,
+                   ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL,
+                   &aflags, zb) != 0)
                        return (EIO);
 
                blk = abuf->b_data;
@@ -378,9 +378,9 @@ backup_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, arc_buf_t *pbuf,
                arc_buf_t *abuf;
                int blksz = BP_GET_LSIZE(bp);
 
-               if (arc_read_nolock(NULL, spa, bp,
-                   arc_getbuf_func, &abuf, ZIO_PRIORITY_ASYNC_READ,
-                   ZIO_FLAG_CANFAIL, &aflags, zb) != 0)
+               if (arc_read(NULL, spa, bp, arc_getbuf_func, &abuf,
+                   ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL,
+                   &aflags, zb) != 0)
                        return (EIO);
 
                err = dump_spill(dsp, zb->zb_object, blksz, abuf->b_data);
@@ -390,9 +390,9 @@ backup_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, arc_buf_t *pbuf,
                arc_buf_t *abuf;
                int blksz = BP_GET_LSIZE(bp);
 
-               if (dsl_read(NULL, spa, bp, pbuf,
-                   arc_getbuf_func, &abuf, ZIO_PRIORITY_ASYNC_READ,
-                   ZIO_FLAG_CANFAIL, &aflags, zb) != 0) {
+               if (arc_read(NULL, spa, bp, arc_getbuf_func, &abuf,
+                   ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL,
+                   &aflags, zb) != 0) {
                        if (zfs_send_corrupt_data) {
                                uint64_t *ptr;
                                /* Send a block filled with 0x"zfs badd bloc" */
@@ -988,7 +988,7 @@ restore_read(struct restorearg *ra, int len)
        int done = 0;
 
        /* some things will require 8-byte alignment, so everything must */
-       ASSERT3U(len % 8, ==, 0);
+       ASSERT0(len % 8);
 
        while (done < len) {
                ssize_t resid;
@@ -1667,7 +1667,7 @@ out:
                (void) add_ds_to_guidmap(drc->drc_guid_to_ds_map, ds);
        dsl_dataset_disown(ds, dmu_recv_tag);
        myerr = dsl_dataset_destroy(drc->drc_real_ds, dmu_recv_tag, B_FALSE);
-       ASSERT3U(myerr, ==, 0);
+       ASSERT0(myerr);
        return (err);
 }