Date: Mon, 31 Oct 2005 19:19:20 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 86120 for review Message-ID: <200510311919.j9VJJKKs074025@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=86120 Change 86120 by rwatson@rwatson_zoo on 2005/10/31 19:18:39 Integrate netsmp branch. Primarily memory type renaming. Affected files ... .. //depot/projects/netsmp/src/sys/alpha/alpha/pmap.c#4 integrate .. //depot/projects/netsmp/src/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/netsmp/src/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/netsmp/src/sys/coda/coda_vfsops.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/aac/aac.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpi_pci_link.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-all.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-raid.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ata/atapi-cd.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/md/md.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/twa/tw_osl_freebsd.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/netsmp/src/sys/fs/msdosfs/msdosfs_denode.c#3 integrate .. //depot/projects/netsmp/src/sys/fs/msdosfs/msdosfs_fileno.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/netsmp/src/sys/fs/ntfs/ntfs_ihash.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/ntfs/ntfs_vfsops.c#4 integrate .. //depot/projects/netsmp/src/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/netsmp/src/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/nwfs/nwfs_subr.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/smbfs/smbfs_subr.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/smbfs/smbfs_vfsops.c#3 integrate .. //depot/projects/netsmp/src/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/netsmp/src/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/umapfs/umap_vfsops.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/gate/g_gate.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/netsmp/src/sys/geom/shsec/g_shsec.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/stripe/g_stripe.c#3 integrate .. //depot/projects/netsmp/src/sys/geom/uzip/g_uzip.c#3 integrate .. //depot/projects/netsmp/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/netsmp/src/sys/gnu/fs/reiserfs/reiserfs_namei.c#3 integrate .. //depot/projects/netsmp/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/netsmp/src/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/netsmp/src/sys/i386/i386/io_apic.c#3 integrate .. //depot/projects/netsmp/src/sys/i386/i386/mptable.c#2 integrate .. //depot/projects/netsmp/src/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/sscdisk.c#2 integrate .. //depot/projects/netsmp/src/sys/isofs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/inflate.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_cluster.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_export.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_hash.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/netsmp/src/sys/libkern/iconv.c#4 integrate .. //depot/projects/netsmp/src/sys/netatm/ipatm/ipatm_if.c#3 integrate .. //depot/projects/netsmp/src/sys/netgraph/atm/uni/ng_uni.c#3 integrate .. //depot/projects/netsmp/src/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/netsmp/src/sys/netkey/keydb.c#2 integrate .. //depot/projects/netsmp/src/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/netsmp/src/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/netsmp/src/sys/nfs4client/nfs4_dev.c#2 integrate .. //depot/projects/netsmp/src/sys/nfsclient/nfs_lock.c#3 integrate .. //depot/projects/netsmp/src/sys/nfsclient/nfs_nfsiod.c#2 integrate .. //depot/projects/netsmp/src/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/netsmp/src/sys/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/netsmp/src/sys/pci/viapm.c#2 integrate .. //depot/projects/netsmp/src/sys/powerpc/powerpc/locore.S#2 integrate .. //depot/projects/netsmp/src/sys/powerpc/powerpc/ofw_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/netsmp/src/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/netsmp/src/sys/ufs/ufs/ufs_dirhash.c#3 integrate .. //depot/projects/netsmp/src/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/netsmp/src/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/netsmp/src/sys/vm/vm_pager.c#3 integrate Differences ... ==== //depot/projects/netsmp/src/sys/alpha/alpha/pmap.c#4 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.180 2005/10/21 19:42:42 ade Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.181 2005/10/31 16:14:07 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -2172,13 +2172,6 @@ continue; } -#if defined(PMAP_DIAGNOSTIC) - if (!pv->pv_pmap) { - printf("Null pmap (cb) at va: 0x%lx\n", pv->pv_va); - continue; - } -#endif - PMAP_LOCK(pv->pv_pmap); pte = pmap_lev3pte(pv->pv_pmap, pv->pv_va); ==== //depot/projects/netsmp/src/sys/amd64/acpica/madt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.17 2005/09/11 18:39:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.18 2005/10/31 15:41:17 rwatson Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -74,7 +74,7 @@ static vm_paddr_t madt_physaddr; static vm_offset_t madt_length; -MALLOC_DEFINE(M_MADT, "MADT Table", "ACPI MADT Table Items"); +MALLOC_DEFINE(M_MADT, "madt_table", "ACPI MADT Table Items"); static enum intr_polarity interrupt_polarity(UINT16 Polarity, UINT8 Source); static enum intr_trigger interrupt_trigger(UINT16 TriggerMode, UINT8 Source); ==== //depot/projects/netsmp/src/sys/amd64/amd64/io_apic.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.16 2005/10/26 22:32:30 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.17 2005/10/31 15:41:17 rwatson Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -65,7 +65,7 @@ #define TODO printf("%s: not implemented!\n", __func__) -static MALLOC_DEFINE(M_IOAPIC, "I/O APIC", "I/O APIC structures"); +static MALLOC_DEFINE(M_IOAPIC, "ioapic", "I/O APIC structures"); /* * New interrupt support code.. ==== //depot/projects/netsmp/src/sys/amd64/amd64/mptable.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.236 2005/04/15 18:44:53 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.237 2005/10/31 15:41:17 rwatson Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -141,7 +141,7 @@ static int mptable_nioapics, mptable_nbusses, mptable_maxbusid; static int pci0 = -1; -static MALLOC_DEFINE(M_MPTABLE, "MP Table", "MP Table Items"); +static MALLOC_DEFINE(M_MPTABLE, "mptable", "MP Table Items"); static enum intr_polarity conforming_polarity(u_char src_bus, u_char src_bus_irq); ==== //depot/projects/netsmp/src/sys/amd64/amd64/pmap.c#8 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.529 2005/10/21 19:42:42 ade Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.530 2005/10/30 20:47:42 alc Exp $"); /* * Manages physical address maps. @@ -597,28 +597,8 @@ * Low level helper routines..... ***************************************************/ -#if defined(PMAP_DIAGNOSTIC) /* - * This code checks for non-writeable/modified pages. - * This should be an invalid condition. - */ -static int -pmap_nw_modified(pt_entry_t ptea) -{ - int pte; - - pte = (int) ptea; - - if ((pte & (PG_M|PG_RW)) == PG_M) - return 1; - else - return 0; -} -#endif - - -/* * this routine defines the region(s) of memory that should * not be tested for the modified bit. */ @@ -1543,13 +1523,9 @@ if (oldpte & PG_MANAGED) { m = PHYS_TO_VM_PAGE(oldpte & PG_FRAME); if (oldpte & PG_M) { -#if defined(PMAP_DIAGNOSTIC) - if (pmap_nw_modified((pt_entry_t) oldpte)) { - printf( - "pmap_remove: modified page not writable: va: 0x%lx, pte: 0x%lx\n", - va, oldpte); - } -#endif + KASSERT((oldpte & PG_RW), + ("pmap_remove_pte: modified page not writable: va: 0x%lx, pte: 0x%lx", + va, oldpte)); if (pmap_track_modified(va)) vm_page_dirty(m); } @@ -1728,13 +1704,9 @@ * Update the vm_page_t clean and reference bits. */ if (tpte & PG_M) { -#if defined(PMAP_DIAGNOSTIC) - if (pmap_nw_modified((pt_entry_t) tpte)) { - printf( - "pmap_remove_all: modified page not writable: va: 0x%lx, pte: 0x%lx\n", - pv->pv_va, tpte); - } -#endif + KASSERT((tpte & PG_RW), + ("pmap_remove_all: modified page not writable: va: 0x%lx, pte: 0x%lx", + pv->pv_va, tpte)); if (pmap_track_modified(pv->pv_va)) vm_page_dirty(m); } @@ -2021,8 +1993,8 @@ } if (origpte & PG_M) { KASSERT((origpte & PG_RW), - ("pmap_enter: modified page not writable:" - " va: 0x%lx, pte: 0x%lx", va, origpte)); + ("pmap_enter: modified page not writable: va: 0x%lx, pte: 0x%lx", + va, origpte)); if ((origpte & PG_MANAGED) && pmap_track_modified(va)) vm_page_dirty(om); ==== //depot/projects/netsmp/src/sys/arm/arm/vm_machdep.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.18 2005/10/03 14:16:41 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.19 2005/10/31 15:41:17 rwatson Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -378,7 +378,7 @@ struct mtx smallalloc_mtx; -MALLOC_DEFINE(M_VMSMALLALLOC, "VM Small alloc", "VM Small alloc data"); +MALLOC_DEFINE(M_VMSMALLALLOC, "vm_small_alloc", "VM Small alloc data"); vm_offset_t alloc_curaddr; vm_offset_t alloc_firstaddr; ==== //depot/projects/netsmp/src/sys/coda/coda_vfsops.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.59 2005/03/24 07:39:03 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.60 2005/10/31 15:41:17 rwatson Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -60,7 +60,7 @@ #include <coda/coda_subr.h> #include <coda/coda_opstats.h> -MALLOC_DEFINE(M_CODA, "CODA storage", "Various Coda Structures"); +MALLOC_DEFINE(M_CODA, "coda", "Various Coda Structures"); int codadebug = 0; int coda_vfsop_print_entry = 0; ==== //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.1.1.1 2005/04/25 18:15:15 darrenr Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.2 2005/10/31 15:41:17 rwatson Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -112,7 +112,7 @@ #endif # ifdef IPFILTER_M_IPFILTER -MALLOC_DEFINE(M_IPFILTER, "IP Filter", "IP Filter packet filter data structures"); +MALLOC_DEFINE(M_IPFILTER, "ipfilter", "IP Filter packet filter data structures"); # endif ==== //depot/projects/netsmp/src/sys/dev/aac/aac.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.114 2005/10/14 16:22:45 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.115 2005/10/31 00:12:19 csjp Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -3428,6 +3428,7 @@ device_t child; int i, found, error; + mtx_lock(&sc->aac_io_lock); aac_alloc_sync_fib(sc, &fib); c_cmd = (struct aac_ctcfg *)&fib->data[0]; bzero(c_cmd, sizeof(struct aac_ctcfg)); @@ -3442,6 +3443,7 @@ device_printf(sc->aac_dev, "Error %d sending " "VM_ContainerConfig command\n", error); aac_release_sync_fib(sc); + mtx_unlock(&sc->aac_io_lock); return; } @@ -3450,6 +3452,7 @@ device_printf(sc->aac_dev, "VM_ContainerConfig returned 0x%x\n", c_resp->Status); aac_release_sync_fib(sc); + mtx_unlock(&sc->aac_io_lock); return; } @@ -3470,6 +3473,7 @@ device_printf(sc->aac_dev, "Error %d sending VMIoctl command\n", error); aac_release_sync_fib(sc); + mtx_unlock(&sc->aac_io_lock); return; } @@ -3478,11 +3482,13 @@ device_printf(sc->aac_dev, "VM_Ioctl returned %d\n", vmi_resp->Status); aac_release_sync_fib(sc); + mtx_unlock(&sc->aac_io_lock); return; } bcopy(&vmi_resp->BusInf, &businfo, sizeof(struct aac_getbusinf)); aac_release_sync_fib(sc); + mtx_unlock(&sc->aac_io_lock); found = 0; for (i = 0; i < businfo.BusCount; i++) { ==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_pci_link.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.46 2005/09/11 18:39:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.47 2005/10/31 15:41:18 rwatson Exp $"); #include "opt_acpi.h" #include <sys/param.h> @@ -119,7 +119,7 @@ int link_index; }; -MALLOC_DEFINE(M_PCI_LINK, "PCI Link", "ACPI PCI Link structures"); +MALLOC_DEFINE(M_PCI_LINK, "pci_link", "ACPI PCI Link structures"); static int pci_link_interrupt_weights[NUM_ACPI_INTERRUPTS]; static int pci_link_bios_isa_irqs; ==== //depot/projects/netsmp/src/sys/dev/ata/ata-all.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.258 2005/10/27 16:32:39 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.259 2005/10/31 15:41:18 rwatson Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -73,7 +73,7 @@ static void bpack(int8_t *, int8_t *, int); /* global vars */ -MALLOC_DEFINE(M_ATA, "ATA generic", "ATA driver generic layer"); +MALLOC_DEFINE(M_ATA, "ata_generic", "ATA driver generic layer"); int (*ata_raid_ioctl_func)(u_long cmd, caddr_t data) = NULL; devclass_t ata_devclass; uma_zone_t ata_request_zone; ==== //depot/projects/netsmp/src/sys/dev/ata/ata-disk.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.190 2005/08/17 15:00:33 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.191 2005/10/31 15:41:18 rwatson Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -65,7 +65,7 @@ static dumper_t ad_dump; /* local vars */ -static MALLOC_DEFINE(M_AD, "AD driver", "ATA disk driver"); +static MALLOC_DEFINE(M_AD, "ad_driver", "ATA disk driver"); static int ad_probe(device_t dev) ==== //depot/projects/netsmp/src/sys/dev/ata/ata-dma.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.138 2005/10/06 15:44:07 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.139 2005/10/31 15:41:18 rwatson Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -54,7 +54,7 @@ static int ata_dmaunload(device_t); /* local vars */ -static MALLOC_DEFINE(M_ATADMA, "ATA DMA", "ATA driver DMA"); +static MALLOC_DEFINE(M_ATADMA, "ata_dma", "ATA driver DMA"); /* misc defines */ #define MAXTABSZ PAGE_SIZE ==== //depot/projects/netsmp/src/sys/dev/ata/ata-pci.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.106 2005/10/12 20:00:26 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.107 2005/10/31 15:41:18 rwatson Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -54,7 +54,7 @@ #include <ata_if.h> /* local vars */ -static MALLOC_DEFINE(M_ATAPCI, "ATA PCI", "ATA driver PCI"); +static MALLOC_DEFINE(M_ATAPCI, "ata_pci", "ATA driver PCI"); /* misc defines */ #define IOMASK 0xfffffffc ==== //depot/projects/netsmp/src/sys/dev/ata/ata-raid.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.102 2005/10/13 08:05:21 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.103 2005/10/31 15:41:18 rwatson Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -101,7 +101,7 @@ /* internal vars */ static struct ar_softc *ata_raid_arrays[MAX_ARRAYS]; -static MALLOC_DEFINE(M_AR, "AR driver", "ATA PseudoRAID driver"); +static MALLOC_DEFINE(M_AR, "ar_driver", "ATA PseudoRAID driver"); static devclass_t ata_raid_sub_devclass; static int testing = 0; ==== //depot/projects/netsmp/src/sys/dev/ata/atapi-cam.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.42 2005/05/16 13:07:27 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.43 2005/10/31 15:41:18 rwatson Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -115,7 +115,7 @@ static void free_hcb(struct atapi_hcb *hcb); static void free_softc(struct atapi_xpt_softc *scp); -static MALLOC_DEFINE(M_ATACAM, "ATA CAM transport", "ATA driver CAM-XPT layer"); +static MALLOC_DEFINE(M_ATACAM, "ata_cam", "ATA driver CAM-XPT layer"); static device_method_t atapi_cam_methods[] = { DEVMETHOD(device_identify, atapi_cam_identify), ==== //depot/projects/netsmp/src/sys/dev/ata/atapi-cd.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.183 2005/10/28 21:41:42 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.184 2005/10/31 15:41:18 rwatson Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -94,7 +94,7 @@ static int acd_test_ready(device_t); /* internal vars */ -static MALLOC_DEFINE(M_ACD, "ACD driver", "ATAPI CD driver buffers"); +static MALLOC_DEFINE(M_ACD, "acd_driver", "ATAPI CD driver buffers"); static struct g_class acd_class = { .name = "ACD", .version = G_VERSION, ==== //depot/projects/netsmp/src/sys/dev/ata/atapi-fd.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.102 2005/05/16 13:07:27 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.103 2005/10/31 15:41:18 rwatson Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -61,7 +61,7 @@ static int afd_test_ready(device_t); /* internal vars */ -static MALLOC_DEFINE(M_AFD, "AFD driver", "ATAPI floppy driver buffers"); +static MALLOC_DEFINE(M_AFD, "afd_driver", "ATAPI floppy driver buffers"); static int afd_probe(device_t dev) ==== //depot/projects/netsmp/src/sys/dev/ata/atapi-tape.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.99 2005/05/16 13:07:27 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.100 2005/10/31 15:41:18 rwatson Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -85,7 +85,7 @@ /* internal vars */ static u_int64_t ast_total = 0; -static MALLOC_DEFINE(M_AST, "AST driver", "ATAPI tape driver buffers"); +static MALLOC_DEFINE(M_AST, "ast_driver", "ATAPI tape driver buffers"); static int ast_probe(device_t dev) ==== //depot/projects/netsmp/src/sys/dev/md/md.c#6 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.158 2005/10/06 19:47:04 phk Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.159 2005/10/31 15:41:19 rwatson Exp $ * */ @@ -94,8 +94,8 @@ #define MD_NSECT (10000 * 2) #endif -static MALLOC_DEFINE(M_MD, "MD disk", "Memory Disk"); -static MALLOC_DEFINE(M_MDSECT, "MD sectors", "Memory Disk Sectors"); +static MALLOC_DEFINE(M_MD, "md_disk", "Memory Disk"); +static MALLOC_DEFINE(M_MDSECT, "md_sectors", "Memory Disk Sectors"); static int md_debug; SYSCTL_INT(_debug, OID_AUTO, mddebug, CTLFLAG_RW, &md_debug, 0, ""); ==== //depot/projects/netsmp/src/sys/dev/ofw/ofw_disk.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_disk.c,v 1.17 2005/01/06 01:43:00 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_disk.c,v 1.18 2005/10/31 03:09:38 grehan Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -82,6 +82,7 @@ u_int r; r = OF_seek(sc->ofwd_instance, bp->bio_offset); + switch (bp->bio_cmd) { case BIO_READ: r = OF_read(sc->ofwd_instance, (void *)bp->bio_data, @@ -164,7 +165,7 @@ bioq_init(&sc->ofwd_bio_queue); mtx_init(&sc->ofwd_queue_mtx, "ofwd bio queue", NULL, MTX_DEF); sc->ofwd_instance = ifd; - sc->ofwd_mediasize = (off_t)2*33554432 * OFWD_BLOCKSIZE; + sc->ofwd_mediasize = (off_t)2*33554432; sc->ofwd_sectorsize = OFWD_BLOCKSIZE; sc->ofwd_fwsectors = 0; sc->ofwd_fwheads = 0; ==== //depot/projects/netsmp/src/sys/dev/tdfx/tdfx_pci.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/tdfx/tdfx_pci.c,v 1.37 2005/03/01 07:50:10 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/tdfx/tdfx_pci.c,v 1.38 2005/10/31 15:41:19 rwatson Exp $"); /* 3dfx driver for FreeBSD 4.x - Finished 11 May 2000, 12:25AM ET * @@ -96,7 +96,7 @@ { 0, 0 } }; -MALLOC_DEFINE(M_TDFX,"TDFX Driver","3DFX Graphics[/2D]/3D Accelerator(s)"); +MALLOC_DEFINE(M_TDFX,"tdfx_driver","3DFX Graphics[/2D]/3D Accelerator(s)"); #ifdef TDFX_LINUX MODULE_DEPEND(tdfx, linux, 1, 1, 1); ==== //depot/projects/netsmp/src/sys/dev/twa/tw_osl_freebsd.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twa/tw_osl_freebsd.c,v 1.2 2005/09/11 00:52:05 obrien Exp $ + * $FreeBSD: src/sys/dev/twa/tw_osl_freebsd.c,v 1.3 2005/10/31 15:41:19 rwatson Exp $ */ /* @@ -52,7 +52,7 @@ TW_INT32 TW_OSL_DEBUG_LEVEL_FOR_CL = TW_OSL_DEBUG; #endif /* TW_OSL_DEBUG */ -MALLOC_DEFINE(TW_OSLI_MALLOC_CLASS, "twa commands", "twa commands"); +MALLOC_DEFINE(TW_OSLI_MALLOC_CLASS, "twa_commands", "twa commands"); static d_open_t twa_open; ==== //depot/projects/netsmp/src/sys/dev/twe/twe_freebsd.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twe/twe_freebsd.c,v 1.42 2005/03/06 20:57:54 scottl Exp $ + * $FreeBSD: src/sys/dev/twe/twe_freebsd.c,v 1.43 2005/10/31 15:41:19 rwatson Exp $ */ /* @@ -866,7 +866,7 @@ /******************************************************************************** * Allocate a command buffer */ -MALLOC_DEFINE(TWE_MALLOC_CLASS, "twe commands", "twe commands"); +MALLOC_DEFINE(TWE_MALLOC_CLASS, "twe_commands", "twe commands"); struct twe_request * twe_allocate_request(struct twe_softc *sc, int tag) ==== //depot/projects/netsmp/src/sys/fs/fdescfs/fdesc_vfsops.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)fdesc_vfsops.c 8.4 (Berkeley) 1/21/94 * - * $FreeBSD: src/sys/fs/fdescfs/fdesc_vfsops.c,v 1.53 2005/03/24 07:36:13 jeff Exp $ + * $FreeBSD: src/sys/fs/fdescfs/fdesc_vfsops.c,v 1.54 2005/10/31 15:41:19 rwatson Exp $ */ /* @@ -52,7 +52,7 @@ #include <fs/fdescfs/fdesc.h> -static MALLOC_DEFINE(M_FDESCMNT, "FDESC mount", "FDESC mount structure"); +static MALLOC_DEFINE(M_FDESCMNT, "fdesc_mount", "FDESC mount structure"); static vfs_mount_t fdesc_mount; static vfs_unmount_t fdesc_unmount; ==== //depot/projects/netsmp/src/sys/fs/hpfs/hpfs_vfsops.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.56 2005/09/03 20:23:40 ssouhlal Exp $ + * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.57 2005/10/31 15:41:20 rwatson Exp $ */ @@ -53,8 +53,8 @@ #include <fs/hpfs/hpfsmount.h> #include <fs/hpfs/hpfs_subr.h> -MALLOC_DEFINE(M_HPFSMNT, "HPFS mount", "HPFS mount structure"); -MALLOC_DEFINE(M_HPFSNO, "HPFS node", "HPFS node structure"); +MALLOC_DEFINE(M_HPFSMNT, "hpfs_mount", "HPFS mount structure"); +MALLOC_DEFINE(M_HPFSNO, "hpfs_node", "HPFS node structure"); struct sockaddr; ==== //depot/projects/netsmp/src/sys/fs/msdosfs/msdosfs_denode.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_denode.c,v 1.89 2005/09/07 10:32:58 obrien Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_denode.c,v 1.90 2005/10/31 15:41:20 rwatson Exp $ */ /* $NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $ */ /*- @@ -67,7 +67,7 @@ #include <fs/msdosfs/denode.h> #include <fs/msdosfs/fat.h> -static MALLOC_DEFINE(M_MSDOSFSNODE, "MSDOSFS node", "MSDOSFS vnode private part"); +static MALLOC_DEFINE(M_MSDOSFSNODE, "msdosfs_node", "MSDOSFS vnode private part"); static int de_vncmpf(struct vnode *vp, void *arg) ==== //depot/projects/netsmp/src/sys/fs/msdosfs/msdosfs_fileno.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/fs/msdosfs/msdosfs_fileno.c,v 1.1 2004/07/03 13:22:38 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/msdosfs/msdosfs_fileno.c,v 1.2 2005/10/31 15:41:20 rwatson Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -59,7 +59,7 @@ #include <fs/msdosfs/msdosfsmount.h> #include <fs/msdosfs/direntry.h> -static MALLOC_DEFINE(M_MSDOSFSFILENO, "MSDOSFS fileno", "MSDOSFS fileno mapping node"); +static MALLOC_DEFINE(M_MSDOSFSFILENO, "msdosfs_fileno", "MSDOSFS fileno mapping node"); static struct mtx fileno_mtx; MTX_SYSINIT(fileno, &fileno_mtx, "MSDOSFS fileno", MTX_DEF); ==== //depot/projects/netsmp/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.146 2005/09/29 14:09:46 peadar Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.147 2005/10/31 15:41:20 rwatson Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -99,8 +99,8 @@ #define MSDOSFS_NOCHECKSIG #endif -MALLOC_DEFINE(M_MSDOSFSMNT, "MSDOSFS mount", "MSDOSFS mount structure"); -static MALLOC_DEFINE(M_MSDOSFSFAT, "MSDOSFS FAT", "MSDOSFS file allocation table"); +MALLOC_DEFINE(M_MSDOSFSMNT, "msdosfs_mount", "MSDOSFS mount structure"); +static MALLOC_DEFINE(M_MSDOSFSFAT, "msdosfs_fat", "MSDOSFS file allocation table"); struct iconv_functions *msdosfs_iconv = NULL; ==== //depot/projects/netsmp/src/sys/fs/ntfs/ntfs_ihash.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * @(#)ufs_ihash.c 8.7 (Berkeley) 5/17/95 - * $FreeBSD: src/sys/fs/ntfs/ntfs_ihash.c,v 1.21 2005/01/06 18:10:39 imp Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_ihash.c,v 1.22 2005/10/31 15:41:20 rwatson Exp $ */ #include <sys/param.h> @@ -45,7 +45,7 @@ #include <fs/ntfs/ntfs_inode.h> #include <fs/ntfs/ntfs_ihash.h> -MALLOC_DEFINE(M_NTFSNTHASH, "NTFS nthash", "NTFS ntnode hash tables"); +MALLOC_DEFINE(M_NTFSNTHASH, "ntfs_nthash", "NTFS ntnode hash tables"); /* * Structures associated with inode cacheing. ==== //depot/projects/netsmp/src/sys/fs/ntfs/ntfs_subr.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ntfs/ntfs_subr.c,v 1.38 2005/05/06 00:15:57 robert Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_subr.c,v 1.39 2005/10/31 15:41:20 rwatson Exp $ */ #include <sys/param.h> @@ -51,10 +51,10 @@ #include <fs/ntfs/ntfs_compr.h> #include <fs/ntfs/ntfs_ihash.h> -MALLOC_DEFINE(M_NTFSNTVATTR, "NTFS vattr", "NTFS file attribute information"); -MALLOC_DEFINE(M_NTFSRDATA, "NTFS res data", "NTFS resident data"); -MALLOC_DEFINE(M_NTFSRUN, "NTFS vrun", "NTFS vrun storage"); -MALLOC_DEFINE(M_NTFSDECOMP, "NTFS decomp", "NTFS decompression temporary"); +MALLOC_DEFINE(M_NTFSNTVATTR, "ntfs_vattr", "NTFS file attribute information"); +MALLOC_DEFINE(M_NTFSRDATA, "ntfsd_resdata", "NTFS resident data"); +MALLOC_DEFINE(M_NTFSRUN, "ntfs_vrun", "NTFS vrun storage"); +MALLOC_DEFINE(M_NTFSDECOMP, "ntfs_decomp", "NTFS decompression temporary"); static int ntfs_ntlookupattr(struct ntfsmount *, const char *, int, int *, char **); static int ntfs_findvattr(struct ntfsmount *, struct ntnode *, struct ntvattr **, struct ntvattr **, u_int32_t, const char *, size_t, cn_t); ==== //depot/projects/netsmp/src/sys/fs/ntfs/ntfs_vfsops.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.81 2005/09/11 16:02:14 rodrigc Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.82 2005/10/31 15:41:20 rwatson Exp $ */ @@ -60,10 +60,10 @@ #include <fs/ntfs/ntfs_ihash.h> #include <fs/ntfs/ntfsmount.h> -static MALLOC_DEFINE(M_NTFSMNT, "NTFS mount", "NTFS mount structure"); -MALLOC_DEFINE(M_NTFSNTNODE,"NTFS ntnode", "NTFS ntnode information"); -MALLOC_DEFINE(M_NTFSFNODE,"NTFS fnode", "NTFS fnode information"); -MALLOC_DEFINE(M_NTFSDIR,"NTFS dir", "NTFS dir buffer"); +static MALLOC_DEFINE(M_NTFSMNT, "ntfs_mount", "NTFS mount structure"); +MALLOC_DEFINE(M_NTFSNTNODE,"ntfs_ntnode", "NTFS ntnode information"); +MALLOC_DEFINE(M_NTFSFNODE,"ntfs_fnode", "NTFS fnode information"); +MALLOC_DEFINE(M_NTFSDIR,"ntfs_dir", "NTFS dir buffer"); struct sockaddr; ==== //depot/projects/netsmp/src/sys/fs/nullfs/null_subr.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)null_subr.c 8.7 (Berkeley) 5/14/95 * - * $FreeBSD: src/sys/fs/nullfs/null_subr.c,v 1.48 2005/04/11 11:17:20 jeff Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_subr.c,v 1.49 2005/10/31 15:41:20 rwatson Exp $ */ #include <sys/param.h> @@ -64,8 +64,8 @@ static u_long null_node_hash; struct mtx null_hashmtx; -static MALLOC_DEFINE(M_NULLFSHASH, "NULLFS hash", "NULLFS hash table"); -MALLOC_DEFINE(M_NULLFSNODE, "NULLFS node", "NULLFS vnode private part"); +static MALLOC_DEFINE(M_NULLFSHASH, "nullfs_hash", "NULLFS hash table"); +MALLOC_DEFINE(M_NULLFSNODE, "nullfs_node", "NULLFS vnode private part"); static struct vnode * null_hashget(struct mount *, struct vnode *); static struct vnode * null_hashins(struct mount *, struct null_node *); ==== //depot/projects/netsmp/src/sys/fs/nullfs/null_vfsops.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ * @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94 * * @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92 - * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.73 2005/10/16 21:45:25 kris Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.74 2005/10/31 15:41:20 rwatson Exp $ */ /* @@ -53,7 +53,7 @@ #include <fs/nullfs/null.h> -static MALLOC_DEFINE(M_NULLFSMNT, "NULLFS mount", "NULLFS mount structure"); +static MALLOC_DEFINE(M_NULLFSMNT, "nullfs_mount", "NULLFS mount structure"); static vfs_fhtovp_t nullfs_fhtovp; static vfs_checkexp_t nullfs_checkexp; ==== //depot/projects/netsmp/src/sys/fs/nwfs/nwfs_node.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/nwfs/nwfs_node.c,v 1.36 2005/03/13 12:18:24 jeff Exp $ + * $FreeBSD: src/sys/fs/nwfs/nwfs_node.c,v 1.37 2005/10/31 15:41:20 rwatson Exp $ */ #include <sys/param.h> #include <sys/systm.h> @@ -64,8 +64,8 @@ static u_long nwnodehash; static struct lock nwhashlock; -static MALLOC_DEFINE(M_NWNODE, "NWFS node", "NWFS vnode private part"); -static MALLOC_DEFINE(M_NWFSHASH, "NWFS hash", "NWFS has table"); +static MALLOC_DEFINE(M_NWNODE, "nwfs_node", "NWFS vnode private part"); +static MALLOC_DEFINE(M_NWFSHASH, "nwfs_hash", "NWFS has table"); static int nwfs_sysctl_vnprint(SYSCTL_HANDLER_ARGS); ==== //depot/projects/netsmp/src/sys/fs/nwfs/nwfs_subr.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/nwfs/nwfs_subr.c,v 1.13 2005/05/11 19:08:38 kan Exp $ + * $FreeBSD: src/sys/fs/nwfs/nwfs_subr.c,v 1.14 2005/10/31 15:41:20 rwatson Exp $ */ #include <sys/param.h> #include <sys/systm.h> @@ -52,7 +52,7 @@ #define NCP_INFOSZ (sizeof(struct nw_entry_info) - 257) -MALLOC_DEFINE(M_NWFSDATA, "NWFS data", "NWFS private data"); +MALLOC_DEFINE(M_NWFSDATA, "nwfs_data", "NWFS private data"); static int ncp_extract_file_info(struct nwmount *nmp, struct ncp_rq *rqp, ==== //depot/projects/netsmp/src/sys/fs/portalfs/portal_vfsops.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)portal_vfsops.c 8.11 (Berkeley) 5/14/95 * - * $FreeBSD: src/sys/fs/portalfs/portal_vfsops.c,v 1.57 2005/03/24 07:36:14 jeff Exp $ + * $FreeBSD: src/sys/fs/portalfs/portal_vfsops.c,v 1.58 2005/10/31 15:41:21 rwatson Exp $ */ /* @@ -56,7 +56,7 @@ #include <fs/portalfs/portal.h> >>> TRUNCATED FOR MAIL (1000 lines) <<<help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510311919.j9VJJKKs074025>