summaryrefslogtreecommitdiff
path: root/usr/src/cmd/mdb/common/modules/zfs/zfs.c
diff options
context:
space:
mode:
authorMatthew Ahrens <mahrens@delphix.com>2013-11-30 15:59:02 -0500
committerChristopher Siden <chris.siden@delphix.com>2013-11-30 15:59:02 -0500
commitdee140df5444b21d7034d3c528e68f193f96244c (patch)
tree40ad316b23ca404bdbd5bf49db4bde3cb5759232 /usr/src/cmd/mdb/common/modules/zfs/zfs.c
parenta0b60564dfc644f4bfaef1ce26d343b44cf68bc5 (diff)
downloadillumos-gate-dee140df5444b21d7034d3c528e68f193f96244c.tar.gz
4366 ::walk zio and ::zio_state are broken
Reviewed by: Christopher Siden <christopher.siden@delphix.com> Reviewed by: Adam Leventhal <ahl@delphix.com> Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src/cmd/mdb/common/modules/zfs/zfs.c')
-rw-r--r--usr/src/cmd/mdb/common/modules/zfs/zfs.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr/src/cmd/mdb/common/modules/zfs/zfs.c b/usr/src/cmd/mdb/common/modules/zfs/zfs.c
index fec47649db..255656a9b7 100644
--- a/usr/src/cmd/mdb/common/modules/zfs/zfs.c
+++ b/usr/src/cmd/mdb/common/modules/zfs/zfs.c
@@ -2077,7 +2077,7 @@ spa_walk_step(mdb_walk_state_t *wsp)
static int
zio_walk_init(mdb_walk_state_t *wsp)
{
- wsp->walk_data = &wsp->walk_addr;
+ wsp->walk_data = (void *)wsp->walk_addr;
if (mdb_layered_walk("zio_cache", wsp) == -1) {
mdb_warn("failed to walk 'zio_cache'\n");
@@ -2091,13 +2091,13 @@ static int
zio_walk_step(mdb_walk_state_t *wsp)
{
mdb_zio_t zio;
- uintptr_t *spap = wsp->walk_data;
+ uintptr_t spa = (uintptr_t)wsp->walk_data;
if (mdb_ctf_vread(&zio, ZFS_STRUCT "zio", "mdb_zio_t",
wsp->walk_addr, 0) == -1)
return (WALK_ERR);
- if (*spap != 0 && *spap != zio.io_spa)
+ if (spa != 0 && spa != zio.io_spa)
return (WALK_NEXT);
return (wsp->walk_callback(wsp->walk_addr, &zio, wsp->walk_cbdata));
@@ -2112,13 +2112,13 @@ static int
zio_walk_root_step(mdb_walk_state_t *wsp)
{
mdb_zio_t zio;
- uintptr_t *spap = wsp->walk_data;
+ uintptr_t spa = (uintptr_t)wsp->walk_data;
if (mdb_ctf_vread(&zio, ZFS_STRUCT "zio", "mdb_zio_t",
wsp->walk_addr, 0) == -1)
return (WALK_ERR);
- if (*spap != 0 && *spap != zio.io_spa)
+ if (spa != 0 && spa != zio.io_spa)
return (WALK_NEXT);
/* If the parent list is not empty, ignore */