diff options
| author | George Wilson <[email protected]> | 2013-07-02 13:26:24 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-07-02 13:34:31 -0700 |
| commit | 294f68063b49c06d3118d51016811063e69cf97a (patch) | |
| tree | 2450bfc2356c54752214fb11fad14766c6c1ddb1 /module/zfs/dmu_diff.c | |
| parent | 96b89346c074516a9bb130907646814208035ca8 (diff) | |
Illumos #3498 panic in arc_read()
3498 panic in arc_read(): !refcount_is_zero(&pbuf->b_hdr->b_refcnt)
Reviewed by: Adam Leventhal <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Approved by: Richard Lowe <[email protected]>
References:
illumos/illumos-gate@1b912ec7100c10e7243bf0879af0fe580e08c73d
https://www.illumos.org/issues/3498
Ported-by: Brian Behlendorf <[email protected]>
Closes #1249
Diffstat (limited to 'module/zfs/dmu_diff.c')
| -rw-r--r-- | module/zfs/dmu_diff.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/module/zfs/dmu_diff.c b/module/zfs/dmu_diff.c index 22340ebc5..dc237780c 100644 --- a/module/zfs/dmu_diff.c +++ b/module/zfs/dmu_diff.c @@ -105,7 +105,7 @@ report_dnode(struct diffarg *da, uint64_t object, dnode_phys_t *dnp) /* ARGSUSED */ static int -diff_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, arc_buf_t *pbuf, +diff_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg) { struct diffarg *da = arg; @@ -132,9 +132,9 @@ diff_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, arc_buf_t *pbuf, int blksz = BP_GET_LSIZE(bp); int i; - 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; |