git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Illumos #3498 panic in arc_read()
[zfs.git]
/
module
/
zfs
/
dmu_diff.c
diff --git
a/module/zfs/dmu_diff.c
b/module/zfs/dmu_diff.c
index
22340eb
..
dc23778
100644
(file)
--- 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
/* 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;
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;
int blksz = BP_GET_LSIZE(bp);
int i;
- if (
dsl_read(NULL, spa, bp, p
buf,
-
arc_getbuf_func, &abuf, ZIO_PRIORITY_ASYNC_READ
,
-
ZIO_FLAG_CANFAIL,
&aflags, zb) != 0)
+ if (
arc_read(NULL, spa, bp, arc_getbuf_func, &a
buf,
+
ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL
,
+ &aflags, zb) != 0)
return (EIO);
blk = abuf->b_data;
return (EIO);
blk = abuf->b_data;