From 9df12a23948bd40cbe37ce88d84e272c3894e675 Mon Sep 17 00:00:00 2001 From: sjelinek Date: Tue, 14 Mar 2006 10:47:05 -0800 Subject: 6221730 ufs_log mdb module needs to be merged with the ufs one Contributed by Richard Lowe --HG-- rename : usr/src/cmd/mdb/intel/amd64/ufs_log/Makefile => deleted_files/usr/src/cmd/mdb/intel/amd64/ufs_log/Makefile rename : usr/src/cmd/mdb/intel/ia32/ufs_log/Makefile => deleted_files/usr/src/cmd/mdb/intel/ia32/ufs_log/Makefile rename : usr/src/cmd/mdb/sparc/v9/ufs_log/Makefile => deleted_files/usr/src/cmd/mdb/sparc/v9/ufs_log/Makefile rename : usr/src/cmd/mdb/common/modules/ufs_log/ufs_log.c => usr/src/cmd/mdb/common/modules/ufs/ufs_log.c --- usr/src/cmd/mdb/Makefile.common | 8 +- usr/src/cmd/mdb/common/modules/ufs/ufs.c | 13 +- usr/src/cmd/mdb/common/modules/ufs/ufs_cmds.h | 48 +++++ usr/src/cmd/mdb/common/modules/ufs/ufs_log.c | 242 +++++++++++++++++++++ usr/src/cmd/mdb/common/modules/ufs_log/ufs_log.c | 260 ----------------------- usr/src/cmd/mdb/intel/amd64/ufs/Makefile | 9 +- usr/src/cmd/mdb/intel/amd64/ufs_log/Makefile | 36 ---- usr/src/cmd/mdb/intel/ia32/ufs/Makefile | 9 +- usr/src/cmd/mdb/intel/ia32/ufs_log/Makefile | 35 --- usr/src/cmd/mdb/sparc/v9/ufs/Makefile | 9 +- usr/src/cmd/mdb/sparc/v9/ufs_log/Makefile | 36 ---- usr/src/pkgdefs/SUNWmdb/prototype_i386 | 7 +- usr/src/pkgdefs/SUNWmdb/prototype_sparc | 1 - usr/src/pkgdefs/SUNWmdbr/prototype_i386 | 7 +- usr/src/pkgdefs/SUNWmdbr/prototype_sparc | 1 - usr/src/tools/scripts/bfu.sh | 8 + 16 files changed, 326 insertions(+), 403 deletions(-) create mode 100644 usr/src/cmd/mdb/common/modules/ufs/ufs_cmds.h create mode 100644 usr/src/cmd/mdb/common/modules/ufs/ufs_log.c delete mode 100644 usr/src/cmd/mdb/common/modules/ufs_log/ufs_log.c delete mode 100644 usr/src/cmd/mdb/intel/amd64/ufs_log/Makefile delete mode 100644 usr/src/cmd/mdb/intel/ia32/ufs_log/Makefile delete mode 100644 usr/src/cmd/mdb/sparc/v9/ufs_log/Makefile (limited to 'usr/src') diff --git a/usr/src/cmd/mdb/Makefile.common b/usr/src/cmd/mdb/Makefile.common index 01dbdd391a..e91e250f6b 100644 --- a/usr/src/cmd/mdb/Makefile.common +++ b/usr/src/cmd/mdb/Makefile.common @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -72,7 +71,6 @@ COMMON_MODULES_KVM = \ specfs \ sppp \ ufs \ - ufs_log \ usba \ zfs diff --git a/usr/src/cmd/mdb/common/modules/ufs/ufs.c b/usr/src/cmd/mdb/common/modules/ufs/ufs.c index 6d81d2acf0..d288718b7e 100644 --- a/usr/src/cmd/mdb/common/modules/ufs/ufs.c +++ b/usr/src/cmd/mdb/common/modules/ufs/ufs.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -34,6 +33,8 @@ #include #include +#include "ufs_cmds.h" + typedef struct inode_walk_data { int iw_inohsz; int iw_inohcnt; @@ -645,6 +646,8 @@ static const mdb_dcmd_t dcmds[] = { { "inode", ":[-v]", "display summarized inode_t", inode }, { "acl", ":", "given an inode, display its in core acl's", acl_dcmd }, { "cg", "?[-v]", "display a summarized cylinder group structure", cg }, + { "mapentry", ":", "dumps ufslog mapentry", mapentry_dcmd }, + { "mapstats", ":", "dumps ufslog stats", mapstats_dcmd }, { NULL } }; @@ -655,6 +658,8 @@ static const mdb_walker_t walkers[] = { acl_walk_init, acl_walk_step, acl_walk_fini }, { "cg", "walk cg's in bio buffer cache", cg_walk_init, cg_walk_step, NULL }, + { "ufslogmap", "walk map entries in a ufs_log mt_map", + ufslogmap_walk_init, ufslogmap_walk_step, NULL }, { NULL } }; diff --git a/usr/src/cmd/mdb/common/modules/ufs/ufs_cmds.h b/usr/src/cmd/mdb/common/modules/ufs/ufs_cmds.h new file mode 100644 index 0000000000..a77d95bbbf --- /dev/null +++ b/usr/src/cmd/mdb/common/modules/ufs/ufs_cmds.h @@ -0,0 +1,48 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + +#ifndef _UFS_CMDS_H +#define _UFS_CMDS_H + +#pragma ident "%Z%%M% %I% %E% SMI" + + + +#ifdef __cplusplus +extern "C" { +#endif + +extern int mapentry_dcmd(uintptr_t, uint_t, int, const mdb_arg_t *); +extern int mapstats_dcmd(uintptr_t, uint_t, int, const mdb_arg_t *); + +extern int ufslogmap_walk_init(mdb_walk_state_t *); +extern int ufslogmap_walk_step(mdb_walk_state_t *); + +#ifdef __cplusplus +} +#endif + +#endif /* _UFS_CMDS_H */ diff --git a/usr/src/cmd/mdb/common/modules/ufs/ufs_log.c b/usr/src/cmd/mdb/common/modules/ufs/ufs_log.c new file mode 100644 index 0000000000..742db1d0c0 --- /dev/null +++ b/usr/src/cmd/mdb/common/modules/ufs/ufs_log.c @@ -0,0 +1,242 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ +/* + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + +#pragma ident "%Z%%M% %I% %E% SMI" + +#include + +#include +#include +#include +#include +#include "ufs_cmds.h" + + +typedef struct ufslogmap_walk_data { + mapentry_t me; + mapentry_t *start_addr; + mapentry_t *prev_addr; +} ufslogmap_walk_data_t; + +/* + * Ensure we are started with a user specified address. + * We also allocate a ufslogmap_walk_data_t for storage, + * and save this using the walk_data pointer. + */ +int +ufslogmap_walk_init(mdb_walk_state_t *wsp) +{ + ufslogmap_walk_data_t *uw; + + if (wsp->walk_addr == NULL) { + mdb_warn("must specify an address\n"); + return (WALK_ERR); + } + + uw = mdb_zalloc(sizeof (ufslogmap_walk_data_t), UM_SLEEP | UM_GC); + + uw->start_addr = (mapentry_t *)wsp->walk_addr; + wsp->walk_data = uw; + return (WALK_NEXT); +} + +/* + * Routine to step through one element of the list. + */ +int +ufslogmap_walk_step(mdb_walk_state_t *wsp) +{ + ufslogmap_walk_data_t *uw = wsp->walk_data; + uintptr_t walk_addr = wsp->walk_addr; + + /* + * Read the mapentry at the current walk address + */ + if (mdb_vread(&uw->me, sizeof (mapentry_t), walk_addr) == -1) { + mdb_warn("failed to read mapentry_t at %p", walk_addr); + return (WALK_DONE); + } + + /* + * Check for empty list. + */ + if (uw->me.me_next == uw->me.me_prev) { + return (WALK_DONE); + } + + /* + * Check for end of list. + */ + if (uw->me.me_next == uw->start_addr) { + return (WALK_DONE); + } + + /* + * Check for proper linkage + */ + if (uw->prev_addr && (uw->me.me_prev != uw->prev_addr)) { + mdb_warn("invalid linkage mapentry_t at %p", walk_addr); + return (WALK_DONE); + } + uw->prev_addr = (mapentry_t *)walk_addr; + + /* + * Save next address and call callback with current address + */ + wsp->walk_addr = (uintptr_t)uw->me.me_next; + return (wsp->walk_callback(walk_addr, wsp->walk_data, + wsp->walk_cbdata)); +} + +static const char * +delta2str(delta_t delta_type) +{ + switch (delta_type) { + case DT_NONE: return ("none"); + case DT_SB: return ("sb"); + case DT_CG: return ("cg"); + case DT_SI: return ("si"); + case DT_AB: return ("ab"); + case DT_ABZERO: return ("abzero"); + case DT_DIR: return ("dir"); + case DT_INODE: return ("inode"); + case DT_FBI: return ("fbi"); + case DT_QR: return ("quota"); + case DT_COMMIT: return ("commit"); + case DT_CANCEL: return ("cancel"); + case DT_BOT: return ("trans"); + case DT_EOT: return ("etrans"); + case DT_UD: return ("udata"); + case DT_SUD: return ("sudata"); + case DT_SHAD: return ("shadow"); + default: return ("???"); + } +} + +/* ARGSUSED */ +int +mapentry_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) +{ + mapentry_t me; + + if (!(flags & DCMD_ADDRSPEC)) + return (DCMD_USAGE); + + if (DCMD_HDRSPEC(flags)) { + mdb_printf("%%?s %6s %8s %8s %s%\n", + "ADDR", "TYPE", "SIZE", "TRANS", "HANDLER"); + } + + if (mdb_vread(&me, sizeof (me), addr) == -1) { + mdb_warn("couldn't read ufslog mapentry at %p", addr); + return (DCMD_ABORT); + } + + /* + * Validate mapentry + */ + if (me.me_delta.d_typ >= DT_MAX) { + mdb_warn("Invalid delta type for mapentry at %p", addr); + return (DCMD_ABORT); + } + + mdb_printf("%0?p %6s %8x %8x %a\n", + addr, + delta2str(me.me_delta.d_typ), + me.me_delta.d_nb, + me.me_tid, + me.me_func); + + return (DCMD_OK); +} + +typedef struct { + uint64_t nentries; /* number of mapentries */ + uint64_t totalsize; /* total number of bytes */ + uint32_t transid; /* first transaction id */ + int transdiff; /* transaction different */ + uint32_t delta_cnt[DT_MAX]; /* count of each delta */ + uint64_t delta_sum[DT_MAX]; /* total number of bytes for delta */ +} mapstats_t; + +/* ARGSUSED */ +int +mapadd(uintptr_t *addr, ufslogmap_walk_data_t *uw, mapstats_t *msp) +{ + if (msp->nentries == 0) { + msp->transid = uw->me.me_tid; + } else { + if (msp->transid != uw->me.me_tid) { + msp->transdiff = TRUE; + } + } + msp->nentries++; + msp->totalsize += uw->me.me_nb; + if (uw->me.me_dt >= DT_MAX) { + mdb_warn("Invalid delta type for mapentry at %p", addr); + } else { + msp->delta_cnt[uw->me.me_dt]++; + msp->delta_sum[uw->me.me_dt] += uw->me.me_nb; + } + return (WALK_NEXT); +} + +/*ARGSUSED*/ +int +mapstats_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) +{ + mapstats_t *msp; + int i; + + if (!(flags & DCMD_ADDRSPEC)) + return (DCMD_USAGE); + + msp = mdb_zalloc(sizeof (mapstats_t), UM_SLEEP | UM_GC); + msp->transdiff = FALSE; + + if (mdb_pwalk("ufslogmap", (mdb_walk_cb_t)mapadd, msp, addr) == -1) { + mdb_warn("can't walk ufslogmap for stats"); + return (DCMD_ERR); + } + + mdb_printf("Number of entries 0x%llx\n", msp->nentries); + mdb_printf("Total map size 0x%llx\n", msp->totalsize); + if (msp->transdiff) { + mdb_printf("Multiple transactions\n"); + } else { + mdb_printf("All the same transaction id = %d\n", msp->transid); + } + if (msp->nentries) { + mdb_printf("%delta count(hex) avsize(hex)%\n"); + for (i = 0; i < DT_MAX; i++) { + if (msp->delta_cnt[i]) { + mdb_printf("%6s %10X %10X\n", + delta2str(i), msp->delta_cnt[i], + msp->delta_sum[i] / msp->delta_cnt[i]); + } + } + } + return (DCMD_OK); +} diff --git a/usr/src/cmd/mdb/common/modules/ufs_log/ufs_log.c b/usr/src/cmd/mdb/common/modules/ufs_log/ufs_log.c deleted file mode 100644 index aca9d48aa5..0000000000 --- a/usr/src/cmd/mdb/common/modules/ufs_log/ufs_log.c +++ /dev/null @@ -1,260 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include - -#include -#include -#include -#include - -typedef struct ufslogmap_walk_data { - mapentry_t me; - mapentry_t *start_addr; - mapentry_t *prev_addr; -} ufslogmap_walk_data_t; - -/* - * Ensure we are started with a user specified address. - * We also allocate a ufslogmap_walk_data_t for storage, - * and save this using the walk_data pointer. - */ -int -ufslogmap_walk_init(mdb_walk_state_t *wsp) -{ - ufslogmap_walk_data_t *uw; - - if (wsp->walk_addr == NULL) { - mdb_warn("must specify an address\n"); - return (WALK_ERR); - } - - uw = mdb_zalloc(sizeof (ufslogmap_walk_data_t), UM_SLEEP | UM_GC); - - uw->start_addr = (mapentry_t *)wsp->walk_addr; - wsp->walk_data = uw; - return (WALK_NEXT); -} - -/* - * Routine to step through one element of the list. - */ -int -ufslogmap_walk_step(mdb_walk_state_t *wsp) -{ - ufslogmap_walk_data_t *uw = wsp->walk_data; - uintptr_t walk_addr = wsp->walk_addr; - - /* - * Read the mapentry at the current walk address - */ - if (mdb_vread(&uw->me, sizeof (mapentry_t), walk_addr) == -1) { - mdb_warn("failed to read mapentry_t at %p", walk_addr); - return (WALK_DONE); - } - - /* - * Check for empty list. - */ - if (uw->me.me_next == uw->me.me_prev) { - return (WALK_DONE); - } - - /* - * Check for end of list. - */ - if (uw->me.me_next == uw->start_addr) { - return (WALK_DONE); - } - - /* - * Check for proper linkage - */ - if (uw->prev_addr && (uw->me.me_prev != uw->prev_addr)) { - mdb_warn("invalid linkage mapentry_t at %p", walk_addr); - return (WALK_DONE); - } - uw->prev_addr = (mapentry_t *)walk_addr; - - /* - * Save next address and call callback with current address - */ - wsp->walk_addr = (uintptr_t)uw->me.me_next; - return (wsp->walk_callback(walk_addr, wsp->walk_data, - wsp->walk_cbdata)); -} - -static const char * -delta2str(delta_t delta_type) -{ - switch (delta_type) { - case DT_NONE: return ("none"); - case DT_SB: return ("sb"); - case DT_CG: return ("cg"); - case DT_SI: return ("si"); - case DT_AB: return ("ab"); - case DT_ABZERO: return ("abzero"); - case DT_DIR: return ("dir"); - case DT_INODE: return ("inode"); - case DT_FBI: return ("fbi"); - case DT_QR: return ("quota"); - case DT_COMMIT: return ("commit"); - case DT_CANCEL: return ("cancel"); - case DT_BOT: return ("trans"); - case DT_EOT: return ("etrans"); - case DT_UD: return ("udata"); - case DT_SUD: return ("sudata"); - case DT_SHAD: return ("shadow"); - default: return ("???"); - } -} - -/* ARGSUSED */ -int -mapentry_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) -{ - mapentry_t me; - - if (!(flags & DCMD_ADDRSPEC)) - return (DCMD_USAGE); - - if (DCMD_HDRSPEC(flags)) { - mdb_printf("%%?s %6s %8s %8s %s%\n", - "ADDR", "TYPE", "SIZE", "TRANS", "HANDLER"); - } - - if (mdb_vread(&me, sizeof (me), addr) == -1) { - mdb_warn("couldn't read ufslog mapentry at %p", addr); - return (DCMD_ABORT); - } - - /* - * Validate mapentry - */ - if (me.me_delta.d_typ >= DT_MAX) { - mdb_warn("Invalid delta type for mapentry at %p", addr); - return (DCMD_ABORT); - } - - mdb_printf("%0?p %6s %8x %8x %a\n", - addr, - delta2str(me.me_delta.d_typ), - me.me_delta.d_nb, - me.me_tid, - me.me_func); - - return (DCMD_OK); -} - -typedef struct { - uint64_t nentries; /* number of mapentries */ - uint64_t totalsize; /* total number of bytes */ - uint32_t transid; /* first transaction id */ - int transdiff; /* transaction different */ - uint32_t delta_cnt[DT_MAX]; /* count of each delta */ - uint64_t delta_sum[DT_MAX]; /* total number of bytes for delta */ -} mapstats_t; - -/* ARGSUSED */ -int -mapadd(uintptr_t *addr, ufslogmap_walk_data_t *uw, mapstats_t *msp) -{ - if (msp->nentries == 0) { - msp->transid = uw->me.me_tid; - } else { - if (msp->transid != uw->me.me_tid) { - msp->transdiff = TRUE; - } - } - msp->nentries++; - msp->totalsize += uw->me.me_nb; - if (uw->me.me_dt >= DT_MAX) { - mdb_warn("Invalid delta type for mapentry at %p", addr); - } else { - msp->delta_cnt[uw->me.me_dt]++; - msp->delta_sum[uw->me.me_dt] += uw->me.me_nb; - } - return (WALK_NEXT); -} - -/*ARGSUSED*/ -int -mapstats_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) -{ - mapstats_t *msp; - int i; - - if (!(flags & DCMD_ADDRSPEC)) - return (DCMD_USAGE); - - msp = mdb_zalloc(sizeof (mapstats_t), UM_SLEEP | UM_GC); - msp->transdiff = FALSE; - - if (mdb_pwalk("ufslogmap", (mdb_walk_cb_t)mapadd, msp, addr) == -1) { - mdb_warn("can't walk ufslogmap for stats"); - return (DCMD_ERR); - } - - mdb_printf("Number of entries 0x%llx\n", msp->nentries); - mdb_printf("Total map size 0x%llx\n", msp->totalsize); - if (msp->transdiff) { - mdb_printf("Multiple transactions\n"); - } else { - mdb_printf("All the same transaction id = %d\n", msp->transid); - } - if (msp->nentries) { - mdb_printf("%delta count(hex) avsize(hex)%\n"); - for (i = 0; i < DT_MAX; i++) { - if (msp->delta_cnt[i]) { - mdb_printf("%6s %10X %10X\n", - delta2str(i), msp->delta_cnt[i], - msp->delta_sum[i] / msp->delta_cnt[i]); - } - } - } - return (DCMD_OK); -} - -static const mdb_walker_t walkers[] = { - { "ufslogmap", "walk map entries in a ufs_log mt_map", - ufslogmap_walk_init, ufslogmap_walk_step, NULL }, - { NULL } -}; -static const mdb_dcmd_t dcmds[] = { - { "mapentry", ":", "dumps ufslog mapentry", mapentry_dcmd }, - { "mapstats", ":", "dumps ufslog stats", mapstats_dcmd }, - { NULL } -}; - -static const mdb_modinfo_t modinfo = { MDB_API_VERSION, dcmds, walkers }; - -const mdb_modinfo_t * -_mdb_init(void) -{ - return (&modinfo); -} diff --git a/usr/src/cmd/mdb/intel/amd64/ufs/Makefile b/usr/src/cmd/mdb/intel/amd64/ufs/Makefile index 9cd9ff6664..ca03049662 100644 --- a/usr/src/cmd/mdb/intel/amd64/ufs/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/ufs/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -28,7 +27,7 @@ MODULE = ufs.so MDBTGT = kvm -MODSRCS = ufs.c +MODSRCS = ufs.c ufs_log.c include ../../../../Makefile.cmd include ../../../../Makefile.cmd.64 diff --git a/usr/src/cmd/mdb/intel/amd64/ufs_log/Makefile b/usr/src/cmd/mdb/intel/amd64/ufs_log/Makefile deleted file mode 100644 index 5243c1e5c0..0000000000 --- a/usr/src/cmd/mdb/intel/amd64/ufs_log/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "%Z%%M% %I% %E% SMI" - -MODULE = ufs_log.so -MDBTGT = kvm - -MODSRCS = ufs_log.c - -include ../../../../Makefile.cmd -include ../../../../Makefile.cmd.64 -include ../../Makefile.amd64 -include ../../../Makefile.module diff --git a/usr/src/cmd/mdb/intel/ia32/ufs/Makefile b/usr/src/cmd/mdb/intel/ia32/ufs/Makefile index 1ee7422467..212a14d9d4 100644 --- a/usr/src/cmd/mdb/intel/ia32/ufs/Makefile +++ b/usr/src/cmd/mdb/intel/ia32/ufs/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -28,7 +27,7 @@ MODULE = ufs.so MDBTGT = kvm -MODSRCS = ufs.c +MODSRCS = ufs.c ufs_log.c include ../../../../Makefile.cmd include ../../Makefile.ia32 diff --git a/usr/src/cmd/mdb/intel/ia32/ufs_log/Makefile b/usr/src/cmd/mdb/intel/ia32/ufs_log/Makefile deleted file mode 100644 index 97cc05f41e..0000000000 --- a/usr/src/cmd/mdb/intel/ia32/ufs_log/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. -# -#ident "%Z%%M% %I% %E% SMI" - -MODULE = ufs_log.so -MDBTGT = kvm - -MODSRCS = ufs_log.c - -include ../../../../Makefile.cmd -include ../../Makefile.ia32 -include ../../../Makefile.module diff --git a/usr/src/cmd/mdb/sparc/v9/ufs/Makefile b/usr/src/cmd/mdb/sparc/v9/ufs/Makefile index f967c85346..c48e4fc262 100644 --- a/usr/src/cmd/mdb/sparc/v9/ufs/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/ufs/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -28,7 +27,7 @@ MODULE = ufs.so MDBTGT = kvm -MODSRCS = ufs.c +MODSRCS = ufs.c ufs_log.c include ../../../../Makefile.cmd include ../../../../Makefile.cmd.64 diff --git a/usr/src/cmd/mdb/sparc/v9/ufs_log/Makefile b/usr/src/cmd/mdb/sparc/v9/ufs_log/Makefile deleted file mode 100644 index b070553d3b..0000000000 --- a/usr/src/cmd/mdb/sparc/v9/ufs_log/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. -# -#ident "%Z%%M% %I% %E% SMI" - -MODULE = ufs_log.so -MDBTGT = kvm - -MODSRCS = ufs_log.c - -include ../../../../Makefile.cmd -include ../../../../Makefile.cmd.64 -include ../../Makefile.sparcv9 -include ../../../Makefile.module diff --git a/usr/src/pkgdefs/SUNWmdb/prototype_i386 b/usr/src/pkgdefs/SUNWmdb/prototype_i386 index e1e2cb7c8d..7a1fb04fd3 100644 --- a/usr/src/pkgdefs/SUNWmdb/prototype_i386 +++ b/usr/src/pkgdefs/SUNWmdb/prototype_i386 @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -70,7 +69,6 @@ f none usr/lib/mdb/kvm/amd64/sctp.so 555 root sys f none usr/lib/mdb/kvm/amd64/specfs.so 555 root sys f none usr/lib/mdb/kvm/amd64/sppp.so 555 root sys f none usr/lib/mdb/kvm/amd64/ufs.so 555 root sys -f none usr/lib/mdb/kvm/amd64/ufs_log.so 555 root sys f none usr/lib/mdb/kvm/amd64/uhci.so 555 root sys f none usr/lib/mdb/kvm/amd64/usba.so 555 root sys f none usr/lib/mdb/kvm/audiosup.so 555 root sys @@ -95,7 +93,6 @@ f none usr/lib/mdb/kvm/sctp.so 555 root sys f none usr/lib/mdb/kvm/specfs.so 555 root sys f none usr/lib/mdb/kvm/sppp.so 555 root sys f none usr/lib/mdb/kvm/ufs.so 555 root sys -f none usr/lib/mdb/kvm/ufs_log.so 555 root sys f none usr/lib/mdb/kvm/uhci.so 555 root sys f none usr/lib/mdb/kvm/usba.so 555 root sys d none usr/lib/mdb/proc/amd64 755 root bin diff --git a/usr/src/pkgdefs/SUNWmdb/prototype_sparc b/usr/src/pkgdefs/SUNWmdb/prototype_sparc index 623ac1196e..0a24c3f4b3 100644 --- a/usr/src/pkgdefs/SUNWmdb/prototype_sparc +++ b/usr/src/pkgdefs/SUNWmdb/prototype_sparc @@ -67,7 +67,6 @@ f none usr/lib/mdb/kvm/sparcv9/sppp.so 555 root sys f none usr/lib/mdb/kvm/sparcv9/sd.so 555 root sys f none usr/lib/mdb/kvm/sparcv9/ssd.so 555 root sys f none usr/lib/mdb/kvm/sparcv9/ufs.so 555 root sys -f none usr/lib/mdb/kvm/sparcv9/ufs_log.so 555 root sys f none usr/lib/mdb/kvm/sparcv9/usba.so 555 root sys d none usr/lib/mdb/proc/sparcv9 755 root sys f none usr/lib/mdb/proc/sparcv9/libavl.so 555 root sys diff --git a/usr/src/pkgdefs/SUNWmdbr/prototype_i386 b/usr/src/pkgdefs/SUNWmdbr/prototype_i386 index 07fe248387..bd9ea07f75 100644 --- a/usr/src/pkgdefs/SUNWmdbr/prototype_i386 +++ b/usr/src/pkgdefs/SUNWmdbr/prototype_i386 @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -51,7 +50,6 @@ f none kernel/kmdb/amd64/sctp 555 root sys f none kernel/kmdb/amd64/specfs 555 root sys f none kernel/kmdb/amd64/sppp 555 root sys f none kernel/kmdb/amd64/ufs 555 root sys -f none kernel/kmdb/amd64/ufs_log 555 root sys f none kernel/kmdb/amd64/uhci 555 root sys f none kernel/kmdb/amd64/usba 555 root sys f none kernel/kmdb/audiosup 555 root sys @@ -76,7 +74,6 @@ f none kernel/kmdb/sctp 555 root sys f none kernel/kmdb/specfs 555 root sys f none kernel/kmdb/sppp 555 root sys f none kernel/kmdb/ufs 555 root sys -f none kernel/kmdb/ufs_log 555 root sys f none kernel/kmdb/uhci 555 root sys f none kernel/kmdb/usba 555 root sys diff --git a/usr/src/pkgdefs/SUNWmdbr/prototype_sparc b/usr/src/pkgdefs/SUNWmdbr/prototype_sparc index e8d71ee64f..d08979e697 100644 --- a/usr/src/pkgdefs/SUNWmdbr/prototype_sparc +++ b/usr/src/pkgdefs/SUNWmdbr/prototype_sparc @@ -57,7 +57,6 @@ f none kernel/kmdb/sparcv9/specfs 555 root sys f none kernel/kmdb/sparcv9/sppp 555 root sys f none kernel/kmdb/sparcv9/ssd 555 root sys f none kernel/kmdb/sparcv9/ufs 555 root sys -f none kernel/kmdb/sparcv9/ufs_log 555 root sys f none kernel/kmdb/sparcv9/usba 555 root sys # d none platform 755 root sys diff --git a/usr/src/tools/scripts/bfu.sh b/usr/src/tools/scripts/bfu.sh index 257cfecc2d..2e88cadc5c 100644 --- a/usr/src/tools/scripts/bfu.sh +++ b/usr/src/tools/scripts/bfu.sh @@ -5749,6 +5749,14 @@ mondo_loop() { rm -f $rootprefix/kernel/misc/ufs_log rm -f $rootprefix/kernel/misc/sparcv9/ufs_log + #Remove ufs_log mdb/kmdb modules - now merged in to ufs module + rm -f $rootprefix/kernel/kmdb/ufs_log + rm -f $rootprefix/kernel/kmdb/sparcv9/ufs_log + rm -f $rootprefix/kernel/kmdb/amd64/ufs_log + rm -f $rootprefix/usr/lib/mdb/kvm/ufs_log.so + rm -f $rootprefix/usr/lib/mdb/kvm/sparcv9/ufs_log.so + rm -f $rootprefix/usr/lib/mdb/kvm/amd64/ufs_log.so + #Remove diskmgtd. If backward BFU, will get re-installed from #archive. rm -f $usr/lib/diskmgtd -- cgit v1.2.3