git://git.camperquake.de / zfs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Illumos #3498 panic in arc_read()
[zfs.git] / module / zfs / dmu_traverse.c
diff --git a/module/zfs/dmu_traverse.c b/module/zfs/dmu_traverse.c
index 370a28a..1c39723 100644 (file)
--- a/module/zfs/dmu_traverse.c
+++ b/module/zfs/dmu_traverse.c
@@ -62,9 +62,9 @@ typedef struct traverse_data {
 } traverse_data_t;
 
 static int traverse_dnode(traverse_data_t *td, const dnode_phys_t *dnp,
-    arc_buf_t *buf, uint64_t objset, uint64_t object);
+    uint64_t objset, uint64_t object);
 static void prefetch_dnode_metadata(traverse_data_t *td, const dnode_phys_t *,
-    arc_buf_t *buf, uint64_t objset, uint64_t object);
+    uint64_t objset, uint64_t object);
 
 static int
 traverse_zil_block(zilog_t *zilog, blkptr_t *bp, void *arg, uint64_t claim_txg)
@@ -81,7 +81,7 @@ traverse_zil_block(zilog_t *zilog, blkptr_t *bp, void *arg, uint64_t claim_txg)
        SET_BOOKMARK(&zb, td->td_objset, ZB_ZIL_OBJECT, ZB_ZIL_LEVEL,
            bp->blk_cksum.zc_word[ZIL_ZC_SEQ]);
 
-       (void) td->td_func(td->td_spa, zilog, bp, NULL, &zb, NULL, td->td_arg);
+       (void) td->td_func(td->td_spa, zilog, bp, &zb, NULL, td->td_arg);
 
        return (0);
 }
@@ -105,7 +105,7 @@ traverse_zil_record(zilog_t *zilog, lr_t *lrc, void *arg, uint64_t claim_txg)
                SET_BOOKMARK(&zb, td->td_objset, lr->lr_foid,
                    ZB_ZIL_LEVEL, lr->lr_offset / BP_GET_LSIZE(bp));
 
-               (void) td->td_func(td->td_spa, zilog, bp, NULL, &zb, NULL,
+               (void) td->td_func(td->td_spa, zilog, bp, &zb, NULL,
                    td->td_arg);
        }
        return (0);
@@ -182,7 +182,7 @@ traverse_pause(traverse_data_t *td, const zbookmark_t *zb)
 
 static void
 traverse_prefetch_metadata(traverse_data_t *td,
-    arc_buf_t *pbuf, const blkptr_t *bp, const zbookmark_t *zb)
+    const blkptr_t *bp, const zbookmark_t *zb)
 {
        uint32_t flags = ARC_NOWAIT | ARC_PREFETCH;
 
@@ -200,14 +200,13 @@ traverse_prefetch_metadata(traverse_data_t *td,
        if (BP_GET_LEVEL(bp) == 0 && BP_GET_TYPE(bp) != DMU_OT_DNODE)
                return;
 
-       (void) arc_read(NULL, td->td_spa, bp,
-           pbuf, NULL, NULL, ZIO_PRIORITY_ASYNC_READ,
-           ZIO_FLAG_CANFAIL, &flags, zb);
+       (void) arc_read(NULL, td->td_spa, bp, NULL, NULL,
+           ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, zb);
 }
 
 static int
 traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
-    arc_buf_t *pbuf, const blkptr_t *bp, const zbookmark_t *zb)
+    const blkptr_t *bp, const zbookmark_t *zb)
 {
        zbookmark_t czb;
        int err = 0, lasterr = 0;
@@ -228,8 +227,7 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
        }
 
        if (BP_IS_HOLE(bp)) {
-               err = td->td_func(td->td_spa, NULL, NULL, pbuf, zb, dnp,
-                   td->td_arg);
+               err = td->td_func(td->td_spa, NULL, NULL, zb, dnp, td->td_arg);
                return (err);
        }
 
@@ -249,7 +247,7 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
        }
 
        if (td->td_flags & TRAVERSE_PRE) {
-               err = td->td_func(td->td_spa, NULL, bp, pbuf, zb, dnp,
+               err = td->td_func(td->td_spa, NULL, bp, zb, dnp,
                    td->td_arg);
                if (err == TRAVERSE_VISIT_NO_CHILDREN)
                        return (0);
@@ -265,8 +263,7 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
                blkptr_t *cbp;
                int epb = BP_GET_LSIZE(bp) >> SPA_BLKPTRSHIFT;
 
-               err = dsl_read(NULL, td->td_spa, bp, pbuf,
-                   arc_getbuf_func, &buf,
+               err = arc_read(NULL, td->td_spa, bp, arc_getbuf_func, &buf,
                    ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, zb);
                if (err)
                        return (err);
@@ -276,7 +273,7 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
                        SET_BOOKMARK(&czb, zb->zb_objset, zb->zb_object,
                            zb->zb_level - 1,
                            zb->zb_blkid * epb + i);
-                       traverse_prefetch_metadata(td, buf, &cbp[i], &czb);
+                       traverse_prefetch_metadata(td, &cbp[i], &czb);
                }
 
                /* recursively visitbp() blocks below this */
@@ -284,7 +281,7 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
                        SET_BOOKMARK(&czb, zb->zb_objset, zb->zb_object,
                            zb->zb_level - 1,
                            zb->zb_blkid * epb + i);
-                       err = traverse_visitbp(td, dnp, buf, &cbp[i], &czb);
+                       err = traverse_visitbp(td, dnp, &cbp[i], &czb);
                        if (err) {
                                if (!hard)
                                        break;
@@ -296,21 +293,20 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
                int i;
                int epb = BP_GET_LSIZE(bp) >> DNODE_SHIFT;
 
-               err = dsl_read(NULL, td->td_spa, bp, pbuf,
-                   arc_getbuf_func, &buf,
+               err = arc_read(NULL, td->td_spa, bp, arc_getbuf_func, &buf,
                    ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, zb);
                if (err)
                        return (err);
                dnp = buf->b_data;
 
                for (i = 0; i < epb; i++) {
-                       prefetch_dnode_metadata(td, &dnp[i], buf, zb->zb_objset,
+                       prefetch_dnode_metadata(td, &dnp[i], zb->zb_objset,
                            zb->zb_blkid * epb + i);
                }
 
                /* recursively visitbp() blocks below this */
                for (i = 0; i < epb; i++) {
-                       err = traverse_dnode(td, &dnp[i], buf, zb->zb_objset,
+                       err = traverse_dnode(td, &dnp[i], zb->zb_objset,
                            zb->zb_blkid * epb + i);
                        if (err) {
                                if (!hard)
@@ -323,24 +319,23 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
                objset_phys_t *osp;
                dnode_phys_t *dnp;
 
-               err = dsl_read_nolock(NULL, td->td_spa, bp,
-                   arc_getbuf_func, &buf,
+               err = arc_read(NULL, td->td_spa, bp, arc_getbuf_func, &buf,
                    ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, zb);
                if (err)
                        return (err);
 
                osp = buf->b_data;
                dnp = &osp->os_meta_dnode;
-               prefetch_dnode_metadata(td, dnp, buf, zb->zb_objset,
+               prefetch_dnode_metadata(td, dnp, zb->zb_objset,
                    DMU_META_DNODE_OBJECT);
                if (arc_buf_size(buf) >= sizeof (objset_phys_t)) {
                        prefetch_dnode_metadata(td, &osp->os_userused_dnode,
-                           buf, zb->zb_objset, DMU_USERUSED_OBJECT);
+                           zb->zb_objset, DMU_USERUSED_OBJECT);
                        prefetch_dnode_metadata(td, &osp->os_groupused_dnode,
-                           buf, zb->zb_objset, DMU_USERUSED_OBJECT);
+                           zb->zb_objset, DMU_USERUSED_OBJECT);
                }
 
-               err = traverse_dnode(td, dnp, buf, zb->zb_objset,
+               err = traverse_dnode(td, dnp, zb->zb_objset,
                    DMU_META_DNODE_OBJECT);
                if (err && hard) {
                        lasterr = err;
@@ -348,7 +343,7 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
                }
                if (err == 0 && arc_buf_size(buf) >= sizeof (objset_phys_t)) {
                        dnp = &osp->os_userused_dnode;
-                       err = traverse_dnode(td, dnp, buf, zb->zb_objset,
+                       err = traverse_dnode(td, dnp, zb->zb_objset,
                            DMU_USERUSED_OBJECT);
                }
                if (err && hard) {
@@ -357,7 +352,7 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
                }
                if (err == 0 && arc_buf_size(buf) >= sizeof (objset_phys_t)) {
                        dnp = &osp->os_groupused_dnode;
-                       err = traverse_dnode(td, dnp, buf, zb->zb_objset,
+                       err = traverse_dnode(td, dnp, zb->zb_objset,
                            DMU_GROUPUSED_OBJECT);
                }
        }
@@ -367,8 +362,7 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
 
 post:
        if (err == 0 && lasterr == 0 && (td->td_flags & TRAVERSE_POST)) {
-               err = td->td_func(td->td_spa, NULL, bp, pbuf, zb, dnp,
-                   td->td_arg);
+               err = td->td_func(td->td_spa, NULL, bp, zb, dnp, td->td_arg);
                if (err == ERESTART)
                        pause = B_TRUE;
        }
@@ -384,25 +378,25 @@ post:
 
 static void
 prefetch_dnode_metadata(traverse_data_t *td, const dnode_phys_t *dnp,
-    arc_buf_t *buf, uint64_t objset, uint64_t object)
+    uint64_t objset, uint64_t object)
 {
        int j;
        zbookmark_t czb;
 
        for (j = 0; j < dnp->dn_nblkptr; j++) {
                SET_BOOKMARK(&czb, objset, object, dnp->dn_nlevels - 1, j);
-               traverse_prefetch_metadata(td, buf, &dnp->dn_blkptr[j], &czb);
+               traverse_prefetch_metadata(td, &dnp->dn_blkptr[j], &czb);
        }
 
        if (dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR) {
                SET_BOOKMARK(&czb, objset, object, 0, DMU_SPILL_BLKID);
-               traverse_prefetch_metadata(td, buf, &dnp->dn_spill, &czb);
+               traverse_prefetch_metadata(td, &dnp->dn_spill, &czb);
        }
 }
 
 static int
 traverse_dnode(traverse_data_t *td, const dnode_phys_t *dnp,
-    arc_buf_t *buf, uint64_t objset, uint64_t object)
+    uint64_t objset, uint64_t object)
 {
        int j, err = 0, lasterr = 0;
        zbookmark_t czb;
@@ -410,7 +404,7 @@ traverse_dnode(traverse_data_t *td, const dnode_phys_t *dnp,
 
        for (j = 0; j < dnp->dn_nblkptr; j++) {
                SET_BOOKMARK(&czb, objset, object, dnp->dn_nlevels - 1, j);
-               err = traverse_visitbp(td, dnp, buf, &dnp->dn_blkptr[j], &czb);
+               err = traverse_visitbp(td, dnp, &dnp->dn_blkptr[j], &czb);
                if (err) {
                        if (!hard)
                                break;
@@ -420,7 +414,7 @@ traverse_dnode(traverse_data_t *td, const dnode_phys_t *dnp,
 
        if (dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR) {
                SET_BOOKMARK(&czb, objset, object, 0, DMU_SPILL_BLKID);
-               err = traverse_visitbp(td, dnp, buf, &dnp->dn_spill, &czb);
+               err = traverse_visitbp(td, dnp, &dnp->dn_spill, &czb);
                if (err) {
                        if (!hard)
                                return (err);
@@ -433,8 +427,7 @@ traverse_dnode(traverse_data_t *td, const dnode_phys_t *dnp,
 /* ARGSUSED */
 static int
 traverse_prefetcher(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)
 {
        prefetch_data_t *pfd = arg;
        uint32_t aflags = ARC_NOWAIT | ARC_PREFETCH;
@@ -455,10 +448,8 @@ traverse_prefetcher(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
        cv_broadcast(&pfd->pd_cv);
        mutex_exit(&pfd->pd_mtx);
 
-       (void) dsl_read(NULL, spa, bp, pbuf, NULL, NULL,
-           ZIO_PRIORITY_ASYNC_READ,
-           ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE,
-           &aflags, zb);
+       (void) arc_read(NULL, spa, bp, NULL, NULL, ZIO_PRIORITY_ASYNC_READ,
+           ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE, &aflags, zb);
 
        return (0);
 }
@@ -476,7 +467,7 @@ traverse_prefetch_thread(void *arg)
 
        SET_BOOKMARK(&czb, td.td_objset,
            ZB_ROOT_OBJECT, ZB_ROOT_LEVEL, ZB_ROOT_BLKID);
-       (void) traverse_visitbp(&td, NULL, NULL, td.td_rootbp, &czb);
+       (void) traverse_visitbp(&td, NULL, td.td_rootbp, &czb);
 
        mutex_enter(&td_main->td_pfd->pd_mtx);
        td_main->td_pfd->pd_exited = B_TRUE;
@@ -544,7 +535,7 @@ traverse_impl(spa_t *spa, dsl_dataset_t *ds, uint64_t objset, blkptr_t *rootbp,
 
        SET_BOOKMARK(czb, td->td_objset,
            ZB_ROOT_OBJECT, ZB_ROOT_LEVEL, ZB_ROOT_BLKID);
-       err = traverse_visitbp(td, NULL, NULL, rootbp, czb);
+       err = traverse_visitbp(td, NULL, rootbp, czb);
 
        mutex_enter(&pd->pd_mtx);
        pd->pd_cancel = B_TRUE;
ZFS development branch