From dee140df5444b21d7034d3c528e68f193f96244c Mon Sep 17 00:00:00 2001 From: Matthew Ahrens Date: Sat, 30 Nov 2013 15:59:02 -0500 Subject: 4366 ::walk zio and ::zio_state are broken Reviewed by: Christopher Siden Reviewed by: Adam Leventhal Approved by: Gordon Ross --- usr/src/cmd/mdb/common/modules/zfs/zfs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'usr/src/cmd/mdb/common/modules/zfs/zfs.c') 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 */ -- cgit v1.2.3