diff options
| author | Mark Shellenbaum <Mark.Shellenbaum@Sun.COM> | 2010-03-18 18:06:26 -0600 |
|---|---|---|
| committer | Mark Shellenbaum <Mark.Shellenbaum@Sun.COM> | 2010-03-18 18:06:26 -0600 |
| commit | 4223fc7cdcf5a51019f631eec2b4217ddf736451 (patch) | |
| tree | 9bc63c9013134cd54695bbe5b718ba368ba8c817 /usr/src | |
| parent | 8dfac0426f920a592a390910fd9ecb8257c4749f (diff) | |
| download | illumos-joyent-4223fc7cdcf5a51019f631eec2b4217ddf736451.tar.gz | |
6936265 mismerge in zfs mdb module
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/mdb/common/modules/zfs/zfs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr/src/cmd/mdb/common/modules/zfs/zfs.c b/usr/src/cmd/mdb/common/modules/zfs/zfs.c index 44cef5aa6f..13733d6834 100644 --- a/usr/src/cmd/mdb/common/modules/zfs/zfs.c +++ b/usr/src/cmd/mdb/common/modules/zfs/zfs.c @@ -219,7 +219,7 @@ static int objset_name(uintptr_t addr, char *buf) { static int gotid; - static mdb_ctf_id_t osi_id, ds_id; + static mdb_ctf_id_t os_id, ds_id; uintptr_t os_dsl_dataset; char ds_snapname[MAXNAMELEN]; uintptr_t ds_dir; @@ -227,9 +227,9 @@ objset_name(uintptr_t addr, char *buf) buf[0] = '\0'; if (!gotid) { - if (mdb_ctf_lookup_by_name("struct objset_impl", - &osi_id) == -1) { - mdb_warn("couldn't find struct objset_impl"); + if (mdb_ctf_lookup_by_name("struct objset", + &os_id) == -1) { + mdb_warn("couldn't find struct objset"); return (DCMD_ERR); } if (mdb_ctf_lookup_by_name("struct dsl_dataset", @@ -241,7 +241,7 @@ objset_name(uintptr_t addr, char *buf) gotid = TRUE; } - if (GETMEMBID(addr, &osi_id, os_dsl_dataset, os_dsl_dataset)) + if (GETMEMBID(addr, &os_id, os_dsl_dataset, os_dsl_dataset)) return (DCMD_ERR); if (os_dsl_dataset == 0) { @@ -2902,7 +2902,7 @@ static const mdb_dcmd_t dcmds[] = { { "dbuf", ":", "print dmu_buf_impl_t", dbuf }, { "dbuf_stats", ":", "dbuf stats", dbuf_stats }, { "dbufs", - "\t[-O objset_impl_t*] [-n objset_name | \"mos\"] " + "\t[-O objset_t*] [-n objset_name | \"mos\"] " "[-o object | \"mdn\"] \n" "\t[-l level] [-b blkid | \"bonus\"]", "find dmu_buf_impl_t's that match specified criteria", dbufs }, |