From e7b4468ce80913950cd099c393f3ce6ece6fcb2c Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 5 Jan 2008 14:02:41 +0000 Subject: [PATCH] For kmalloc(), MALLOC() and contigmalloc(), use M_ZERO instead of explicitly bzero()ing. Reviewed-by: sephe --- sys/dev/agp/agp.c | 5 ++-- sys/dev/disk/md/md.c | 11 ++++----- sys/dev/disk/vpo/vpo.c | 6 ++--- sys/dev/misc/nmdm/nmdm.c | 5 ++-- sys/dev/netif/dc/if_dc.c | 6 ++--- sys/dev/netif/gx/if_gx.c | 5 ++-- sys/dev/netif/lge/if_lge.c | 5 ++-- sys/dev/netif/nge/if_nge.c | 5 ++-- sys/dev/netif/sf/if_sf.c | 6 ++--- sys/dev/netif/sr/if_sr_pci.c | 5 ++-- sys/dev/netif/ste/if_ste.c | 6 ++--- sys/dev/netif/ti/if_ti.c | 6 ++--- sys/dev/netif/tl/if_tl.c | 6 ++--- sys/dev/netif/txp/if_txp.c | 5 ++-- sys/dev/netif/wb/if_wb.c | 6 ++--- sys/dev/raid/asr/asr.c | 17 +++++--------- sys/dev/raid/twa/twa.c | 5 ++-- sys/dev/raid/twa/twa_cam.c | 5 ++-- sys/dev/sound/pci/envy24.c | 7 +++--- sys/dev/sound/pci/envy24ht.c | 7 +++--- sys/dev/sound/usb/uaudio.c | 5 ++-- sys/kern/kern_linker.c | 11 ++++----- sys/kern/kern_memio.c | 7 +++--- sys/kern/kern_sensors.c | 8 +++---- sys/kern/link_aout.c | 11 ++++----- sys/kern/subr_rman.c | 19 +++++++-------- sys/kern/tty_pty.c | 5 ++-- sys/kern/uipc_socket.c | 8 +++---- sys/kern/vfs_mount.c | 5 ++-- sys/kern/vfs_subr.c | 5 ++-- sys/libiconv/iconv.c | 5 ++-- sys/net/ef/if_ef.c | 5 ++-- sys/net/faith/if_faith.c | 5 ++-- sys/net/gif/if_gif.c | 5 ++-- sys/net/pf/pf_if.c | 11 ++++----- sys/net/pf/pf_ioctl.c | 5 ++-- sys/net/stf/if_stf.c | 6 ++--- sys/netgraph/UI/ng_UI.c | 5 ++-- sys/netgraph/async/ng_async.c | 5 ++-- sys/netgraph/bpf/ng_bpf.c | 5 ++-- sys/netgraph/bridge/ng_bridge.c | 11 ++++----- sys/netgraph/cisco/ng_cisco.c | 5 ++-- sys/netgraph/eiface/ng_eiface.c | 5 ++-- sys/netgraph/ether/ng_ether.c | 5 ++-- sys/netgraph/fec/ng_fec.c | 5 ++-- sys/netgraph/frame_relay/ng_frame_relay.c | 5 ++-- sys/netgraph/iface/ng_iface.c | 8 +++---- sys/netgraph/ksocket/ng_ksocket.c | 5 ++-- sys/netgraph/lmi/ng_lmi.c | 5 ++-- sys/netgraph/mppc/ng_mppc.c | 5 ++-- sys/netgraph/netgraph/ng_base.c | 8 +++---- sys/netgraph/netgraph/ng_parse.c | 5 ++-- sys/netgraph/ng_message.h | 5 ++-- sys/netgraph/ng_sample.c | 5 ++-- sys/netgraph/ppp/ng_ppp.c | 5 ++-- sys/netgraph/pppoe/ng_pppoe.c | 17 ++++++-------- sys/netgraph/pptpgre/ng_pptpgre.c | 5 ++-- sys/netgraph/rfc1490/ng_rfc1490.c | 5 ++-- sys/netgraph/socket/ng_socket.c | 11 ++++----- sys/netgraph/tee/ng_tee.c | 5 ++-- sys/netgraph/tty/ng_tty.c | 5 ++-- sys/netgraph/vjc/ng_vjc.c | 5 ++-- sys/netinet6/ah_core.c | 8 +++---- sys/netinet6/frag6.c | 8 +++---- sys/netinet6/in6.c | 5 ++-- sys/netinet6/in6_pcb.c | 10 ++++---- sys/netinet6/in6_prefix.c | 5 ++-- sys/netinet6/ipsec.c | 5 ++-- sys/netinet6/nd6.c | 6 ++--- sys/netinet6/nd6_nbr.c | 5 ++-- sys/netinet6/nd6_rtr.c | 14 +++++------ sys/netinet6/scope6.c | 6 ++--- sys/netproto/atalk/ddp_usrreq.c | 5 ++-- sys/netproto/key/keydb.c | 23 ++++++------------- sys/netproto/key/keysock.c | 5 ++-- sys/netproto/natm/natm_pcb.c | 8 +++---- sys/netproto/ns/ns.c | 5 ++-- sys/netproto/smb/smb_crypt.c | 5 ++-- sys/netproto/smb/smb_trantcp.c | 5 ++-- sys/opencrypto/cryptodev.c | 5 ++-- sys/platform/pc32/i386/busdma_machdep.c | 16 +++++-------- sys/platform/pc32/i386/i686_mem.c | 5 ++-- sys/platform/pc32/i386/k6_mem.c | 5 ++-- sys/platform/pc32/i386/mp_machdep.c | 6 ++--- sys/platform/pc32/i386/userconfig.c | 6 ++--- sys/platform/pc64/amd64/busdma_machdep.c | 16 +++++-------- .../vkernel/platform/busdma_machdep.c | 16 +++++-------- sys/sys/ccbque.h | 7 ++---- sys/vfs/gnu/ext2fs/ext2_quota.c | 5 ++-- sys/vfs/gnu/ext2fs/ext2_vfsops.c | 5 ++-- sys/vfs/hpfs/hpfs_vfsops.c | 5 ++-- sys/vfs/isofs/cd9660/cd9660_vfsops.c | 5 ++-- sys/vfs/msdosfs/msdosfs_vfsops.c | 5 ++-- sys/vfs/nfs/bootp_subr.c | 5 ++-- sys/vfs/nfs/nfs_srvcache.c | 5 ++-- sys/vfs/nfs/nfs_syscalls.c | 16 +++++-------- sys/vfs/ntfs/ntfs_subr.c | 12 ++++------ sys/vfs/ntfs/ntfs_vfsops.c | 5 ++-- sys/vfs/smbfs/smbfs_smb.c | 5 ++-- sys/vfs/ufs/ffs_softdep.c | 20 ++++++---------- sys/vfs/ufs/ffs_vfsops.c | 5 ++-- sys/vfs/ufs/ufs_quota.c | 6 ++--- sys/vm/swap_pager.c | 6 ++--- 103 files changed, 286 insertions(+), 444 deletions(-) diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c index 39ac2f70f1..16e3145353 100644 --- a/sys/dev/agp/agp.c +++ b/sys/dev/agp/agp.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/agp.c,v 1.56 2007/07/13 16:28:11 anholt Exp $ - * $DragonFly: src/sys/dev/agp/agp.c,v 1.27 2007/09/12 08:31:43 hasso Exp $ + * $DragonFly: src/sys/dev/agp/agp.c,v 1.28 2008/01/05 14:02:37 swildner Exp $ */ #include "opt_bus.h" @@ -173,14 +173,13 @@ agp_alloc_gatt(device_t dev) gatt = kmalloc(sizeof(struct agp_gatt), M_AGP, M_INTWAIT); gatt->ag_entries = entries; gatt->ag_virtual = contigmalloc(entries * sizeof(u_int32_t), M_AGP, - M_WAITOK, 0, ~0, PAGE_SIZE, 0); + M_WAITOK|M_ZERO, 0, ~0, PAGE_SIZE, 0); if (!gatt->ag_virtual) { if (bootverbose) device_printf(dev, "contiguous allocation failed\n"); kfree(gatt, M_AGP); return 0; } - bzero(gatt->ag_virtual, entries * sizeof(u_int32_t)); gatt->ag_physical = vtophys((vm_offset_t) gatt->ag_virtual); agp_flush_cache(); diff --git a/sys/dev/disk/md/md.c b/sys/dev/disk/md/md.c index 61395ba72e..5d909a985e 100644 --- a/sys/dev/disk/md/md.c +++ b/sys/dev/disk/md/md.c @@ -7,7 +7,7 @@ * ---------------------------------------------------------------------------- * * $FreeBSD: src/sys/dev/md/md.c,v 1.8.2.2 2002/08/19 17:43:34 jdp Exp $ - * $DragonFly: src/sys/dev/disk/md/md.c,v 1.18 2007/09/05 05:28:32 dillon Exp $ + * $DragonFly: src/sys/dev/disk/md/md.c,v 1.19 2008/01/05 14:02:37 swildner Exp $ * */ @@ -257,8 +257,7 @@ mdstrategy_malloc(struct dev_strategy_args *ap) *secpp = (u_char *)uc; } else { if (!secpp) { - MALLOC(secpp, u_char **, (secno + nsec + 1) * sizeof(u_char *), M_MD, M_WAITOK); - bzero(secpp, (secno + nsec + 1) * sizeof(u_char *)); + MALLOC(secpp, u_char **, (secno + nsec + 1) * sizeof(u_char *), M_MD, M_WAITOK | M_ZERO); bcopy(sc->secp, secpp, sc->nsecp * sizeof(u_char *)); FREE(sc->secp, M_MD); sc->secp = secpp; @@ -363,8 +362,7 @@ mdcreate(void) { struct md_s *sc; - MALLOC(sc, struct md_s *,sizeof(*sc), M_MD, M_WAITOK); - bzero(sc, sizeof(*sc)); + MALLOC(sc, struct md_s *,sizeof(*sc), M_MD, M_WAITOK | M_ZERO); sc->unit = mdunits++; bioq_init(&sc->bio_queue); devstat_add_entry(&sc->stats, "md", sc->unit, DEV_BSIZE, @@ -402,8 +400,7 @@ mdcreate_malloc(void) sc->type = MD_MALLOC; sc->nsect = MD_NSECT; /* for now */ - MALLOC(sc->secp, u_char **, sizeof(u_char *), M_MD, M_WAITOK); - bzero(sc->secp, sizeof(u_char *)); + MALLOC(sc->secp, u_char **, sizeof(u_char *), M_MD, M_WAITOK | M_ZERO); sc->nsecp = 1; kprintf("md%d: Malloc disk\n", sc->unit); } diff --git a/sys/dev/disk/vpo/vpo.c b/sys/dev/disk/vpo/vpo.c index 0e589f722c..1214aec78e 100644 --- a/sys/dev/disk/vpo/vpo.c +++ b/sys/dev/disk/vpo/vpo.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ppbus/vpo.c,v 1.20.2.1 2000/05/07 21:08:18 n_hibma Exp $ - * $DragonFly: src/sys/dev/disk/vpo/vpo.c,v 1.10 2007/09/15 20:06:39 swildner Exp $ + * $DragonFly: src/sys/dev/disk/vpo/vpo.c,v 1.11 2008/01/05 14:02:37 swildner Exp $ */ #include @@ -182,9 +182,7 @@ static void vpo_cam_rescan(struct vpo_data *vpo) { struct cam_path *path; - union ccb *ccb = kmalloc(sizeof(union ccb), M_TEMP, M_WAITOK); - - bzero(ccb, sizeof(union ccb)); + union ccb *ccb = kmalloc(sizeof(union ccb), M_TEMP, M_WAITOK | M_ZERO); if (xpt_create_path(&path, xpt_periph, cam_sim_path(vpo->sim), 0, 0) != CAM_REQ_CMP) { diff --git a/sys/dev/misc/nmdm/nmdm.c b/sys/dev/misc/nmdm/nmdm.c index 02c4df674a..3cf30c7c69 100644 --- a/sys/dev/misc/nmdm/nmdm.c +++ b/sys/dev/misc/nmdm/nmdm.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.5.2.1 2001/08/11 00:54:14 mp Exp $ - * $DragonFly: src/sys/dev/misc/nmdm/nmdm.c,v 1.15 2006/09/10 01:26:34 dillon Exp $ + * $DragonFly: src/sys/dev/misc/nmdm/nmdm.c,v 1.16 2008/01/05 14:02:37 swildner Exp $ */ /* @@ -128,8 +128,7 @@ nmdminit(int n) if (n & ~0x7f) return; - pt = kmalloc(sizeof(*pt), M_NLMDM, M_WAITOK); - bzero(pt, sizeof(*pt)); + pt = kmalloc(sizeof(*pt), M_NLMDM, M_WAITOK | M_ZERO); dev_ops_add(&nmdm_ops, ~1, n << 1); pt->part1.dev = dev1 = make_dev(&nmdm_ops, n << 1, 0, 0, 0666, "nmdm%dA", n); diff --git a/sys/dev/netif/dc/if_dc.c b/sys/dev/netif/dc/if_dc.c index 6c4511bb0d..cf6b8643e4 100644 --- a/sys/dev/netif/dc/if_dc.c +++ b/sys/dev/netif/dc/if_dc.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_dc.c,v 1.9.2.45 2003/06/08 14:31:53 mux Exp $ - * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.54 2006/12/22 23:26:19 swildner Exp $ + * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.55 2008/01/05 14:02:37 swildner Exp $ */ /* @@ -2077,7 +2077,7 @@ dc_attach(device_t dev) } sc->dc_ldata = contigmalloc(sizeof(struct dc_list_data), M_DEVBUF, - M_WAITOK, 0, 0xffffffff, PAGE_SIZE, 0); + M_WAITOK | M_ZERO, 0, 0xffffffff, PAGE_SIZE, 0); if (sc->dc_ldata == NULL) { device_printf(dev, "no memory for list buffers!\n"); @@ -2085,8 +2085,6 @@ dc_attach(device_t dev) goto fail; } - bzero(sc->dc_ldata, sizeof(struct dc_list_data)); - ifp->if_softc = sc; ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; diff --git a/sys/dev/netif/gx/if_gx.c b/sys/dev/netif/gx/if_gx.c index 90be9517c6..bde553e0f6 100644 --- a/sys/dev/netif/gx/if_gx.c +++ b/sys/dev/netif/gx/if_gx.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/gx/if_gx.c,v 1.2.2.3 2001/12/14 19:51:39 jlemon Exp $ - * $DragonFly: src/sys/dev/netif/gx/Attic/if_gx.c,v 1.28 2007/08/14 13:30:35 sephe Exp $ + * $DragonFly: src/sys/dev/netif/gx/Attic/if_gx.c,v 1.29 2008/01/05 14:02:37 swildner Exp $ */ #include @@ -308,14 +308,13 @@ gx_attach(device_t dev) /* Allocate the ring buffers. */ gx->gx_rdata = contigmalloc(sizeof(struct gx_ring_data), M_DEVBUF, - M_WAITOK, 0, 0xffffffff, PAGE_SIZE, 0); + M_WAITOK | M_ZERO, 0, 0xffffffff, PAGE_SIZE, 0); if (gx->gx_rdata == NULL) { device_printf(dev, "no memory for list buffers!\n"); error = ENXIO; goto fail; } - bzero(gx->gx_rdata, sizeof(struct gx_ring_data)); /* Set default tuneable values. */ gx->gx_tx_intr_delay = TUNABLE_TX_INTR_DELAY; diff --git a/sys/dev/netif/lge/if_lge.c b/sys/dev/netif/lge/if_lge.c index c273f892a5..e3e5922c2a 100644 --- a/sys/dev/netif/lge/if_lge.c +++ b/sys/dev/netif/lge/if_lge.c @@ -31,7 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.5.2.2 2001/12/14 19:49:23 jlemon Exp $ - * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.39 2007/08/14 13:30:35 sephe Exp $ + * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.40 2008/01/05 14:02:37 swildner Exp $ */ /* @@ -497,14 +497,13 @@ lge_attach(device_t dev) sc->lge_unit = unit; sc->lge_ldata = contigmalloc(sizeof(struct lge_list_data), M_DEVBUF, - M_WAITOK, 0, 0xffffffff, PAGE_SIZE, 0); + M_WAITOK | M_ZERO, 0, 0xffffffff, PAGE_SIZE, 0); if (sc->lge_ldata == NULL) { kprintf("lge%d: no memory for list buffers!\n", unit); error = ENXIO; goto fail; } - bzero(sc->lge_ldata, sizeof(struct lge_list_data)); /* Try to allocate memory for jumbo buffers. */ if (lge_alloc_jumbo_mem(sc)) { diff --git a/sys/dev/netif/nge/if_nge.c b/sys/dev/netif/nge/if_nge.c index fb733cc746..55bdbc8ef6 100644 --- a/sys/dev/netif/nge/if_nge.c +++ b/sys/dev/netif/nge/if_nge.c @@ -31,7 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.13.2.13 2003/02/05 22:03:57 mbr Exp $ - * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.43 2007/08/14 13:30:35 sephe Exp $ + * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.44 2008/01/05 14:02:37 swildner Exp $ */ /* @@ -814,14 +814,13 @@ nge_attach(device_t dev) sc->nge_unit = unit; sc->nge_ldata = contigmalloc(sizeof(struct nge_list_data), M_DEVBUF, - M_WAITOK, 0, 0xffffffff, PAGE_SIZE, 0); + M_WAITOK | M_ZERO, 0, 0xffffffff, PAGE_SIZE, 0); if (sc->nge_ldata == NULL) { kprintf("nge%d: no memory for list buffers!\n", unit); error = ENXIO; goto fail; } - bzero(sc->nge_ldata, sizeof(struct nge_list_data)); /* Try to allocate memory for jumbo buffers. */ if (nge_alloc_jumbo_mem(sc)) { diff --git a/sys/dev/netif/sf/if_sf.c b/sys/dev/netif/sf/if_sf.c index b285b4ecde..0866d58d13 100644 --- a/sys/dev/netif/sf/if_sf.c +++ b/sys/dev/netif/sf/if_sf.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_sf.c,v 1.18.2.8 2001/12/16 15:46:07 luigi Exp $ - * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.30 2006/12/22 23:26:22 swildner Exp $ + * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.31 2008/01/05 14:02:37 swildner Exp $ */ /* @@ -742,7 +742,7 @@ sf_attach(device_t dev) /* Allocate the descriptor queues. */ sc->sf_ldata = contigmalloc(sizeof(struct sf_list_data), M_DEVBUF, - M_WAITOK, 0, 0xffffffff, PAGE_SIZE, 0); + M_WAITOK | M_ZERO, 0, 0xffffffff, PAGE_SIZE, 0); if (sc->sf_ldata == NULL) { kprintf("sf%d: no memory for list buffers!\n", unit); @@ -750,8 +750,6 @@ sf_attach(device_t dev) goto fail; } - bzero(sc->sf_ldata, sizeof(struct sf_list_data)); - /* Do MII setup. */ if (mii_phy_probe(dev, &sc->sf_miibus, sf_ifmedia_upd, sf_ifmedia_sts)) { diff --git a/sys/dev/netif/sr/if_sr_pci.c b/sys/dev/netif/sr/if_sr_pci.c index ea48a3050b..1ec558d686 100644 --- a/sys/dev/netif/sr/if_sr_pci.c +++ b/sys/dev/netif/sr/if_sr_pci.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sr/if_sr_pci.c,v 1.15.2.1 2002/06/17 15:10:58 jhay Exp $ - * $DragonFly: src/sys/dev/netif/sr/if_sr_pci.c,v 1.6 2006/12/22 23:26:22 swildner Exp $ + * $DragonFly: src/sys/dev/netif/sr/if_sr_pci.c,v 1.7 2008/01/05 14:02:37 swildner Exp $ */ @@ -184,7 +184,7 @@ sr_pci_attach(device_t device) hc->memsize = 2 * hc->numports * SRC_WIN_SIZ; hc->mem_start = contigmalloc(hc->memsize, M_DEVBUF, - M_NOWAIT, + M_NOWAIT | M_ZERO, 0ul, 0xfffffful, 0x10000, @@ -198,7 +198,6 @@ sr_pci_attach(device_t device) hc->winmsk = 0xffffffff; hc->mem_end = (caddr_t)((u_int)hc->mem_start + hc->memsize); hc->mem_pstart = kvtop(hc->mem_start); - bzero(hc->mem_start, hc->memsize); *fecrp = SR_FECR_DTR0 | SR_FECR_DTR1 diff --git a/sys/dev/netif/ste/if_ste.c b/sys/dev/netif/ste/if_ste.c index bae6ef732e..dfe22f2354 100644 --- a/sys/dev/netif/ste/if_ste.c +++ b/sys/dev/netif/ste/if_ste.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $ - * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.35 2006/10/25 20:55:59 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.36 2008/01/05 14:02:37 swildner Exp $ */ #include @@ -930,7 +930,7 @@ ste_attach(device_t dev) /* Allocate the descriptor queues. */ sc->ste_ldata = contigmalloc(sizeof(struct ste_list_data), M_DEVBUF, - M_WAITOK, 0, 0xffffffff, PAGE_SIZE, 0); + M_WAITOK | M_ZERO, 0, 0xffffffff, PAGE_SIZE, 0); if (sc->ste_ldata == NULL) { device_printf(dev, "no memory for list buffers!\n"); @@ -938,8 +938,6 @@ ste_attach(device_t dev) goto fail; } - bzero(sc->ste_ldata, sizeof(struct ste_list_data)); - /* Do MII setup. */ if (mii_phy_probe(dev, &sc->ste_miibus, ste_ifmedia_upd, ste_ifmedia_sts)) { diff --git a/sys/dev/netif/ti/if_ti.c b/sys/dev/netif/ti/if_ti.c index 425c05b871..1b7b758dff 100644 --- a/sys/dev/netif/ti/if_ti.c +++ b/sys/dev/netif/ti/if_ti.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_ti.c,v 1.25.2.14 2002/02/15 04:20:20 silby Exp $ - * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.47 2007/04/08 12:03:18 sephe Exp $ + * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.48 2008/01/05 14:02:37 swildner Exp $ */ /* @@ -1480,7 +1480,7 @@ ti_attach(device_t dev) /* Allocate the general information block and ring buffers. */ sc->ti_rdata = contigmalloc(sizeof(struct ti_ring_data), M_DEVBUF, - M_WAITOK, 0, 0xffffffff, PAGE_SIZE, 0); + M_WAITOK | M_ZERO, 0, 0xffffffff, PAGE_SIZE, 0); if (sc->ti_rdata == NULL) { device_printf(dev, "no memory for list buffers!\n"); @@ -1488,8 +1488,6 @@ ti_attach(device_t dev) goto fail; } - bzero(sc->ti_rdata, sizeof(struct ti_ring_data)); - /* Try to allocate memory for jumbo buffers. */ if (ti_alloc_jumbo_mem(sc)) { device_printf(dev, "jumbo buffer allocation failed\n"); diff --git a/sys/dev/netif/tl/if_tl.c b/sys/dev/netif/tl/if_tl.c index 1ed59287fd..d12ecb0442 100644 --- a/sys/dev/netif/tl/if_tl.c +++ b/sys/dev/netif/tl/if_tl.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $ - * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.37 2006/10/25 20:55:59 dillon Exp $ + * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.38 2008/01/05 14:02:37 swildner Exp $ */ /* @@ -1141,7 +1141,7 @@ tl_attach(device_t dev) * Now allocate memory for the TX and RX lists. */ sc->tl_ldata = contigmalloc(sizeof(struct tl_list_data), M_DEVBUF, - M_WAITOK, 0, 0xffffffff, PAGE_SIZE, 0); + M_WAITOK | M_ZERO, 0, 0xffffffff, PAGE_SIZE, 0); if (sc->tl_ldata == NULL) { device_printf(dev, "no memory for list buffers!\n"); @@ -1149,8 +1149,6 @@ tl_attach(device_t dev) goto fail; } - bzero(sc->tl_ldata, sizeof(struct tl_list_data)); - sc->tl_dinfo = t; if (t->tl_vid == COMPAQ_VENDORID || t->tl_vid == TI_VENDORID) sc->tl_eeaddr = TL_EEPROM_EADDR; diff --git a/sys/dev/netif/txp/if_txp.c b/sys/dev/netif/txp/if_txp.c index fe3e3357cb..f36ad23078 100644 --- a/sys/dev/netif/txp/if_txp.c +++ b/sys/dev/netif/txp/if_txp.c @@ -1,6 +1,6 @@ /* $OpenBSD: if_txp.c,v 1.48 2001/06/27 06:34:50 kjc Exp $ */ /* $FreeBSD: src/sys/dev/txp/if_txp.c,v 1.4.2.4 2001/12/14 19:50:43 jlemon Exp $ */ -/* $DragonFly: src/sys/dev/netif/txp/if_txp.c,v 1.43 2007/08/14 13:30:35 sephe Exp $ */ +/* $DragonFly: src/sys/dev/netif/txp/if_txp.c,v 1.44 2008/01/05 14:02:37 swildner Exp $ */ /* * Copyright (c) 2001 @@ -253,8 +253,7 @@ txp_attach(device_t dev) goto fail; sc->sc_ldata = contigmalloc(sizeof(struct txp_ldata), M_DEVBUF, - M_WAITOK, 0, 0xffffffff, PAGE_SIZE, 0); - bzero(sc->sc_ldata, sizeof(struct txp_ldata)); + M_WAITOK | M_ZERO, 0, 0xffffffff, PAGE_SIZE, 0); if (txp_alloc_rings(sc)) { error = ENXIO; diff --git a/sys/dev/netif/wb/if_wb.c b/sys/dev/netif/wb/if_wb.c index df7e8e5047..21f88a5746 100644 --- a/sys/dev/netif/wb/if_wb.c +++ b/sys/dev/netif/wb/if_wb.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $ - * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.39 2007/08/16 11:20:37 sephe Exp $ + * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.40 2008/01/05 14:02:37 swildner Exp $ */ /* @@ -776,7 +776,7 @@ wb_attach(device_t dev) wb_read_eeprom(sc, (caddr_t)&eaddr, 0, 3); sc->wb_ldata = contigmalloc(sizeof(struct wb_list_data) + 8, M_DEVBUF, - M_WAITOK, 0, 0xffffffff, PAGE_SIZE, 0); + M_WAITOK | M_ZERO, 0, 0xffffffff, PAGE_SIZE, 0); if (sc->wb_ldata == NULL) { device_printf(dev, "no memory for list buffers!\n"); @@ -784,8 +784,6 @@ wb_attach(device_t dev) goto fail; } - bzero(sc->wb_ldata, sizeof(struct wb_list_data)); - ifp->if_softc = sc; ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; diff --git a/sys/dev/raid/asr/asr.c b/sys/dev/raid/asr/asr.c index 4600a1b314..7626f4925c 100644 --- a/sys/dev/raid/asr/asr.c +++ b/sys/dev/raid/asr/asr.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/asr/asr.c,v 1.3.2.2 2001/08/23 05:21:29 scottl Exp $ */ -/* $DragonFly: src/sys/dev/raid/asr/asr.c,v 1.31 2007/12/23 07:00:56 pavalos Exp $ */ +/* $DragonFly: src/sys/dev/raid/asr/asr.c,v 1.32 2008/01/05 14:02:38 swildner Exp $ */ /* * Copyright (c) 1996-2000 Distributed Processing Technology Corporation * Copyright (c) 2000-2001 Adaptec Corporation @@ -767,8 +767,7 @@ asr_alloc_ccb ( OUT union asr_ccb * new_ccb; if ((new_ccb = (union asr_ccb *)kmalloc(sizeof(*new_ccb), - M_DEVBUF, M_WAITOK)) != (union asr_ccb *)NULL) { - bzero (new_ccb, sizeof(*new_ccb)); + M_DEVBUF, M_WAITOK | M_ZERO)) != (union asr_ccb *)NULL) { new_ccb->ccb_h.pinfo.priority = 1; new_ccb->ccb_h.pinfo.index = CAM_UNQUEUED_INDEX; new_ccb->ccb_h.spriv_ptr0 = sc; @@ -2091,10 +2090,9 @@ ASR_initOutBound ( * initialization time. */ if ((sc->ha_Msgs = (PI2O_SCSI_ERROR_REPLY_MESSAGE_FRAME) - contigmalloc (size, M_DEVBUF, M_WAITOK, 0ul, + contigmalloc (size, M_DEVBUF, M_WAITOK | M_ZERO, 0ul, 0xFFFFFFFFul, (u_long)sizeof(U32), 0ul)) != (PI2O_SCSI_ERROR_REPLY_MESSAGE_FRAME)NULL) { - (void)bzero ((char *)sc->ha_Msgs, size); sc->ha_Msgs_Phys = KVTOPHYS(sc->ha_Msgs); } } @@ -2125,11 +2123,10 @@ ASR_setSysTab( int retVal; if ((SystemTable = (PI2O_SET_SYSTAB_HEADER)kmalloc ( - sizeof(I2O_SET_SYSTAB_HEADER), M_TEMP, M_WAITOK)) + sizeof(I2O_SET_SYSTAB_HEADER), M_TEMP, M_WAITOK | M_ZERO)) == (PI2O_SET_SYSTAB_HEADER)NULL) { return (ENOMEM); } - bzero (SystemTable, sizeof(I2O_SET_SYSTAB_HEADER)); for (ha = Asr_softc; ha; ha = ha->ha_next) { ++SystemTable->NumberEntries; } @@ -2495,7 +2492,7 @@ asr_attach (ATTACH_ARGS) struct scsi_inquiry_data * iq; ATTACH_SET(); - sc = kmalloc(sizeof(*sc), M_DEVBUF, M_INTWAIT); + sc = kmalloc(sizeof(*sc), M_DEVBUF, M_INTWAIT | M_ZERO); if (Asr_softc == (Asr_softc_t *)NULL) { /* * Fixup the OS revision as saved in the dptsig for the @@ -2507,7 +2504,6 @@ asr_attach (ATTACH_ARGS) /* * Initialize the software structure */ - bzero (sc, sizeof(*sc)); LIST_INIT(&(sc->ha_ccb)); /* Link us into the HA list */ { @@ -2664,13 +2660,12 @@ asr_attach (ATTACH_ARGS) kprintf ("asr%d:", unit); if ((iq = (struct scsi_inquiry_data *)kmalloc ( - sizeof(struct scsi_inquiry_data), M_TEMP, M_WAITOK)) + sizeof(struct scsi_inquiry_data), M_TEMP, M_WAITOK | M_ZERO)) != (struct scsi_inquiry_data *)NULL) { defAlignLong(PRIVATE_SCSI_SCB_EXECUTE_MESSAGE,Message); PPRIVATE_SCSI_SCB_EXECUTE_MESSAGE Message_Ptr; int posted = 0; - bzero (iq, sizeof(struct scsi_inquiry_data)); bzero (Message_Ptr = getAlignLong(PRIVATE_SCSI_SCB_EXECUTE_MESSAGE, Message), sizeof(PRIVATE_SCSI_SCB_EXECUTE_MESSAGE) diff --git a/sys/dev/raid/twa/twa.c b/sys/dev/raid/twa/twa.c index 88733e5c65..e10bd4b4b0 100644 --- a/sys/dev/raid/twa/twa.c +++ b/sys/dev/raid/twa/twa.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD$ - * $DragonFly: src/sys/dev/raid/twa/twa.c,v 1.6 2006/09/05 03:48:11 dillon Exp $ + * $DragonFly: src/sys/dev/raid/twa/twa.c,v 1.7 2008/01/05 14:02:38 swildner Exp $ */ /* @@ -111,7 +111,7 @@ twa_setup(struct twa_softc *sc) /* Allocate memory for the AEN queue. */ if ((aen_queue = kmalloc(sizeof(struct twa_event_packet) * TWA_Q_LENGTH, - M_DEVBUF, M_WAITOK)) == NULL) { + M_DEVBUF, M_WAITOK | M_ZERO)) == NULL) { /* * This should not cause us to return error. We will only be * unable to support AEN's. But then, we will have to check @@ -122,7 +122,6 @@ twa_setup(struct twa_softc *sc) return(ENOMEM); /* any unfreed memory will be freed by twa_free */ } /* Initialize the aen queue. */ - bzero(aen_queue, sizeof(struct twa_event_packet) * TWA_Q_LENGTH); for (i = 0; i < TWA_Q_LENGTH; i++) sc->twa_aen_queue[i] = &(aen_queue[i]); diff --git a/sys/dev/raid/twa/twa_cam.c b/sys/dev/raid/twa/twa_cam.c index b68419d493..befdf12ce7 100644 --- a/sys/dev/raid/twa/twa_cam.c +++ b/sys/dev/raid/twa/twa_cam.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD$ - * $DragonFly: src/sys/dev/raid/twa/twa_cam.c,v 1.4 2006/12/22 23:26:24 swildner Exp $ + * $DragonFly: src/sys/dev/raid/twa/twa_cam.c,v 1.5 2008/01/05 14:02:38 swildner Exp $ */ /* @@ -509,9 +509,8 @@ twa_request_bus_scan(struct twa_softc *sc) struct cam_path *path; union ccb *ccb; - if ((ccb = kmalloc(sizeof(union ccb), M_TEMP, M_WAITOK)) == NULL) + if ((ccb = kmalloc(sizeof(union ccb), M_TEMP, M_WAITOK|M_ZERO)) == NULL) return; - bzero(ccb, sizeof(union ccb)); if (xpt_create_path(&path, xpt_periph, cam_sim_path(sc->twa_sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) return; diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c index 035c5be40f..ab5c5fb78e 100644 --- a/sys/dev/sound/pci/envy24.c +++ b/sys/dev/sound/pci/envy24.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.11.2.2 2007/06/11 19:33:27 ariff Exp $ - * $DragonFly: src/sys/dev/sound/pci/envy24.c,v 1.2 2007/06/16 20:07:19 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pci/envy24.c,v 1.3 2008/01/05 14:02:38 swildner Exp $ */ #include @@ -37,7 +37,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/envy24.c,v 1.2 2007/06/16 20:07:19 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/envy24.c,v 1.3 2008/01/05 14:02:38 swildner Exp $"); MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio"); @@ -2505,12 +2505,11 @@ envy24_pci_attach(device_t dev) device_printf(dev, "envy24_pci_attach()\n"); #endif /* get sc_info data area */ - if ((sc = kmalloc(sizeof(*sc), M_ENVY24, M_NOWAIT)) == NULL) { + if ((sc = kmalloc(sizeof(*sc), M_ENVY24, M_NOWAIT | M_ZERO)) == NULL) { device_printf(dev, "cannot allocate softc\n"); return ENXIO; } - bzero(sc, sizeof(*sc)); sc->lock = snd_mtxcreate(device_get_nameunit(dev), "snd_envy24 softc"); sc->dev = dev; diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c index b529cdc21d..4d7939dc28 100644 --- a/sys/dev/sound/pci/envy24ht.c +++ b/sys/dev/sound/pci/envy24ht.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.11.2.2 2007/06/11 19:33:27 ariff Exp $ - * $DragonFly: src/sys/dev/sound/pci/envy24ht.c,v 1.2 2007/06/16 20:07:19 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pci/envy24ht.c,v 1.3 2008/01/05 14:02:38 swildner Exp $ */ /* @@ -49,7 +49,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/envy24ht.c,v 1.2 2007/06/16 20:07:19 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/envy24ht.c,v 1.3 2008/01/05 14:02:38 swildner Exp $"); MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio"); @@ -2460,12 +2460,11 @@ envy24ht_pci_attach(device_t dev) device_printf(dev, "envy24ht_pci_attach()\n"); #endif /* get sc_info data area */ - if ((sc = kmalloc(sizeof(*sc), M_ENVY24HT, M_NOWAIT)) == NULL) { + if ((sc = kmalloc(sizeof(*sc), M_ENVY24HT, M_NOWAIT | M_ZERO)) == NULL) { device_printf(dev, "cannot allocate softc\n"); return ENXIO; } - bzero(sc, sizeof(*sc)); sc->lock = snd_mtxcreate(device_get_nameunit(dev), "snd_envy24ht softc"); sc->dev = dev; diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index ef28ff601a..82a88385da 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -1,6 +1,6 @@ /* $NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $ */ /* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.14.2.2 2006/04/04 17:34:10 ariff Exp $ */ -/* $DragonFly: src/sys/dev/sound/usb/uaudio.c,v 1.18 2007/09/15 21:28:15 swildner Exp $: */ +/* $DragonFly: src/sys/dev/sound/usb/uaudio.c,v 1.19 2008/01/05 14:02:38 swildner Exp $: */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -3185,10 +3185,9 @@ audio_attach_mi(device_t dev) /* Attach the children. */ /* PCM Audio */ - func = kmalloc(sizeof(struct sndcard_func), M_DEVBUF, M_NOWAIT); + func = kmalloc(sizeof(struct sndcard_func), M_DEVBUF, M_NOWAIT | M_ZERO); if (func == NULL) return (ENOMEM); - bzero(func, sizeof(*func)); func->func = SCF_PCM; child = device_add_child(dev, "pcm", -1); device_set_ivars(child, func); diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index 2a7c586c7b..32cd35d5a1 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/kern/kern_linker.c,v 1.41.2.3 2001/11/21 17:50:35 luigi Exp $ - * $DragonFly: src/sys/kern/kern_linker.c,v 1.39 2007/11/19 18:49:06 swildner Exp $ + * $DragonFly: src/sys/kern/kern_linker.c,v 1.40 2008/01/05 14:02:38 swildner Exp $ */ #include "opt_ddb.h" @@ -83,10 +83,9 @@ linker_add_class(const char* desc, void* priv, { linker_class_t lc; - lc = kmalloc(sizeof(struct linker_class), M_LINKER, M_NOWAIT); + lc = kmalloc(sizeof(struct linker_class), M_LINKER, M_NOWAIT | M_ZERO); if (!lc) return ENOMEM; - bzero(lc, sizeof(*lc)); lc->desc = desc; lc->priv = priv; @@ -499,10 +498,9 @@ linker_file_add_dependancy(linker_file_t file, linker_file_t dep) linker_file_t* newdeps; newdeps = kmalloc((file->ndeps + 1) * sizeof(linker_file_t*), - M_LINKER, M_WAITOK); + M_LINKER, M_WAITOK | M_ZERO); if (newdeps == NULL) return ENOMEM; - bzero(newdeps, (file->ndeps + 1) * sizeof(linker_file_t*)); if (file->deps) { bcopy(file->deps, newdeps, file->ndeps * sizeof(linker_file_t*)); @@ -607,12 +605,11 @@ linker_file_lookup_symbol(linker_file_t file, const char* name, int deps, caddr_ cp = kmalloc(sizeof(struct common_symbol) + common_size + strlen(name) + 1, - M_LINKER, M_WAITOK); + M_LINKER, M_WAITOK | M_ZERO); if (!cp) { KLD_DPF(SYM, ("linker_file_lookup_symbol: nomem\n")); return ENOMEM; } - bzero(cp, sizeof(struct common_symbol) + common_size + strlen(name)+ 1); cp->address = (caddr_t) (cp + 1); cp->name = cp->address + common_size; diff --git a/sys/kern/kern_memio.c b/sys/kern/kern_memio.c index 93ea8da90a..7e5e424843 100644 --- a/sys/kern/kern_memio.c +++ b/sys/kern/kern_memio.c @@ -39,7 +39,7 @@ * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/i386/mem.c,v 1.79.2.9 2003/01/04 22:58:01 njl Exp $ - * $DragonFly: src/sys/kern/kern_memio.c,v 1.30 2007/02/25 23:17:12 corecode Exp $ + * $DragonFly: src/sys/kern/kern_memio.c,v 1.31 2008/01/05 14:02:38 swildner Exp $ */ /* @@ -286,9 +286,8 @@ mmrw(cdev_t dev, struct uio *uio, int flags) break; } if (zbuf == NULL) { - zbuf = (caddr_t) - kmalloc(PAGE_SIZE, M_TEMP, M_WAITOK); - bzero(zbuf, PAGE_SIZE); + zbuf = (caddr_t)kmalloc(PAGE_SIZE, M_TEMP, + M_WAITOK | M_ZERO); } c = min(iov->iov_len, PAGE_SIZE); error = uiomove(zbuf, (int)c, uio); diff --git a/sys/kern/kern_sensors.c b/sys/kern/kern_sensors.c index 3b2cda0240..67d1df2ef2 100644 --- a/sys/kern/kern_sensors.c +++ b/sys/kern/kern_sensors.c @@ -1,5 +1,5 @@ /* $OpenBSD: kern_sensors.c,v 1.19 2007/06/04 18:42:05 deraadt Exp $ */ -/* $DragonFly: src/sys/kern/kern_sensors.c,v 1.1 2007/10/02 12:57:01 hasso Exp $ */ +/* $DragonFly: src/sys/kern/kern_sensors.c,v 1.2 2008/01/05 14:02:38 swildner Exp $ */ /* * Copyright (c) 2005 David Gwynne @@ -350,8 +350,7 @@ sysctl_handle_sensordev(SYSCTL_HANDLER_ARGS) return (EPERM); /* Grab a copy, to clear the kernel pointers */ - usd = kmalloc(sizeof(*usd), M_TEMP, M_WAITOK); - bzero(usd, sizeof(*usd)); + usd = kmalloc(sizeof(*usd), M_TEMP, M_WAITOK | M_ZERO); usd->num = ksd->num; strlcpy(usd->xname, ksd->xname, sizeof(usd->xname)); memcpy(usd->maxnumt, ksd->maxnumt, sizeof(usd->maxnumt)); @@ -375,8 +374,7 @@ sysctl_handle_sensor(SYSCTL_HANDLER_ARGS) return (EPERM); /* Grab a copy, to clear the kernel pointers */ - us = kmalloc(sizeof(*us), M_TEMP, M_WAITOK); - bzero(us, sizeof(*us)); + us = kmalloc(sizeof(*us), M_TEMP, M_WAITOK | M_ZERO); memcpy(us->desc, ks->desc, sizeof(ks->desc)); us->tv = ks->tv; us->value = ks->value; diff --git a/sys/kern/link_aout.c b/sys/kern/link_aout.c index cac5c19344..acbe7cc0d8 100644 --- a/sys/kern/link_aout.c +++ b/sys/kern/link_aout.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/kern/link_aout.c,v 1.26 1999/12/24 15:33:36 bde Exp $ - * $DragonFly: src/sys/kern/link_aout.c,v 1.22 2007/04/30 07:18:54 dillon Exp $ + * $DragonFly: src/sys/kern/link_aout.c,v 1.23 2008/01/05 14:02:38 swildner Exp $ */ #define FREEBSD_AOUT 1 @@ -115,10 +115,9 @@ link_aout_init(void* arg) if (dp) { aout_file_t af; - af = kmalloc(sizeof(struct aout_file), M_LINKER, M_NOWAIT); + af = kmalloc(sizeof(struct aout_file), M_LINKER, M_NOWAIT | M_ZERO); if (af == NULL) panic("link_aout_init: Can't create linker structures for kernel"); - bzero(af, sizeof(*af)); af->address = 0; af->dynamic = dp; @@ -158,8 +157,7 @@ link_aout_load_module(const char* filename, linker_file_t* result) return(0); /* we can't handle this */ /* Looks like we can handle this one */ - af = kmalloc(sizeof(struct aout_file), M_LINKER, M_WAITOK); - bzero(af, sizeof(*af)); + af = kmalloc(sizeof(struct aout_file), M_LINKER, M_WAITOK | M_ZERO); af->address = baseptr; /* Assume _DYNAMIC is the first data item. */ @@ -242,8 +240,7 @@ link_aout_load_file(const char* filename, linker_file_t* result) /* * We have an a.out file, so make some space to read it in. */ - af = kmalloc(sizeof(struct aout_file), M_LINKER, M_WAITOK); - bzero(af, sizeof(*af)); + af = kmalloc(sizeof(struct aout_file), M_LINKER, M_WAITOK | M_ZERO); af->address = kmalloc(header.a_text + header.a_data + header.a_bss, M_LINKER, M_WAITOK); diff --git a/sys/kern/subr_rman.c b/sys/kern/subr_rman.c index 5be5d15793..86d0aede55 100644 --- a/sys/kern/subr_rman.c +++ b/sys/kern/subr_rman.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/kern/subr_rman.c,v 1.10.2.1 2001/06/05 08:06:08 imp Exp $ - * $DragonFly: src/sys/kern/subr_rman.c,v 1.13 2007/09/21 02:28:00 y0netan1 Exp $ + * $DragonFly: src/sys/kern/subr_rman.c,v 1.14 2008/01/05 14:02:38 swildner Exp $ */ /* @@ -126,10 +126,9 @@ rman_manage_region(struct rman *rm, u_long start, u_long end) DPRINTF(("rman_manage_region: <%s> request: start %#lx, end %#lx\n", rm->rm_descr, start, end)); - r = kmalloc(sizeof *r, M_RMAN, M_NOWAIT); + r = kmalloc(sizeof *r, M_RMAN, M_NOWAIT | M_ZERO); if (r == 0) return ENOMEM; - bzero(r, sizeof *r); r->r_sharehead = 0; r->r_start = start; r->r_end = end; @@ -259,10 +258,9 @@ rman_reserve_resource(struct rman *rm, u_long start, u_long end, u_long count, * split it in two. The first case requires * two new allocations; the second requires but one. */ - rv = kmalloc(sizeof *rv, M_RMAN, M_NOWAIT); + rv = kmalloc(sizeof *rv, M_RMAN, M_NOWAIT | M_ZERO); if (rv == 0) goto out; - bzero(rv, sizeof *rv); rv->r_start = rstart; rv->r_end = rstart + count - 1; rv->r_flags = flags | RF_ALLOCATED; @@ -279,13 +277,13 @@ rman_reserve_resource(struct rman *rm, u_long start, u_long end, u_long count, /* * We are allocating in the middle. */ - r = kmalloc(sizeof *r, M_RMAN, M_NOWAIT); + r = kmalloc(sizeof *r, M_RMAN, + M_NOWAIT | M_ZERO); if (r == 0) { kfree(rv, M_RMAN); rv = 0; goto out; } - bzero(r, sizeof *r); r->r_start = rv->r_end + 1; r->r_end = s->r_end; r->r_flags = s->r_flags; @@ -340,10 +338,9 @@ rman_reserve_resource(struct rman *rm, u_long start, u_long end, u_long count, rend = min(s->r_end, max(start + count, end)); if (s->r_start >= start && s->r_end <= end && (s->r_end - s->r_start + 1) == count) { - rv = kmalloc(sizeof *rv, M_RMAN, M_NOWAIT); + rv = kmalloc(sizeof *rv, M_RMAN, M_NOWAIT | M_ZERO); if (rv == 0) goto out; - bzero(rv, sizeof *rv); rv->r_start = s->r_start; rv->r_end = s->r_end; rv->r_flags = s->r_flags & @@ -352,13 +349,13 @@ rman_reserve_resource(struct rman *rm, u_long start, u_long end, u_long count, rv->r_rm = rm; if (s->r_sharehead == 0) { s->r_sharehead = kmalloc(sizeof *s->r_sharehead, - M_RMAN, M_NOWAIT); + M_RMAN, + M_NOWAIT | M_ZERO); if (s->r_sharehead == 0) { kfree(rv, M_RMAN); rv = 0; goto out; } - bzero(s->r_sharehead, sizeof *s->r_sharehead); LIST_INIT(s->r_sharehead); LIST_INSERT_HEAD(s->r_sharehead, s, r_sharelink); diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index ea82ce9635..364953dd1a 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -32,7 +32,7 @@ * * @(#)tty_pty.c 8.4 (Berkeley) 2/20/95 * $FreeBSD: src/sys/kern/tty_pty.c,v 1.74.2.4 2002/02/20 19:58:13 dillon Exp $ - * $DragonFly: src/sys/kern/tty_pty.c,v 1.19 2007/02/03 17:05:58 corecode Exp $ + * $DragonFly: src/sys/kern/tty_pty.c,v 1.20 2008/01/05 14:02:38 swildner Exp $ */ /* @@ -139,8 +139,7 @@ ptyinit(int n) if (n & ~0xff) return; - pt = kmalloc(sizeof(*pt), M_PTY, M_WAITOK); - bzero(pt, sizeof(*pt)); + pt = kmalloc(sizeof(*pt), M_PTY, M_WAITOK | M_ZERO); pt->devs = devs = make_dev(&pts_ops, n, 0, 0, 0666, "tty%c%r", names[n / 32], n % 32); pt->devc = devc = make_dev(&ptc_ops, n, diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 3812c8fa2b..c908b26788 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -65,7 +65,7 @@ * * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 * $FreeBSD: src/sys/kern/uipc_socket.c,v 1.68.2.24 2003/11/11 17:18:18 silby Exp $ - * $DragonFly: src/sys/kern/uipc_socket.c,v 1.46 2007/11/07 18:24:06 dillon Exp $ + * $DragonFly: src/sys/kern/uipc_socket.c,v 1.47 2008/01/05 14:02:38 swildner Exp $ */ #include "opt_inet.h" @@ -1198,8 +1198,7 @@ do_setopt_accept_filter(struct socket *so, struct sockopt *sopt) error = ENOENT; goto out; } - MALLOC(af, struct so_accf *, sizeof(*af), M_ACCF, M_WAITOK); - bzero(af, sizeof(*af)); + MALLOC(af, struct so_accf *, sizeof(*af), M_ACCF, M_WAITOK | M_ZERO); if (afp->accf_create != NULL) { if (afap->af_name[0] != '\0') { int len = strlen(afap->af_name) + 1; @@ -1455,8 +1454,7 @@ sogetopt(struct socket *so, struct sockopt *sopt) if ((so->so_options & SO_ACCEPTCONN) == 0) return (EINVAL); MALLOC(afap, struct accept_filter_arg *, sizeof(*afap), - M_TEMP, M_WAITOK); - bzero(afap, sizeof(*afap)); + M_TEMP, M_WAITOK | M_ZERO); if ((so->so_options & SO_ACCEPTFILTER) != 0) { strcpy(afap->af_name, so->so_accf->so_accept_filter->accf_name); if (so->so_accf->so_accept_filter_str != NULL) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index f1423ce5cd..8dadacf1f5 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -67,7 +67,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/kern/vfs_mount.c,v 1.29 2007/11/06 03:49:58 dillon Exp $ + * $DragonFly: src/sys/kern/vfs_mount.c,v 1.30 2008/01/05 14:02:38 swildner Exp $ */ /* @@ -299,8 +299,7 @@ vfs_rootmountalloc(char *fstypename, char *devname, struct mount **mpp) } if (vfsp == NULL) return (ENODEV); - mp = kmalloc(sizeof(struct mount), M_MOUNT, M_WAITOK); - bzero((char *)mp, (u_long)sizeof(struct mount)); + mp = kmalloc(sizeof(struct mount), M_MOUNT, M_WAITOK | M_ZERO); lockinit(&mp->mnt_lock, "vfslock", VLKTIMEOUT, 0); vfs_busy(mp, LK_NOWAIT); TAILQ_INIT(&mp->mnt_nvnodelist); diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 4bfdb72315..4d0d9ab8c1 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -37,7 +37,7 @@ * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.249.2.30 2003/04/04 20:35:57 tegge Exp $ - * $DragonFly: src/sys/kern/vfs_subr.c,v 1.109 2007/11/07 00:46:36 dillon Exp $ + * $DragonFly: src/sys/kern/vfs_subr.c,v 1.110 2008/01/05 14:02:38 swildner Exp $ */ /* @@ -1617,8 +1617,7 @@ vfs_hang_addrlist(struct mount *mp, struct netexport *nep, return (EINVAL); i = sizeof(struct netcred) + argp->ex_addrlen + argp->ex_masklen; - np = (struct netcred *) kmalloc(i, M_NETADDR, M_WAITOK); - bzero((caddr_t) np, i); + np = (struct netcred *) kmalloc(i, M_NETADDR, M_WAITOK | M_ZERO); saddr = (struct sockaddr *) (np + 1); if ((error = copyin(argp->ex_addr, (caddr_t) saddr, argp->ex_addrlen))) goto out; diff --git a/sys/libiconv/iconv.c b/sys/libiconv/iconv.c index ae1b177e5b..68852e2d4e 100644 --- a/sys/libiconv/iconv.c +++ b/sys/libiconv/iconv.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/libkern/iconv.c,v 1.1.2.1 2001/05/21 08:28:07 bp Exp $ - * $DragonFly: src/sys/libiconv/iconv.c,v 1.7 2007/05/13 18:33:58 swildner Exp $ + * $DragonFly: src/sys/libiconv/iconv.c,v 1.8 2008/01/05 14:02:38 swildner Exp $ */ #include #include @@ -186,8 +186,7 @@ iconv_register_cspair(const char *to, const char *from, ucsfrom = strcmp(from, iconv_unicode_string) == 0; if (!ucsfrom) csize += strlen(from) + 1; - csp = kmalloc(csize, M_ICONV, M_WAITOK); - bzero(csp, csize); + csp = kmalloc(csize, M_ICONV, M_WAITOK | M_ZERO); csp->cp_id = iconv_csid++; csp->cp_dcp = dcp; cp = (char*)(csp + 1); diff --git a/sys/net/ef/if_ef.c b/sys/net/ef/if_ef.c index 6dd1f26c03..02b487eaeb 100644 --- a/sys/net/ef/if_ef.c +++ b/sys/net/ef/if_ef.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/if_ef.c,v 1.2.2.4 2001/02/22 09:27:04 bp Exp $ - * $DragonFly: src/sys/net/ef/if_ef.c,v 1.23 2007/10/13 08:49:35 sephe Exp $ + * $DragonFly: src/sys/net/ef/if_ef.c,v 1.24 2008/01/05 14:02:38 swildner Exp $ */ #include "opt_inet.h" @@ -506,12 +506,11 @@ ef_load(void) if (ifp->if_type != IFT_ETHER) continue; EFDEBUG("Found interface %s\n", ifp->if_xname); efl = (struct ef_link*)kmalloc(sizeof(struct ef_link), - M_IFADDR, M_WAITOK); + M_IFADDR, M_WAITOK | M_ZERO); if (efl == NULL) { error = ENOMEM; break; } - bzero(efl, sizeof(*efl)); efl->el_ifp = ifp; #ifdef ETHER_II diff --git a/sys/net/faith/if_faith.c b/sys/net/faith/if_faith.c index a907076560..fda9cae22c 100644 --- a/sys/net/faith/if_faith.c +++ b/sys/net/faith/if_faith.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/if_faith.c,v 1.3.2.6 2002/04/28 05:40:25 suz Exp $ - * $DragonFly: src/sys/net/faith/if_faith.c,v 1.16 2006/10/25 20:56:02 dillon Exp $ + * $DragonFly: src/sys/net/faith/if_faith.c,v 1.17 2008/01/05 14:02:38 swildner Exp $ */ /* * derived from @@ -157,8 +157,7 @@ faith_clone_create(struct if_clone *ifc, int unit) { struct faith_softc *sc; - sc = kmalloc(sizeof(struct faith_softc), M_FAITH, M_WAITOK); - bzero(sc, sizeof(struct faith_softc)); + sc = kmalloc(sizeof(struct faith_softc), M_FAITH, M_WAITOK | M_ZERO); sc->sc_if.if_softc = sc; if_initname(&(sc->sc_if), FAITHNAME, unit); diff --git a/sys/net/gif/if_gif.c b/sys/net/gif/if_gif.c index c51630caef..13c1dec50f 100644 --- a/sys/net/gif/if_gif.c +++ b/sys/net/gif/if_gif.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/if_gif.c,v 1.4.2.15 2002/11/08 16:57:13 ume Exp $ - * $DragonFly: src/sys/net/gif/if_gif.c,v 1.18 2006/10/25 20:56:02 dillon Exp $ + * $DragonFly: src/sys/net/gif/if_gif.c,v 1.19 2008/01/05 14:02:38 swildner Exp $ * $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */ @@ -132,8 +132,7 @@ gif_clone_create(struct if_clone *ifc, int unit) { struct gif_softc *sc; - sc = kmalloc (sizeof(struct gif_softc), M_GIF, M_WAITOK); - bzero(sc, sizeof(struct gif_softc)); + sc = kmalloc (sizeof(struct gif_softc), M_GIF, M_WAITOK | M_ZERO); sc->gif_if.if_softc = sc; if_initname(&(sc->gif_if), GIFNAME, unit); diff --git a/sys/net/pf/pf_if.c b/sys/net/pf/pf_if.c index db48ab8f84..fe53830f37 100644 --- a/sys/net/pf/pf_if.c +++ b/sys/net/pf/pf_if.c @@ -1,7 +1,7 @@ /* $FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.6 2004/09/14 15:20:24 mlaier Exp $ */ /* $OpenBSD: pf_if.c,v 1.11 2004/03/15 11:38:23 cedric Exp $ */ /* add $OpenBSD: pf_if.c,v 1.19 2004/08/11 12:06:44 henning Exp $ */ -/* $DragonFly: src/sys/net/pf/pf_if.c,v 1.8 2006/12/22 23:44:57 swildner Exp $ */ +/* $DragonFly: src/sys/net/pf/pf_if.c,v 1.9 2008/01/05 14:02:38 swildner Exp $ */ /* * Copyright (c) 2004 The DragonFly Project. All rights reserved. @@ -250,11 +250,10 @@ pfi_attach_ifnet(struct ifnet *ifp) m = oldlim * sizeof(struct pfi_kif *); mp = pfi_index2kif; n = pfi_indexlim * sizeof(struct pfi_kif *); - np = kmalloc(n, PFI_MTYPE, M_NOWAIT); + np = kmalloc(n, PFI_MTYPE, M_NOWAIT | M_ZERO); if (np == NULL) panic("pfi_attach_ifnet: " "cannot allocate translation table"); - bzero(np, n); if (mp != NULL) bcopy(mp, np, m); pfi_index2kif = np; @@ -692,17 +691,15 @@ pfi_if_create(const char *name, struct pfi_kif *q, int flags) { struct pfi_kif *p; - p = kmalloc(sizeof(*p), PFI_MTYPE, M_NOWAIT); + p = kmalloc(sizeof(*p), PFI_MTYPE, M_NOWAIT | M_ZERO); if (p == NULL) return (NULL); - bzero(p, sizeof(*p)); p->pfik_ah_head = kmalloc(sizeof(*p->pfik_ah_head), PFI_MTYPE, - M_NOWAIT); + M_NOWAIT | M_ZERO); if (p->pfik_ah_head == NULL) { kfree(p, PFI_MTYPE); return (NULL); } - bzero(p->pfik_ah_head, sizeof(*p->pfik_ah_head)); TAILQ_INIT(p->pfik_ah_head); TAILQ_INIT(&p->pfik_grouphead); strlcpy(p->pfik_name, name, sizeof(p->pfik_name)); diff --git a/sys/net/pf/pf_ioctl.c b/sys/net/pf/pf_ioctl.c index 374766ab72..266ae6255b 100644 --- a/sys/net/pf/pf_ioctl.c +++ b/sys/net/pf/pf_ioctl.c @@ -1,6 +1,6 @@ /* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.12 2004/08/12 14:15:42 mlaier Exp $ */ /* $OpenBSD: pf_ioctl.c,v 1.112.2.2 2004/07/24 18:28:12 brad Exp $ */ -/* $DragonFly: src/sys/net/pf/pf_ioctl.c,v 1.12 2007/05/13 18:33:58 swildner Exp $ */ +/* $DragonFly: src/sys/net/pf/pf_ioctl.c,v 1.13 2008/01/05 14:02:38 swildner Exp $ */ /* * Copyright (c) 2004 The DragonFly Project. All rights reserved. @@ -601,10 +601,9 @@ tagname2tag(struct pf_tags *head, char *tagname) /* allocate and fill new struct pf_tagname */ tag = (struct pf_tagname *)kmalloc(sizeof(struct pf_tagname), - M_TEMP, M_NOWAIT); + M_TEMP, M_NOWAIT | M_ZERO); if (tag == NULL) return (0); - bzero(tag, sizeof(struct pf_tagname)); strlcpy(tag->name, tagname, sizeof(tag->name)); tag->tag = new_tagid; tag->ref++; diff --git a/sys/net/stf/if_stf.c b/sys/net/stf/if_stf.c index 88c1344bb6..21608850ab 100644 --- a/sys/net/stf/if_stf.c +++ b/sys/net/stf/if_stf.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/net/if_stf.c,v 1.1.2.11 2003/01/23 21:06:44 sam Exp $ */ -/* $DragonFly: src/sys/net/stf/if_stf.c,v 1.19 2007/09/01 20:43:24 pavalos Exp $ */ +/* $DragonFly: src/sys/net/stf/if_stf.c,v 1.20 2008/01/05 14:02:38 swildner Exp $ */ /* $KAME: if_stf.c,v 1.73 2001/12/03 11:08:30 keiichi Exp $ */ /* @@ -163,8 +163,8 @@ stfmodevent(module_t mod, int type, void *data) switch (type) { case MOD_LOAD: - stf = kmalloc(sizeof(struct stf_softc), M_STF, M_WAITOK); - bzero(stf, sizeof(struct stf_softc)); + stf = kmalloc(sizeof(struct stf_softc), M_STF, + M_WAITOK | M_ZERO); sc = stf; bzero(sc, sizeof(*sc)); diff --git a/sys/netgraph/UI/ng_UI.c b/sys/netgraph/UI/ng_UI.c index 8e891050e8..ee7946b334 100644 --- a/sys/netgraph/UI/ng_UI.c +++ b/sys/netgraph/UI/ng_UI.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_UI.c,v 1.6.2.2 2000/10/24 18:36:44 julian Exp $ - * $DragonFly: src/sys/netgraph/UI/ng_UI.c,v 1.5 2005/02/17 13:59:59 joerg Exp $ + * $DragonFly: src/sys/netgraph/UI/ng_UI.c,v 1.6 2008/01/05 14:02:39 swildner Exp $ * $Whistle: ng_UI.c,v 1.14 1999/11/01 09:24:51 julian Exp $ */ @@ -109,10 +109,9 @@ ng_UI_constructor(node_p *nodep) int error; /* Allocate private structure */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT); + MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); if (priv == NULL) return (ENOMEM); - bzero(priv, sizeof(*priv)); /* Call generic node constructor */ if ((error = ng_make_node_common(&typestruct, nodep))) { diff --git a/sys/netgraph/async/ng_async.c b/sys/netgraph/async/ng_async.c index 977031a1c0..0dcce04d62 100644 --- a/sys/netgraph/async/ng_async.c +++ b/sys/netgraph/async/ng_async.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_async.c,v 1.6.2.5 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/async/ng_async.c,v 1.6 2005/02/17 13:59:59 joerg Exp $ + * $DragonFly: src/sys/netgraph/async/ng_async.c,v 1.7 2008/01/05 14:02:39 swildner Exp $ * $Whistle: ng_async.c,v 1.17 1999/11/01 09:24:51 julian Exp $ */ @@ -183,10 +183,9 @@ nga_constructor(node_p *nodep) if ((error = ng_make_node_common(&typestruct, nodep))) return (error); - MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT); + MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO); if (sc == NULL) return (ENOMEM); - bzero(sc, sizeof(*sc)); sc->amode = MODE_HUNT; sc->cfg.accm = ~0; sc->cfg.amru = NG_ASYNC_DEFAULT_MRU; diff --git a/sys/netgraph/bpf/ng_bpf.c b/sys/netgraph/bpf/ng_bpf.c index 4dfef3f395..336bf917da 100644 --- a/sys/netgraph/bpf/ng_bpf.c +++ b/sys/netgraph/bpf/ng_bpf.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_bpf.c,v 1.2.4.4 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/bpf/ng_bpf.c,v 1.4 2005/02/17 13:59:59 joerg Exp $ + * $DragonFly: src/sys/netgraph/bpf/ng_bpf.c,v 1.5 2008/01/05 14:02:39 swildner Exp $ * $Whistle: ng_bpf.c,v 1.3 1999/12/03 20:30:23 archie Exp $ */ @@ -236,10 +236,9 @@ ng_bpf_newhook(node_p node, hook_p hook, const char *name) int error; /* Create hook private structure */ - MALLOC(hip, hinfo_p, sizeof(*hip), M_NETGRAPH, M_NOWAIT); + MALLOC(hip, hinfo_p, sizeof(*hip), M_NETGRAPH, M_NOWAIT | M_ZERO); if (hip == NULL) return (ENOMEM); - bzero(hip, sizeof(*hip)); hip->hook = hook; hook->private = hip; hip->node = node; diff --git a/sys/netgraph/bridge/ng_bridge.c b/sys/netgraph/bridge/ng_bridge.c index 8fae6434a0..d678ab4c99 100644 --- a/sys/netgraph/bridge/ng_bridge.c +++ b/sys/netgraph/bridge/ng_bridge.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_bridge.c,v 1.1.2.5 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/bridge/ng_bridge.c,v 1.10 2007/06/03 20:51:12 dillon Exp $ + * $DragonFly: src/sys/netgraph/bridge/ng_bridge.c,v 1.11 2008/01/05 14:02:39 swildner Exp $ */ /* @@ -301,20 +301,18 @@ ng_bridge_constructor(node_p *nodep) int error; /* Allocate and initialize private info */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT); + MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); if (priv == NULL) return (ENOMEM); - bzero(priv, sizeof(*priv)); callout_init(&priv->timer); /* Allocate and initialize hash table, etc. */ MALLOC(priv->tab, struct ng_bridge_bucket *, - MIN_BUCKETS * sizeof(*priv->tab), M_NETGRAPH, M_NOWAIT); + MIN_BUCKETS * sizeof(*priv->tab), M_NETGRAPH, M_NOWAIT | M_ZERO); if (priv->tab == NULL) { FREE(priv, M_NETGRAPH); return (ENOMEM); } - bzero(priv->tab, MIN_BUCKETS * sizeof(*priv->tab)); /* init SLIST's */ priv->numBuckets = MIN_BUCKETS; priv->hashMask = MIN_BUCKETS - 1; priv->conf.debugLevel = 1; @@ -859,10 +857,9 @@ ng_bridge_rehash(priv_p priv) /* Allocate and initialize new table */ MALLOC(newTab, struct ng_bridge_bucket *, - newNumBuckets * sizeof(*newTab), M_NETGRAPH, M_NOWAIT); + newNumBuckets * sizeof(*newTab), M_NETGRAPH, M_NOWAIT | M_ZERO); if (newTab == NULL) return; - bzero(newTab, newNumBuckets * sizeof(*newTab)); /* Move all entries from old table to new table */ for (oldBucket = 0; oldBucket < priv->numBuckets; oldBucket++) { diff --git a/sys/netgraph/cisco/ng_cisco.c b/sys/netgraph/cisco/ng_cisco.c index b9a82ab643..6104fb0c9e 100644 --- a/sys/netgraph/cisco/ng_cisco.c +++ b/sys/netgraph/cisco/ng_cisco.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_cisco.c,v 1.4.2.6 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/cisco/ng_cisco.c,v 1.9 2006/12/20 18:14:43 dillon Exp $ + * $DragonFly: src/sys/netgraph/cisco/ng_cisco.c,v 1.10 2008/01/05 14:02:39 swildner Exp $ * $Whistle: ng_cisco.c,v 1.25 1999/11/01 09:24:51 julian Exp $ */ @@ -200,10 +200,9 @@ cisco_constructor(node_p *nodep) sc_p sc; int error = 0; - MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT); + MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO); if (sc == NULL) return (ENOMEM); - bzero(sc, sizeof(struct cisco_priv)); callout_init(&sc->timeout); if ((error = ng_make_node_common(&typestruct, nodep))) { diff --git a/sys/netgraph/eiface/ng_eiface.c b/sys/netgraph/eiface/ng_eiface.c index b68edb3d7d..779c23f46e 100644 --- a/sys/netgraph/eiface/ng_eiface.c +++ b/sys/netgraph/eiface/ng_eiface.c @@ -28,7 +28,7 @@ * * $Id: ng_eiface.c,v 1.14 2000/03/15 12:28:44 vitaly Exp $ * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.4.2.5 2002/12/17 21:47:48 julian Exp $ - * $DragonFly: src/sys/netgraph/eiface/ng_eiface.c,v 1.14 2007/09/15 23:52:49 swildner Exp $ + * $DragonFly: src/sys/netgraph/eiface/ng_eiface.c,v 1.15 2008/01/05 14:02:39 swildner Exp $ */ #include @@ -316,10 +316,9 @@ ng_eiface_constructor(node_p *nodep) int error = 0; /* Allocate node and interface private structures */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_WAITOK); + MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); if (priv == NULL) return (ENOMEM); - bzero(priv, sizeof(*priv)); ifp = &(priv->arpcom.ac_if); diff --git a/sys/netgraph/ether/ng_ether.c b/sys/netgraph/ether/ng_ether.c index 749a7ae4fe..f94250ed0b 100644 --- a/sys/netgraph/ether/ng_ether.c +++ b/sys/netgraph/ether/ng_ether.c @@ -38,7 +38,7 @@ * Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_ether.c,v 1.2.2.13 2002/07/02 20:10:25 archie Exp $ - * $DragonFly: src/sys/netgraph/ether/ng_ether.c,v 1.12 2007/10/13 10:50:34 sephe Exp $ + * $DragonFly: src/sys/netgraph/ether/ng_ether.c,v 1.13 2008/01/05 14:02:39 swildner Exp $ */ /* @@ -310,14 +310,13 @@ ng_ether_attach(struct ifnet *ifp) } /* Allocate private data */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT); + MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); if (priv == NULL) { log(LOG_ERR, "%s: can't %s for %s\n", __func__, "allocate memory", name); ng_unref(node); return; } - bzero(priv, sizeof(*priv)); node->private = priv; priv->ifp = ifp; IFP2NG(ifp) = node; diff --git a/sys/netgraph/fec/ng_fec.c b/sys/netgraph/fec/ng_fec.c index 2313e83da6..3a3ecd0325 100644 --- a/sys/netgraph/fec/ng_fec.c +++ b/sys/netgraph/fec/ng_fec.c @@ -33,7 +33,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/netgraph/ng_fec.c,v 1.1.2.1 2002/11/01 21:39:31 julian Exp $ - * $DragonFly: src/sys/netgraph/fec/ng_fec.c,v 1.21 2007/11/16 05:07:36 sephe Exp $ + * $DragonFly: src/sys/netgraph/fec/ng_fec.c,v 1.22 2008/01/05 14:02:39 swildner Exp $ */ /* * Copyright (c) 1996-1999 Whistle Communications, Inc. @@ -1048,10 +1048,9 @@ ng_fec_constructor(node_p *nodep) int error = 0; /* Allocate node and interface private structures */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT); + MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); if (priv == NULL) return (ENOMEM); - bzero(priv, sizeof(*priv)); ifp = &priv->arpcom.ac_if; b = &priv->fec_bundle; diff --git a/sys/netgraph/frame_relay/ng_frame_relay.c b/sys/netgraph/frame_relay/ng_frame_relay.c index 9699f9c846..6e1ff86ef2 100644 --- a/sys/netgraph/frame_relay/ng_frame_relay.c +++ b/sys/netgraph/frame_relay/ng_frame_relay.c @@ -37,7 +37,7 @@ * Author: Julian Elisher * * $FreeBSD: src/sys/netgraph/ng_frame_relay.c,v 1.9.2.2 2000/10/24 18:36:45 julian Exp $ - * $DragonFly: src/sys/netgraph/frame_relay/ng_frame_relay.c,v 1.5 2005/02/17 13:59:59 joerg Exp $ + * $DragonFly: src/sys/netgraph/frame_relay/ng_frame_relay.c,v 1.6 2008/01/05 14:02:39 swildner Exp $ * $Whistle: ng_frame_relay.c,v 1.20 1999/11/01 09:24:51 julian Exp $ */ @@ -220,10 +220,9 @@ ngfrm_constructor(node_p *nodep) sc_p sc; int error = 0; - MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT); + MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO); if (!sc) return (ENOMEM); - bzero(sc, sizeof(*sc)); if ((error = ng_make_node_common(&typestruct, nodep))) { FREE(sc, M_NETGRAPH); return (error); diff --git a/sys/netgraph/iface/ng_iface.c b/sys/netgraph/iface/ng_iface.c index d6748a2663..b92dcea626 100644 --- a/sys/netgraph/iface/ng_iface.c +++ b/sys/netgraph/iface/ng_iface.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_iface.c,v 1.7.2.5 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/iface/ng_iface.c,v 1.13 2006/12/22 23:44:57 swildner Exp $ + * $DragonFly: src/sys/netgraph/iface/ng_iface.c,v 1.14 2008/01/05 14:02:39 swildner Exp $ * $Whistle: ng_iface.c,v 1.33 1999/11/01 09:24:51 julian Exp $ */ @@ -534,16 +534,14 @@ ng_iface_constructor(node_p *nodep) int error = 0; /* Allocate node and interface private structures */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT); + MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); if (priv == NULL) return (ENOMEM); - bzero(priv, sizeof(*priv)); - MALLOC(ifp, struct ifnet *, sizeof(*ifp), M_NETGRAPH, M_NOWAIT); + MALLOC(ifp, struct ifnet *, sizeof(*ifp), M_NETGRAPH, M_NOWAIT | M_ZERO); if (ifp == NULL) { FREE(priv, M_NETGRAPH); return (ENOMEM); } - bzero(ifp, sizeof(*ifp)); /* Link them together */ ifp->if_softc = priv; diff --git a/sys/netgraph/ksocket/ng_ksocket.c b/sys/netgraph/ksocket/ng_ksocket.c index 60af28b60c..334023cc85 100644 --- a/sys/netgraph/ksocket/ng_ksocket.c +++ b/sys/netgraph/ksocket/ng_ksocket.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_ksocket.c,v 1.5.2.14 2003/08/24 08:24:38 hsu Exp $ - * $DragonFly: src/sys/netgraph/ksocket/ng_ksocket.c,v 1.15 2007/06/03 20:51:12 dillon Exp $ + * $DragonFly: src/sys/netgraph/ksocket/ng_ksocket.c,v 1.16 2008/01/05 14:02:39 swildner Exp $ * $Whistle: ng_ksocket.c,v 1.1 1999/11/16 20:04:40 archie Exp $ */ @@ -536,10 +536,9 @@ ng_ksocket_constructor(node_p *nodep) int error; /* Allocate private structure */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT); + MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); if (priv == NULL) return (ENOMEM); - bzero(priv, sizeof(*priv)); /* Call generic node constructor */ if ((error = ng_make_node_common(&ng_ksocket_typestruct, nodep))) { diff --git a/sys/netgraph/lmi/ng_lmi.c b/sys/netgraph/lmi/ng_lmi.c index bf96011430..732a3e7f1c 100644 --- a/sys/netgraph/lmi/ng_lmi.c +++ b/sys/netgraph/lmi/ng_lmi.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_lmi.c,v 1.5.2.3 2002/07/02 22:17:18 archie Exp $ - * $DragonFly: src/sys/netgraph/lmi/ng_lmi.c,v 1.7 2006/12/20 18:14:43 dillon Exp $ + * $DragonFly: src/sys/netgraph/lmi/ng_lmi.c,v 1.8 2008/01/05 14:02:39 swildner Exp $ * $Whistle: ng_lmi.c,v 1.38 1999/11/01 09:24:52 julian Exp $ */ @@ -192,10 +192,9 @@ nglmi_constructor(node_p *nodep) sc_p sc; int error = 0; - MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT); + MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO); if (sc == NULL) return (ENOMEM); - bzero(sc, sizeof(*sc)); callout_init(&sc->timeout); if ((error = ng_make_node_common(&typestruct, nodep))) { diff --git a/sys/netgraph/mppc/ng_mppc.c b/sys/netgraph/mppc/ng_mppc.c index bf631f6b17..f03e0ada25 100644 --- a/sys/netgraph/mppc/ng_mppc.c +++ b/sys/netgraph/mppc/ng_mppc.c @@ -38,7 +38,7 @@ * * $Whistle: ng_mppc.c,v 1.4 1999/11/25 00:10:12 archie Exp $ * $FreeBSD: src/sys/netgraph/ng_mppc.c,v 1.1.2.7 2002/12/16 17:58:42 archie Exp $ - * $DragonFly: src/sys/netgraph/mppc/ng_mppc.c,v 1.5 2005/02/17 13:59:59 joerg Exp $ + * $DragonFly: src/sys/netgraph/mppc/ng_mppc.c,v 1.6 2008/01/05 14:02:39 swildner Exp $ */ /* @@ -186,10 +186,9 @@ ng_mppc_constructor(node_p *nodep) int error; /* Allocate private structure */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT); + MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); if (priv == NULL) return (ENOMEM); - bzero(priv, sizeof(*priv)); /* Call generic node constructor */ if ((error = ng_make_node_common(&ng_mppc_typestruct, nodep))) { diff --git a/sys/netgraph/netgraph/ng_base.c b/sys/netgraph/netgraph/ng_base.c index 32d69b584e..d0acda554c 100644 --- a/sys/netgraph/netgraph/ng_base.c +++ b/sys/netgraph/netgraph/ng_base.c @@ -38,7 +38,7 @@ * Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.11.2.17 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/netgraph/ng_base.c,v 1.25 2007/06/03 20:51:12 dillon Exp $ + * $DragonFly: src/sys/netgraph/netgraph/ng_base.c,v 1.26 2008/01/05 14:02:39 swildner Exp $ * $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $ */ @@ -403,12 +403,11 @@ ng_make_node_common(struct ng_type *type, node_p *nodepp) } /* Make a node and try attach it to the type */ - MALLOC(node, node_p, sizeof(*node), M_NETGRAPH, M_NOWAIT); + MALLOC(node, node_p, sizeof(*node), M_NETGRAPH, M_NOWAIT | M_ZERO); if (node == NULL) { TRAP_ERROR; return (ENOMEM); } - bzero(node, sizeof(*node)); node->type = type; node->refs++; /* note reference */ type->refs++; @@ -728,12 +727,11 @@ ng_add_hook(node_p node, const char *name, hook_p *hookp) } /* Allocate the hook and link it up */ - MALLOC(hook, hook_p, sizeof(*hook), M_NETGRAPH, M_NOWAIT); + MALLOC(hook, hook_p, sizeof(*hook), M_NETGRAPH, M_NOWAIT | M_ZERO); if (hook == NULL) { TRAP_ERROR; return (ENOMEM); } - bzero(hook, sizeof(*hook)); hook->refs = 1; hook->flags = HK_INVALID; hook->node = node; diff --git a/sys/netgraph/netgraph/ng_parse.c b/sys/netgraph/netgraph/ng_parse.c index ea87acb414..3c996a683b 100644 --- a/sys/netgraph/netgraph/ng_parse.c +++ b/sys/netgraph/netgraph/ng_parse.c @@ -38,7 +38,7 @@ * * $Whistle: ng_parse.c,v 1.3 1999/11/29 01:43:48 archie Exp $ * $FreeBSD: src/sys/netgraph/ng_parse.c,v 1.3.2.8 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/netgraph/ng_parse.c,v 1.9 2007/06/03 20:51:12 dillon Exp $ + * $DragonFly: src/sys/netgraph/netgraph/ng_parse.c,v 1.10 2008/01/05 14:02:39 swildner Exp $ */ #include @@ -1061,12 +1061,11 @@ ng_parse_composite(const struct ng_parse_type *type, const char *s, int align, len, blen, error = 0; /* Initialize */ - MALLOC(foff, int *, num * sizeof(*foff), M_NETGRAPH, M_NOWAIT); + MALLOC(foff, int *, num * sizeof(*foff), M_NETGRAPH, M_NOWAIT | M_ZERO); if (foff == NULL) { error = ENOMEM; goto done; } - bzero(foff, num * sizeof(*foff)); /* Get opening brace/bracket */ if (ng_parse_get_token(s, off, &len) diff --git a/sys/netgraph/ng_message.h b/sys/netgraph/ng_message.h index 81e3af73e5..45ef0cc2e7 100644 --- a/sys/netgraph/ng_message.h +++ b/sys/netgraph/ng_message.h @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_message.h,v 1.4.2.5 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/ng_message.h,v 1.5 2007/06/03 20:51:10 dillon Exp $ + * $DragonFly: src/sys/netgraph/ng_message.h,v 1.6 2008/01/05 14:02:38 swildner Exp $ * $Whistle: ng_message.h,v 1.12 1999/01/25 01:17:44 archie Exp $ */ @@ -275,10 +275,9 @@ struct typelist { #define NG_MKMESSAGE(msg, cookie, cmdid, len, how) \ do { \ MALLOC((msg), struct ng_mesg *, sizeof(struct ng_mesg) \ - + (len), M_NETGRAPH, (how)); \ + + (len), M_NETGRAPH, (how) | M_ZERO); \ if ((msg) == NULL) \ break; \ - bzero((msg), sizeof(struct ng_mesg) + (len)); \ (msg)->header.version = NG_VERSION; \ (msg)->header.typecookie = (cookie); \ (msg)->header.cmd = (cmdid); \ diff --git a/sys/netgraph/ng_sample.c b/sys/netgraph/ng_sample.c index 40d6fb2155..7db99cfa49 100644 --- a/sys/netgraph/ng_sample.c +++ b/sys/netgraph/ng_sample.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_sample.c,v 1.7.2.3 2002/07/02 23:44:03 archie Exp $ - * $DragonFly: src/sys/netgraph/ng_sample.c,v 1.3 2006/01/14 11:10:47 swildner Exp $ + * $DragonFly: src/sys/netgraph/ng_sample.c,v 1.4 2008/01/05 14:02:38 swildner Exp $ * $Whistle: ng_sample.c,v 1.13 1999/11/01 09:24:52 julian Exp $ */ @@ -153,10 +153,9 @@ ng_xxx_constructor(node_p *nodep) int i, error; /* Initialize private descriptor */ - MALLOC(privdata, xxx_p, sizeof(*privdata), M_NETGRAPH, M_NOWAIT); + MALLOC(privdata, xxx_p, sizeof(*privdata), M_NETGRAPH, M_NOWAIT | M_ZERO); if (privdata == NULL) return (ENOMEM); - bzero(privdata, sizeof(struct XXX)); for (i = 0; i < XXX_NUM_DLCIS; i++) { privdata->channel[i].dlci = -2; privdata->channel[i].channel = i; diff --git a/sys/netgraph/ppp/ng_ppp.c b/sys/netgraph/ppp/ng_ppp.c index 1114580fa8..e0e30c7aff 100644 --- a/sys/netgraph/ppp/ng_ppp.c +++ b/sys/netgraph/ppp/ng_ppp.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_ppp.c,v 1.15.2.10 2003/03/10 17:55:48 archie Exp $ - * $DragonFly: src/sys/netgraph/ppp/ng_ppp.c,v 1.12 2007/06/03 20:51:13 dillon Exp $ + * $DragonFly: src/sys/netgraph/ppp/ng_ppp.c,v 1.13 2008/01/05 14:02:39 swildner Exp $ * $Whistle: ng_ppp.c,v 1.24 1999/11/01 09:24:52 julian Exp $ */ @@ -385,10 +385,9 @@ ng_ppp_constructor(node_p *nodep) int i, error; /* Allocate private structure */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT); + MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); if (priv == NULL) return (ENOMEM); - bzero(priv, sizeof(*priv)); /* Call generic node constructor */ if ((error = ng_make_node_common(&ng_ppp_typestruct, nodep))) { diff --git a/sys/netgraph/pppoe/ng_pppoe.c b/sys/netgraph/pppoe/ng_pppoe.c index 7672cd48ba..c5cdfe6ae8 100644 --- a/sys/netgraph/pppoe/ng_pppoe.c +++ b/sys/netgraph/pppoe/ng_pppoe.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_pppoe.c,v 1.23.2.17 2002/07/02 22:17:18 archie Exp $ - * $DragonFly: src/sys/netgraph/pppoe/ng_pppoe.c,v 1.10 2007/06/03 20:51:13 dillon Exp $ + * $DragonFly: src/sys/netgraph/pppoe/ng_pppoe.c,v 1.11 2008/01/05 14:02:39 swildner Exp $ * $Whistle: ng_pppoe.c,v 1.10 1999/11/01 09:24:52 julian Exp $ */ #if 0 @@ -514,10 +514,9 @@ ng_pppoe_constructor(node_p *nodep) AAA /* Initialize private descriptor */ - MALLOC(privdata, priv_p, sizeof(*privdata), M_NETGRAPH, M_NOWAIT); + MALLOC(privdata, priv_p, sizeof(*privdata), M_NETGRAPH, M_NOWAIT | M_ZERO); if (privdata == NULL) return (ENOMEM); - bzero(privdata, sizeof(*privdata)); /* Call the 'generic' (ie, superclass) node constructor */ if ((error = ng_make_node_common(&typestruct, nodep))) { @@ -559,11 +558,9 @@ AAA * The infrastructure has already checked that it's unique, * so just allocate it and hook it in. */ - MALLOC(sp, sessp, sizeof(*sp), M_NETGRAPH, M_NOWAIT); - if (sp == NULL) { - return (ENOMEM); - } - bzero(sp, sizeof(*sp)); + MALLOC(sp, sessp, sizeof(*sp), M_NETGRAPH, M_NOWAIT | M_ZERO); + if (sp == NULL) + return (ENOMEM); hook->private = sp; sp->hook = hook; @@ -654,13 +651,13 @@ AAA /* * set up prototype header */ - MALLOC(neg, negp, sizeof(*neg), M_NETGRAPH, M_NOWAIT); + MALLOC(neg, negp, sizeof(*neg), M_NETGRAPH, + M_NOWAIT | M_ZERO); if (neg == NULL) { kprintf("pppoe: Session out of memory\n"); LEAVE(ENOMEM); } - bzero(neg, sizeof(*neg)); MGETHDR(neg->m, MB_DONTWAIT, MT_DATA); if(neg->m == NULL) { kprintf("pppoe: Session out of mbufs\n"); diff --git a/sys/netgraph/pptpgre/ng_pptpgre.c b/sys/netgraph/pptpgre/ng_pptpgre.c index ce620c1b8b..0fff74a05f 100644 --- a/sys/netgraph/pptpgre/ng_pptpgre.c +++ b/sys/netgraph/pptpgre/ng_pptpgre.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_pptpgre.c,v 1.2.2.13 2002/10/10 18:27:54 archie Exp $ - * $DragonFly: src/sys/netgraph/pptpgre/ng_pptpgre.c,v 1.7 2005/06/02 22:11:46 swildner Exp $ + * $DragonFly: src/sys/netgraph/pptpgre/ng_pptpgre.c,v 1.8 2008/01/05 14:02:39 swildner Exp $ * $Whistle: ng_pptpgre.c,v 1.7 1999/12/08 00:10:06 archie Exp $ */ @@ -283,10 +283,9 @@ ng_pptpgre_constructor(node_p *nodep) int error; /* Allocate private structure */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT); + MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); if (priv == NULL) return (ENOMEM); - bzero(priv, sizeof(*priv)); /* Call generic node constructor */ if ((error = ng_make_node_common(&ng_pptpgre_typestruct, nodep))) { diff --git a/sys/netgraph/rfc1490/ng_rfc1490.c b/sys/netgraph/rfc1490/ng_rfc1490.c index 7518db6cb4..64ca2eb4cc 100644 --- a/sys/netgraph/rfc1490/ng_rfc1490.c +++ b/sys/netgraph/rfc1490/ng_rfc1490.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_rfc1490.c,v 1.6.2.4 2002/07/02 22:17:18 archie Exp $ - * $DragonFly: src/sys/netgraph/rfc1490/ng_rfc1490.c,v 1.5 2005/02/17 14:00:00 joerg Exp $ + * $DragonFly: src/sys/netgraph/rfc1490/ng_rfc1490.c,v 1.6 2008/01/05 14:02:40 swildner Exp $ * $Whistle: ng_rfc1490.c,v 1.22 1999/11/01 09:24:52 julian Exp $ */ @@ -127,10 +127,9 @@ ng_rfc1490_constructor(node_p *nodep) int error; /* Allocate private structure */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT); + MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); if (priv == NULL) return (ENOMEM); - bzero(priv, sizeof(*priv)); /* Call generic node constructor */ if ((error = ng_make_node_common(&typestruct, nodep))) { diff --git a/sys/netgraph/socket/ng_socket.c b/sys/netgraph/socket/ng_socket.c index 9a2116df81..0c67418428 100644 --- a/sys/netgraph/socket/ng_socket.c +++ b/sys/netgraph/socket/ng_socket.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_socket.c,v 1.11.2.6 2002/07/02 22:17:18 archie Exp $ - * $DragonFly: src/sys/netgraph/socket/ng_socket.c,v 1.14 2007/06/03 20:51:13 dillon Exp $ + * $DragonFly: src/sys/netgraph/socket/ng_socket.c,v 1.15 2008/01/05 14:02:40 swildner Exp $ * $Whistle: ng_socket.c,v 1.28 1999/11/01 09:24:52 julian Exp $ */ @@ -407,8 +407,7 @@ ng_setsockaddr(struct socket *so, struct sockaddr **addr) if (pcbp->sockdata->node->name != NULL) sg_len += namelen = strlen(pcbp->sockdata->node->name); - MALLOC(sg, struct sockaddr_ng *, sg_len, M_SONAME, M_WAITOK); - bzero(sg, sg_len); + MALLOC(sg, struct sockaddr_ng *, sg_len, M_SONAME, M_WAITOK | M_ZERO); if (pcbp->sockdata->node->name != NULL) bcopy(pcbp->sockdata->node->name, sg->sg_data, namelen); @@ -441,12 +440,11 @@ ng_attach_cntl(struct socket *so) /* Allocate node private info */ MALLOC(privdata, struct ngsock *, - sizeof(*privdata), M_NETGRAPH, M_WAITOK); + sizeof(*privdata), M_NETGRAPH, M_WAITOK | M_ZERO); if (privdata == NULL) { ng_detach_common(pcbp, NG_CONTROL); return (ENOMEM); } - bzero(privdata, sizeof(*privdata)); /* Make the generic node components */ if ((error = ng_make_node_common(&typestruct, &privdata->node)) != 0) { @@ -485,10 +483,9 @@ ng_attach_common(struct socket *so, int type) return (error); /* Allocate the pcb */ - MALLOC(pcbp, struct ngpcb *, sizeof(*pcbp), M_PCB, M_WAITOK); + MALLOC(pcbp, struct ngpcb *, sizeof(*pcbp), M_PCB, M_WAITOK | M_ZERO); if (pcbp == NULL) return (ENOMEM); - bzero(pcbp, sizeof(*pcbp)); pcbp->type = type; /* Link the pcb and the socket */ diff --git a/sys/netgraph/tee/ng_tee.c b/sys/netgraph/tee/ng_tee.c index 257db8e8bd..e56de402a2 100644 --- a/sys/netgraph/tee/ng_tee.c +++ b/sys/netgraph/tee/ng_tee.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_tee.c,v 1.7.2.5 2002/07/02 23:44:03 archie Exp $ - * $DragonFly: src/sys/netgraph/tee/ng_tee.c,v 1.5 2005/02/17 14:00:00 joerg Exp $ + * $DragonFly: src/sys/netgraph/tee/ng_tee.c,v 1.6 2008/01/05 14:02:40 swildner Exp $ * $Whistle: ng_tee.c,v 1.18 1999/11/01 09:24:52 julian Exp $ */ @@ -154,10 +154,9 @@ ngt_constructor(node_p *nodep) sc_p privdata; int error = 0; - MALLOC(privdata, sc_p, sizeof(*privdata), M_NETGRAPH, M_NOWAIT); + MALLOC(privdata, sc_p, sizeof(*privdata), M_NETGRAPH, M_NOWAIT | M_ZERO); if (privdata == NULL) return (ENOMEM); - bzero(privdata, sizeof(*privdata)); if ((error = ng_make_node_common(&ng_tee_typestruct, nodep))) { FREE(privdata, M_NETGRAPH); diff --git a/sys/netgraph/tty/ng_tty.c b/sys/netgraph/tty/ng_tty.c index dd5e3d17ed..fe313f7a5d 100644 --- a/sys/netgraph/tty/ng_tty.c +++ b/sys/netgraph/tty/ng_tty.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_tty.c,v 1.7.2.3 2002/02/13 00:43:12 dillon Exp $ - * $DragonFly: src/sys/netgraph/tty/ng_tty.c,v 1.17 2006/12/20 18:14:43 dillon Exp $ + * $DragonFly: src/sys/netgraph/tty/ng_tty.c,v 1.18 2008/01/05 14:02:40 swildner Exp $ * $Whistle: ng_tty.c,v 1.21 1999/11/01 09:24:52 julian Exp $ */ @@ -205,12 +205,11 @@ ngt_open(cdev_t dev, struct tty *tp) } /* Initialize private struct */ - MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_WAITOK); + MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_WAITOK | M_ZERO); if (sc == NULL) { error = ENOMEM; goto done; } - bzero(sc, sizeof(*sc)); sc->tp = tp; sc->hotchar = NG_TTY_DFL_HOTCHAR; sc->qtail = &sc->qhead; diff --git a/sys/netgraph/vjc/ng_vjc.c b/sys/netgraph/vjc/ng_vjc.c index 08c855ad4e..c492cce928 100644 --- a/sys/netgraph/vjc/ng_vjc.c +++ b/sys/netgraph/vjc/ng_vjc.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_vjc.c,v 1.9.2.5 2002/07/02 23:44:03 archie Exp $ - * $DragonFly: src/sys/netgraph/vjc/ng_vjc.c,v 1.7 2007/05/13 18:33:58 swildner Exp $ + * $DragonFly: src/sys/netgraph/vjc/ng_vjc.c,v 1.8 2008/01/05 14:02:40 swildner Exp $ * $Whistle: ng_vjc.c,v 1.17 1999/11/01 09:24:52 julian Exp $ */ @@ -247,10 +247,9 @@ ng_vjc_constructor(node_p *nodep) int error; /* Allocate private structure */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT); + MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); if (priv == NULL) return (ENOMEM); - bzero(priv, sizeof(*priv)); /* Call generic node constructor */ if ((error = ng_make_node_common(&ng_vjc_typestruct, nodep))) { diff --git a/sys/netinet6/ah_core.c b/sys/netinet6/ah_core.c index 6976ea7184..8d0f11b359 100644 --- a/sys/netinet6/ah_core.c +++ b/sys/netinet6/ah_core.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ah_core.c,v 1.2.2.5 2002/04/28 05:40:26 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/ah_core.c,v 1.10 2006/10/24 06:18:42 hsu Exp $ */ +/* $DragonFly: src/sys/netinet6/ah_core.c,v 1.11 2008/01/05 14:02:40 swildner Exp $ */ /* $KAME: ah_core.c,v 1.44 2001/03/12 11:24:39 itojun Exp $ */ /* @@ -855,10 +855,9 @@ ah_hmac_sha2_384_init(struct ah_algorithm_state *state, struct secasvar *sav) state->sav = sav; state->foo = (void *)kmalloc(64 + 64 + sizeof(SHA384_CTX), - M_TEMP, M_NOWAIT); + M_TEMP, M_NOWAIT | M_ZERO); if (!state->foo) return ENOBUFS; - bzero(state->foo, 64 + 64 + sizeof(SHA384_CTX)); ipad = (u_char *)state->foo; opad = (u_char *)(ipad + 64); @@ -981,10 +980,9 @@ ah_hmac_sha2_512_init(struct ah_algorithm_state *state, struct secasvar *sav) state->sav = sav; state->foo = (void *)kmalloc(64 + 64 + sizeof(SHA512_CTX), - M_TEMP, M_NOWAIT); + M_TEMP, M_NOWAIT | M_ZERO); if (!state->foo) return ENOBUFS; - bzero(state->foo, 64 + 64 + sizeof(SHA512_CTX)); ipad = (u_char *)state->foo; opad = (u_char *)(ipad + 64); diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index 044bb8a85a..45ce3642c5 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/frag6.c,v 1.2.2.6 2002/04/28 05:40:26 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/frag6.c,v 1.11 2006/10/24 06:18:42 hsu Exp $ */ +/* $DragonFly: src/sys/netinet6/frag6.c,v 1.12 2008/01/05 14:02:40 swildner Exp $ */ /* $KAME: frag6.c,v 1.33 2002/01/07 11:34:48 kjc Exp $ */ /* @@ -233,10 +233,9 @@ frag6_input(struct mbuf **mp, int *offp, int proto) goto dropfrag; frag6_nfragpackets++; q6 = (struct ip6q *)kmalloc(sizeof(struct ip6q), M_FTABLE, - M_NOWAIT); + M_NOWAIT | M_ZERO); if (q6 == NULL) goto dropfrag; - bzero(q6, sizeof(*q6)); frag6_insque(q6, &ip6q); @@ -325,10 +324,9 @@ frag6_input(struct mbuf **mp, int *offp, int proto) } ip6af = (struct ip6asfrag *)kmalloc(sizeof(struct ip6asfrag), M_FTABLE, - M_NOWAIT); + M_NOWAIT | M_ZERO); if (ip6af == NULL) goto dropfrag; - bzero(ip6af, sizeof(*ip6af)); ip6af->ip6af_head = ip6->ip6_flow; ip6af->ip6af_len = ip6->ip6_plen; ip6af->ip6af_nxt = ip6->ip6_nxt; diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 5dde8dc987..5395d2bf7f 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/in6.c,v 1.7.2.9 2002/04/28 05:40:26 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/in6.c,v 1.25 2007/08/16 20:03:58 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/in6.c,v 1.26 2008/01/05 14:02:40 swildner Exp $ */ /* $KAME: in6.c,v 1.259 2002/01/21 11:37:50 keiichi Exp $ */ /* @@ -904,10 +904,9 @@ in6_update_ifa(struct ifnet *ifp, struct in6_aliasreq *ifra, * with M_NOWAIT. */ ia = (struct in6_ifaddr *) - kmalloc(sizeof(*ia), M_IFADDR, M_NOWAIT); + kmalloc(sizeof(*ia), M_IFADDR, M_NOWAIT | M_ZERO); if (ia == NULL) return (ENOBUFS); - bzero((caddr_t)ia, sizeof(*ia)); /* Initialize the address and masks */ ia->ia_ifa.ifa_addr = (struct sockaddr *)&ia->ia_addr; ia->ia_addr.sin6_family = AF_INET6; diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 8f478be75e..65a5a06fda 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/in6_pcb.c,v 1.10.2.9 2003/01/24 05:11:35 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/in6_pcb.c,v 1.33 2006/12/29 18:02:56 victor Exp $ */ +/* $DragonFly: src/sys/netinet6/in6_pcb.c,v 1.34 2008/01/05 14:02:40 swildner Exp $ */ /* $KAME: in6_pcb.c,v 1.31 2001/05/21 05:45:10 jinmei Exp $ */ /* @@ -720,8 +720,8 @@ in6_setsockaddr(struct socket *so, struct sockaddr **nam) /* * Do the malloc first in case it blocks. */ - MALLOC(sin6, struct sockaddr_in6 *, sizeof *sin6, M_SONAME, M_WAITOK); - bzero(sin6, sizeof *sin6); + MALLOC(sin6, struct sockaddr_in6 *, sizeof *sin6, M_SONAME, + M_WAITOK | M_ZERO); sin6->sin6_family = AF_INET6; sin6->sin6_len = sizeof(*sin6); @@ -755,8 +755,8 @@ in6_setpeeraddr(struct socket *so, struct sockaddr **nam) /* * Do the malloc first in case it blocks. */ - MALLOC(sin6, struct sockaddr_in6 *, sizeof(*sin6), M_SONAME, M_WAITOK); - bzero((caddr_t)sin6, sizeof (*sin6)); + MALLOC(sin6, struct sockaddr_in6 *, sizeof(*sin6), M_SONAME, + M_WAITOK | M_ZERO); sin6->sin6_family = AF_INET6; sin6->sin6_len = sizeof(struct sockaddr_in6); diff --git a/sys/netinet6/in6_prefix.c b/sys/netinet6/in6_prefix.c index 8861582bea..06e2d19154 100644 --- a/sys/netinet6/in6_prefix.c +++ b/sys/netinet6/in6_prefix.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/in6_prefix.c,v 1.4.2.3 2001/07/03 11:01:52 ume Exp $ */ -/* $DragonFly: src/sys/netinet6/in6_prefix.c,v 1.11 2006/12/22 23:57:53 swildner Exp $ */ +/* $DragonFly: src/sys/netinet6/in6_prefix.c,v 1.12 2008/01/05 14:02:40 swildner Exp $ */ /* $KAME: in6_prefix.c,v 1.47 2001/03/25 08:41:39 itojun Exp $ */ /* @@ -831,13 +831,12 @@ static int create_ra_entry(struct rp_addr **rapp) { *rapp = (struct rp_addr *)kmalloc(sizeof(struct rp_addr), M_RR_ADDR, - M_NOWAIT); + M_NOWAIT | M_ZERO); if (*rapp == NULL) { log(LOG_ERR, "in6_prefix.c: init_newprefix:%d: ENOBUFS" "for rp_addr\n", __LINE__); return ENOBUFS; } - bzero(*rapp, sizeof(*(*rapp))); return 0; } diff --git a/sys/netinet6/ipsec.c b/sys/netinet6/ipsec.c index 65d5d9c5ec..31f3eb54aa 100644 --- a/sys/netinet6/ipsec.c +++ b/sys/netinet6/ipsec.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ipsec.c,v 1.3.2.12 2003/05/06 06:46:58 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/ipsec.c,v 1.20 2007/10/20 10:28:44 sephe Exp $ */ +/* $DragonFly: src/sys/netinet6/ipsec.c,v 1.21 2008/01/05 14:02:40 swildner Exp $ */ /* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */ /* @@ -1150,10 +1150,9 @@ ipsec_deepcopy_policy(struct secpolicy *src) q = &newchain; for (p = src->req; p; p = p->next) { *q = (struct ipsecrequest *)kmalloc(sizeof(struct ipsecrequest), - M_SECA, M_NOWAIT); + M_SECA, M_NOWAIT | M_ZERO); if (*q == NULL) goto fail; - bzero(*q, sizeof(**q)); (*q)->next = NULL; (*q)->saidx.proto = p->saidx.proto; diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 3c9525847e..784f4f5139 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/nd6.c,v 1.2.2.15 2003/05/06 06:46:58 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/nd6.c,v 1.25 2007/08/27 16:15:42 hasso Exp $ */ +/* $DragonFly: src/sys/netinet6/nd6.c,v 1.26 2008/01/05 14:02:40 swildner Exp $ */ /* $KAME: nd6.c,v 1.144 2001/05/24 07:44:00 itojun Exp $ */ /* @@ -152,8 +152,8 @@ nd6_ifattach(struct ifnet *ifp) { struct nd_ifinfo *nd; - nd = (struct nd_ifinfo *)kmalloc(sizeof(*nd), M_IP6NDP, M_WAITOK); - bzero(nd, sizeof(*nd)); + nd = (struct nd_ifinfo *)kmalloc(sizeof(*nd), M_IP6NDP, + M_WAITOK | M_ZERO); nd->initialized = 1; diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 2e869d10b5..79e1f2a059 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/nd6_nbr.c,v 1.4.2.6 2003/01/23 21:06:47 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/nd6_nbr.c,v 1.21 2007/08/27 16:15:42 hasso Exp $ */ +/* $DragonFly: src/sys/netinet6/nd6_nbr.c,v 1.22 2008/01/05 14:02:40 swildner Exp $ */ /* $KAME: nd6_nbr.c,v 1.86 2002/01/21 02:33:04 jinmei Exp $ */ /* @@ -1065,7 +1065,7 @@ nd6_dad_start(struct ifaddr *ifa, return; } - dp = kmalloc(sizeof(*dp), M_IP6NDP, M_NOWAIT); + dp = kmalloc(sizeof(*dp), M_IP6NDP, M_NOWAIT | M_ZERO); if (dp == NULL) { log(LOG_ERR, "nd6_dad_start: memory allocation failed for " "%s(%s)\n", @@ -1073,7 +1073,6 @@ nd6_dad_start(struct ifaddr *ifa, ifa->ifa_ifp ? if_name(ifa->ifa_ifp) : "???"); return; } - bzero(dp, sizeof(*dp)); callout_init(&dp->dad_timer_ch); TAILQ_INSERT_TAIL(&dadq, (struct dadq *)dp, dad_list); diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index b606654331..05362ec4fe 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/nd6_rtr.c,v 1.2.2.5 2003/04/05 10:28:53 ume Exp $ */ -/* $DragonFly: src/sys/netinet6/nd6_rtr.c,v 1.15 2006/12/22 23:57:53 swildner Exp $ */ +/* $DragonFly: src/sys/netinet6/nd6_rtr.c,v 1.16 2008/01/05 14:02:40 swildner Exp $ */ /* $KAME: nd6_rtr.c,v 1.111 2001/04/27 01:37:15 jinmei Exp $ */ /* @@ -736,12 +736,12 @@ defrtrlist_update(struct nd_defrouter *new) return (NULL); } - n = (struct nd_defrouter *)kmalloc(sizeof(*n), M_IP6NDP, M_NOWAIT); + n = (struct nd_defrouter *)kmalloc(sizeof(*n), M_IP6NDP, + M_NOWAIT | M_ZERO); if (n == NULL) { crit_exit(); return (NULL); } - bzero(n, sizeof(*n)); *n = *new; /* @@ -774,10 +774,10 @@ pfxrtr_add(struct nd_prefix *pr, struct nd_defrouter *dr) { struct nd_pfxrouter *new; - new = (struct nd_pfxrouter *)kmalloc(sizeof(*new), M_IP6NDP, M_NOWAIT); + new = (struct nd_pfxrouter *)kmalloc(sizeof(*new), M_IP6NDP, + M_NOWAIT | M_ZERO); if (new == NULL) return; - bzero(new, sizeof(*new)); new->router = dr; LIST_INSERT_HEAD(&pr->ndpr_advrtrs, new, pfr_entry); @@ -818,10 +818,10 @@ nd6_prelist_add(struct nd_prefix *pr, struct nd_defrouter *dr, struct nd_prefix *new = NULL; int i; - new = (struct nd_prefix *)kmalloc(sizeof(*new), M_IP6NDP, M_NOWAIT); + new = (struct nd_prefix *)kmalloc(sizeof(*new), M_IP6NDP, + M_NOWAIT | M_ZERO); if (new == NULL) return ENOMEM; - bzero(new, sizeof(*new)); *new = *pr; if (newp != NULL) *newp = new; diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c index d883ad272c..847b81fa81 100644 --- a/sys/netinet6/scope6.c +++ b/sys/netinet6/scope6.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/scope6.c,v 1.1.2.3 2002/04/01 15:29:04 ume Exp $ */ -/* $DragonFly: src/sys/netinet6/scope6.c,v 1.10 2007/08/16 20:03:58 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/scope6.c,v 1.11 2008/01/05 14:02:40 swildner Exp $ */ /* $KAME: scope6.c,v 1.10 2000/07/24 13:29:31 itojun Exp $ */ /* @@ -62,8 +62,8 @@ scope6_ifattach(struct ifnet *ifp) { struct scope6_id *sid; - sid = (struct scope6_id *)kmalloc(sizeof(*sid), M_IFADDR, M_WAITOK); - bzero(sid, sizeof(*sid)); + sid = (struct scope6_id *)kmalloc(sizeof(*sid), M_IFADDR, + M_WAITOK | M_ZERO); crit_enter(); diff --git a/sys/netproto/atalk/ddp_usrreq.c b/sys/netproto/atalk/ddp_usrreq.c index 57e6ea4afe..62bee57c41 100644 --- a/sys/netproto/atalk/ddp_usrreq.c +++ b/sys/netproto/atalk/ddp_usrreq.c @@ -2,7 +2,7 @@ * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * - * $DragonFly: src/sys/netproto/atalk/ddp_usrreq.c,v 1.11 2007/04/21 02:26:48 dillon Exp $ + * $DragonFly: src/sys/netproto/atalk/ddp_usrreq.c,v 1.12 2008/01/05 14:02:40 swildner Exp $ */ #include @@ -414,8 +414,7 @@ at_pcballoc( struct socket *so ) { struct ddpcb *ddp; - MALLOC(ddp, struct ddpcb *, sizeof *ddp, M_PCB, M_WAITOK); - bzero(ddp, sizeof *ddp); + MALLOC(ddp, struct ddpcb *, sizeof *ddp, M_PCB, M_WAITOK | M_ZERO); ddp->ddp_lsat.sat_port = ATADDR_ANYPORT; ddp->ddp_next = ddpcb; diff --git a/sys/netproto/key/keydb.c b/sys/netproto/key/keydb.c index 9ac35d697a..2f8f580d87 100644 --- a/sys/netproto/key/keydb.c +++ b/sys/netproto/key/keydb.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netkey/keydb.c,v 1.1.2.1 2000/07/15 07:14:42 kris Exp $ */ -/* $DragonFly: src/sys/netproto/key/keydb.c,v 1.9 2006/09/05 00:55:49 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/key/keydb.c,v 1.10 2008/01/05 14:02:40 swildner Exp $ */ /* $KAME: keydb.c,v 1.64 2000/05/11 17:02:30 itojun Exp $ */ /* @@ -66,13 +66,8 @@ static void keydb_delsecasvar (struct secasvar *); struct secpolicy * keydb_newsecpolicy(void) { - struct secpolicy *p; - - p = kmalloc(sizeof(*p), M_SECA, M_INTWAIT | M_NULLOK); - if (!p) - return p; - bzero(p, sizeof(*p)); - return p; + return((struct secpolicy *)kmalloc(sizeof(struct secpolicy), M_SECA, + M_INTWAIT | M_NULLOK | M_ZERO)); } void @@ -91,10 +86,9 @@ keydb_newsecashead(void) struct secashead *p; int i; - p = kmalloc(sizeof(*p), M_SECA, M_INTWAIT | M_NULLOK); + p = kmalloc(sizeof(*p), M_SECA, M_INTWAIT | M_NULLOK | M_ZERO); if (!p) return p; - bzero(p, sizeof(*p)); for (i = 0; i < sizeof(p->savtree)/sizeof(p->savtree[0]); i++) LIST_INIT(&p->savtree[i]); return p; @@ -115,10 +109,9 @@ keydb_newsecasvar(void) { struct secasvar *p; - p = kmalloc(sizeof(*p), M_SECA, M_INTWAIT | M_NULLOK); + p = kmalloc(sizeof(*p), M_SECA, M_INTWAIT | M_NULLOK | M_ZERO); if (!p) return p; - bzero(p, sizeof(*p)); p->refcnt = 1; return p; } @@ -160,18 +153,16 @@ keydb_newsecreplay(size_t wsize) { struct secreplay *p; - p = kmalloc(sizeof(*p), M_SECA, M_INTWAIT | M_NULLOK); + p = kmalloc(sizeof(*p), M_SECA, M_INTWAIT | M_NULLOK | M_ZERO); if (!p) return p; - bzero(p, sizeof(*p)); if (wsize != 0) { - p->bitmap = (caddr_t)kmalloc(wsize, M_SECA, M_INTWAIT | M_NULLOK); + p->bitmap = (caddr_t)kmalloc(wsize, M_SECA, M_INTWAIT | M_NULLOK | M_ZERO); if (!p->bitmap) { kfree(p, M_SECA); return NULL; } - bzero(p->bitmap, wsize); } p->wsize = wsize; return p; diff --git a/sys/netproto/key/keysock.c b/sys/netproto/key/keysock.c index 0af4e3b95b..14ad669ad5 100644 --- a/sys/netproto/key/keysock.c +++ b/sys/netproto/key/keysock.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netkey/keysock.c,v 1.1.2.4 2003/01/11 19:10:59 ume Exp $ */ -/* $DragonFly: src/sys/netproto/key/keysock.c,v 1.18 2007/04/22 01:13:15 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/key/keysock.c,v 1.19 2008/01/05 14:02:40 swildner Exp $ */ /* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */ /* @@ -383,10 +383,9 @@ key_attach(struct socket *so, int proto, struct pru_attach_info *ai) if (sotorawcb(so) != 0) return EISCONN; /* XXX panic? */ - kp = (struct keycb *)kmalloc(sizeof *kp, M_PCB, M_WAITOK); /* XXX */ + kp = (struct keycb *)kmalloc(sizeof *kp, M_PCB, M_WAITOK | M_ZERO); /* XXX */ if (kp == 0) return ENOBUFS; - bzero(kp, sizeof *kp); /* * The critical section is necessary to block protocols from sending diff --git a/sys/netproto/natm/natm_pcb.c b/sys/netproto/natm/natm_pcb.c index 3a29c7f3b9..b16f38af29 100644 --- a/sys/netproto/natm/natm_pcb.c +++ b/sys/netproto/natm/natm_pcb.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netnatm/natm_pcb.c,v 1.6.6.1 2000/08/03 18:56:28 peter Exp $ */ -/* $DragonFly: src/sys/netproto/natm/natm_pcb.c,v 1.8 2006/12/22 23:57:54 swildner Exp $ */ +/* $DragonFly: src/sys/netproto/natm/natm_pcb.c,v 1.9 2008/01/05 14:02:40 swildner Exp $ */ /* $NetBSD: natm_pcb.c,v 1.4 1996/11/09 03:26:27 chuck Exp $ */ /* @@ -63,16 +63,14 @@ npcb_alloc(int wait) { struct natmpcb *npcb; - MALLOC(npcb, struct natmpcb *, sizeof(*npcb), M_PCB, wait); + MALLOC(npcb, struct natmpcb *, sizeof(*npcb), M_PCB, wait | M_ZERO); #ifdef DIAGNOSTIC if (wait == M_WAITOK && npcb == NULL) panic("npcb_alloc: MALLOC didn't wait"); #endif - if (npcb) { - bzero(npcb, sizeof(*npcb)); + if (npcb) npcb->npcb_flags = NPCB_FREE; - } return(npcb); } diff --git a/sys/netproto/ns/ns.c b/sys/netproto/ns/ns.c index 30958d3e60..85a72f4fdc 100644 --- a/sys/netproto/ns/ns.c +++ b/sys/netproto/ns/ns.c @@ -32,7 +32,7 @@ * * @(#)ns.c 8.2 (Berkeley) 11/15/93 * $FreeBSD: src/sys/netns/ns.c,v 1.9 1999/08/28 00:49:47 peter Exp $ - * $DragonFly: src/sys/netproto/ns/ns.c,v 1.14 2006/12/22 23:57:54 swildner Exp $ + * $DragonFly: src/sys/netproto/ns/ns.c,v 1.15 2008/01/05 14:02:40 swildner Exp $ */ #include @@ -135,10 +135,9 @@ ns_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, case SIOCSIFDSTADDR: if (ia == (struct ns_ifaddr *)0) { oia = (struct ns_ifaddr *) - kmalloc(sizeof *ia, M_IFADDR, M_WAITOK); + kmalloc(sizeof *ia, M_IFADDR, M_WAITOK | M_ZERO); if (oia == (struct ns_ifaddr *)NULL) return (ENOBUFS); - bzero((caddr_t)oia, sizeof(*oia)); if ((ia = ns_ifaddr) != NULL) { for ( ; ia->ia_next; ia = ia->ia_next) ; diff --git a/sys/netproto/smb/smb_crypt.c b/sys/netproto/smb/smb_crypt.c index 3922eefb60..22d6eae46d 100644 --- a/sys/netproto/smb/smb_crypt.c +++ b/sys/netproto/smb/smb_crypt.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netsmb/smb_crypt.c,v 1.1.2.3 2001/09/03 08:55:11 bp Exp $ - * $DragonFly: src/sys/netproto/smb/smb_crypt.c,v 1.4 2006/09/05 00:55:49 dillon Exp $ + * $DragonFly: src/sys/netproto/smb/smb_crypt.c,v 1.5 2008/01/05 14:02:40 swildner Exp $ */ #include #include @@ -88,8 +88,7 @@ smb_encrypt(const u_char *apwd, u_char *C8, u_char *RN) #ifdef NETSMBCRYPTO u_char *p, *P14, *S21; - p = kmalloc(14 + 21, M_SMBTEMP, M_WAITOK); - bzero(p, 14 + 21); + p = kmalloc(14 + 21, M_SMBTEMP, M_WAITOK | M_ZERO); P14 = p; S21 = p + 14; bcopy(apwd, P14, min(14, strlen(apwd))); diff --git a/sys/netproto/smb/smb_trantcp.c b/sys/netproto/smb/smb_trantcp.c index 8f178f9af4..3c3e12e2fa 100644 --- a/sys/netproto/smb/smb_trantcp.c +++ b/sys/netproto/smb/smb_trantcp.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netsmb/smb_trantcp.c,v 1.3.2.1 2001/05/22 08:32:34 bp Exp $ - * $DragonFly: src/sys/netproto/smb/smb_trantcp.c,v 1.20 2007/05/18 17:05:13 dillon Exp $ + * $DragonFly: src/sys/netproto/smb/smb_trantcp.c,v 1.21 2008/01/05 14:02:40 swildner Exp $ */ #include #include @@ -438,8 +438,7 @@ smb_nbst_create(struct smb_vc *vcp, struct thread *td) { struct nbpcb *nbp; - MALLOC(nbp, struct nbpcb *, sizeof *nbp, M_NBDATA, M_WAITOK); - bzero(nbp, sizeof *nbp); + MALLOC(nbp, struct nbpcb *, sizeof *nbp, M_NBDATA, M_WAITOK | M_ZERO); nbp->nbp_timo.tv_sec = 15; /* XXX: sysctl ? */ nbp->nbp_state = NBST_CLOSED; nbp->nbp_vc = vcp; diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c index 47ce023873..17b3c75d18 100644 --- a/sys/opencrypto/cryptodev.c +++ b/sys/opencrypto/cryptodev.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */ -/* $DragonFly: src/sys/opencrypto/cryptodev.c,v 1.21 2006/12/23 00:27:03 swildner Exp $ */ +/* $DragonFly: src/sys/opencrypto/cryptodev.c,v 1.22 2008/01/05 14:02:40 swildner Exp $ */ /* $OpenBSD: cryptodev.c,v 1.52 2002/06/19 07:22:46 deraadt Exp $ */ /* @@ -531,10 +531,9 @@ cryptodev_key(struct crypt_kop *kop) return (EINVAL); } - krp = (struct cryptkop *)kmalloc(sizeof *krp, M_XDATA, M_WAITOK); + krp = (struct cryptkop *)kmalloc(sizeof *krp, M_XDATA, M_WAITOK | M_ZERO); if (!krp) return (ENOMEM); - bzero(krp, sizeof *krp); krp->krp_op = kop->crk_op; krp->krp_status = kop->crk_status; krp->krp_iparams = kop->crk_iparams; diff --git a/sys/platform/pc32/i386/busdma_machdep.c b/sys/platform/pc32/i386/busdma_machdep.c index 6f9828474b..a8001a0537 100644 --- a/sys/platform/pc32/i386/busdma_machdep.c +++ b/sys/platform/pc32/i386/busdma_machdep.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.16.2.2 2003/01/23 00:55:27 scottl Exp $ - * $DragonFly: src/sys/platform/pc32/i386/busdma_machdep.c,v 1.21 2007/07/14 07:29:30 sephe Exp $ + * $DragonFly: src/sys/platform/pc32/i386/busdma_machdep.c,v 1.22 2008/01/05 14:02:41 swildner Exp $ */ #include @@ -263,14 +263,11 @@ bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp) /* Must bounce */ int maxpages; - *mapp = kmalloc(sizeof(**mapp), M_DEVBUF, M_INTWAIT); - if (*mapp == NULL) { + *mapp = kmalloc(sizeof(**mapp), M_DEVBUF, M_INTWAIT | M_ZERO); + if (*mapp == NULL) return (ENOMEM); - } else { - /* Initialize the new map */ - bzero(*mapp, sizeof(**mapp)); - STAILQ_INIT(&((*mapp)->bpages)); - } + /* Initialize the new map */ + STAILQ_INIT(&((*mapp)->bpages)); /* * Attempt to add pages to our pool on a per-instance * basis up to a sane limit. @@ -834,11 +831,10 @@ alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages) struct bounce_page *bpage; bpage = (struct bounce_page *)kmalloc(sizeof(*bpage), M_DEVBUF, - M_INTWAIT); + M_INTWAIT | M_ZERO); if (bpage == NULL) break; - bzero(bpage, sizeof(*bpage)); bpage->vaddr = (vm_offset_t)contigmalloc(PAGE_SIZE, M_DEVBUF, M_NOWAIT, 0ul, dmat->lowaddr, diff --git a/sys/platform/pc32/i386/i686_mem.c b/sys/platform/pc32/i386/i686_mem.c index 06794ee8bb..f3e21d0afb 100644 --- a/sys/platform/pc32/i386/i686_mem.c +++ b/sys/platform/pc32/i386/i686_mem.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/i686_mem.c,v 1.8.2.4 2002/09/24 08:12:51 mdodd Exp $ - * $DragonFly: src/sys/platform/pc32/i386/i686_mem.c,v 1.7 2006/12/23 00:27:03 swildner Exp $ + * $DragonFly: src/sys/platform/pc32/i386/i686_mem.c,v 1.8 2008/01/05 14:02:41 swildner Exp $ */ #include @@ -573,8 +573,7 @@ i686_mrinit(struct mem_range_softc *sc) sc->mr_desc = (struct mem_range_desc *)kmalloc(nmdesc * sizeof(struct mem_range_desc), - M_MEMDESC, M_WAITOK); - bzero(sc->mr_desc, nmdesc * sizeof(struct mem_range_desc)); + M_MEMDESC, M_WAITOK | M_ZERO); sc->mr_ndesc = nmdesc; mrd = sc->mr_desc; diff --git a/sys/platform/pc32/i386/k6_mem.c b/sys/platform/pc32/i386/k6_mem.c index 3cd6a45943..03410d01ad 100644 --- a/sys/platform/pc32/i386/k6_mem.c +++ b/sys/platform/pc32/i386/k6_mem.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/k6_mem.c,v 1.4.2.2 2002/09/16 21:58:41 dwmalone Exp $ - * $DragonFly: src/sys/platform/pc32/i386/k6_mem.c,v 1.8 2006/12/23 00:27:03 swildner Exp $ + * $DragonFly: src/sys/platform/pc32/i386/k6_mem.c,v 1.9 2008/01/05 14:02:41 swildner Exp $ * */ @@ -112,10 +112,9 @@ k6_mrinit(struct mem_range_softc *sc) { sc->mr_cap = 0; sc->mr_ndesc = 2; /* XXX (BFF) For now, we only have one msr for this */ sc->mr_desc = kmalloc(sc->mr_ndesc * sizeof(struct mem_range_desc), - M_MEMDESC, M_WAITOK); + M_MEMDESC, M_WAITOK | M_ZERO); if (sc->mr_desc == NULL) panic("k6_mrinit: malloc returns NULL"); - bzero(sc->mr_desc, sc->mr_ndesc * sizeof(struct mem_range_desc)); reg = rdmsr(UWCCR); for (d = 0; d < sc->mr_ndesc; d++) { diff --git a/sys/platform/pc32/i386/mp_machdep.c b/sys/platform/pc32/i386/mp_machdep.c index ed4c96218f..445247c56d 100644 --- a/sys/platform/pc32/i386/mp_machdep.c +++ b/sys/platform/pc32/i386/mp_machdep.c @@ -23,7 +23,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.115.2.15 2003/03/14 21:22:35 jhb Exp $ - * $DragonFly: src/sys/platform/pc32/i386/mp_machdep.c,v 1.58 2007/04/30 17:41:15 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/mp_machdep.c,v 1.59 2008/01/05 14:02:41 swildner Exp $ */ #include "opt_cpu.h" @@ -843,7 +843,7 @@ mptable_pass2(void) MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics, M_DEVBUF, M_WAITOK); MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics, - M_DEVBUF, M_WAITOK); + M_DEVBUF, M_WAITOK | M_ZERO); MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + FIXUP_EXTRA_APIC_INTS), M_DEVBUF, M_WAITOK); #endif @@ -851,8 +851,6 @@ mptable_pass2(void) M_DEVBUF, M_WAITOK); #ifdef APIC_IO - bzero(ioapic, sizeof(ioapic_t *) * mp_napics); - for (i = 0; i < mp_napics; i++) { ioapic[i] = permanent_io_mapping(io_apic_address[i]); } diff --git a/sys/platform/pc32/i386/userconfig.c b/sys/platform/pc32/i386/userconfig.c index 9a4c944a5d..64eb0ab1e3 100644 --- a/sys/platform/pc32/i386/userconfig.c +++ b/sys/platform/pc32/i386/userconfig.c @@ -47,7 +47,7 @@ ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ** ** $FreeBSD: src/sys/i386/i386/userconfig.c,v 1.175.2.10 2002/10/05 18:31:48 scottl Exp $ - ** $DragonFly: src/sys/platform/pc32/i386/userconfig.c,v 1.14 2007/08/27 13:15:14 hasso Exp $ + ** $DragonFly: src/sys/platform/pc32/i386/userconfig.c,v 1.15 2008/01/05 14:02:41 swildner Exp $ **/ /** @@ -3219,8 +3219,8 @@ load_devtab(void) char *name; int unit; - uc_devtab = kmalloc(sizeof(struct uc_device)*(count + 1),M_DEVL,M_WAITOK); - bzero(uc_devtab, sizeof(struct uc_device) * (count + 1)); + uc_devtab = kmalloc(sizeof(struct uc_device)*(count + 1), M_DEVL, + M_WAITOK | M_ZERO); dt = 0; for (i = 0; i < count; i++) { name = resource_query_name(i); diff --git a/sys/platform/pc64/amd64/busdma_machdep.c b/sys/platform/pc64/amd64/busdma_machdep.c index 152c6510bf..33884488c3 100644 --- a/sys/platform/pc64/amd64/busdma_machdep.c +++ b/sys/platform/pc64/amd64/busdma_machdep.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.16.2.2 2003/01/23 00:55:27 scottl Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/busdma_machdep.c,v 1.2 2007/09/24 03:24:45 yanyh Exp $ + * $DragonFly: src/sys/platform/pc64/amd64/busdma_machdep.c,v 1.3 2008/01/05 14:02:41 swildner Exp $ */ #include @@ -263,14 +263,11 @@ bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp) /* Must bounce */ int maxpages; - *mapp = kmalloc(sizeof(**mapp), M_DEVBUF, M_INTWAIT); - if (*mapp == NULL) { + *mapp = kmalloc(sizeof(**mapp), M_DEVBUF, M_INTWAIT | M_ZERO); + if (*mapp == NULL) return (ENOMEM); - } else { - /* Initialize the new map */ - bzero(*mapp, sizeof(**mapp)); - STAILQ_INIT(&((*mapp)->bpages)); - } + /* Initialize the new map */ + STAILQ_INIT(&((*mapp)->bpages)); /* * Attempt to add pages to our pool on a per-instance * basis up to a sane limit. @@ -781,11 +778,10 @@ alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages) struct bounce_page *bpage; bpage = (struct bounce_page *)kmalloc(sizeof(*bpage), M_DEVBUF, - M_INTWAIT); + M_INTWAIT | M_ZERO); if (bpage == NULL) break; - bzero(bpage, sizeof(*bpage)); bpage->vaddr = (vm_offset_t)contigmalloc(PAGE_SIZE, M_DEVBUF, M_NOWAIT, 0ul, dmat->lowaddr, diff --git a/sys/platform/vkernel/platform/busdma_machdep.c b/sys/platform/vkernel/platform/busdma_machdep.c index f153c1f09e..d32e867e19 100644 --- a/sys/platform/vkernel/platform/busdma_machdep.c +++ b/sys/platform/vkernel/platform/busdma_machdep.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.16.2.2 2003/01/23 00:55:27 scottl Exp $ - * $DragonFly: src/sys/platform/vkernel/platform/busdma_machdep.c,v 1.1 2007/01/05 22:18:20 dillon Exp $ + * $DragonFly: src/sys/platform/vkernel/platform/busdma_machdep.c,v 1.2 2008/01/05 14:02:41 swildner Exp $ */ #include @@ -263,14 +263,11 @@ bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp) /* Must bounce */ int maxpages; - *mapp = kmalloc(sizeof(**mapp), M_DEVBUF, M_INTWAIT); - if (*mapp == NULL) { + *mapp = kmalloc(sizeof(**mapp), M_DEVBUF, M_INTWAIT | M_ZERO); + if (*mapp == NULL) return (ENOMEM); - } else { - /* Initialize the new map */ - bzero(*mapp, sizeof(**mapp)); - STAILQ_INIT(&((*mapp)->bpages)); - } + /* Initialize the new map */ + STAILQ_INIT(&((*mapp)->bpages)); /* * Attempt to add pages to our pool on a per-instance * basis up to a sane limit. @@ -781,11 +778,10 @@ alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages) struct bounce_page *bpage; bpage = (struct bounce_page *)kmalloc(sizeof(*bpage), M_DEVBUF, - M_INTWAIT); + M_INTWAIT | M_ZERO); if (bpage == NULL) break; - bzero(bpage, sizeof(*bpage)); bpage->vaddr = (vm_offset_t)contigmalloc(PAGE_SIZE, M_DEVBUF, M_NOWAIT, 0ul, dmat->lowaddr, diff --git a/sys/sys/ccbque.h b/sys/sys/ccbque.h index 25bff88148..e94dca7780 100644 --- a/sys/sys/ccbque.h +++ b/sys/sys/ccbque.h @@ -28,7 +28,7 @@ * * $NetBSD$ * $FreeBSD: src/sys/i386/isa/ccbque.h,v 1.3.6.2 2000/10/21 07:44:24 nyan Exp $ - * $DragonFly: src/sys/sys/ccbque.h,v 1.10 2006/11/07 19:23:54 dillon Exp $ + * $DragonFly: src/sys/sys/ccbque.h,v 1.11 2008/01/05 14:02:41 swildner Exp $ */ /* * Common command control queue funcs. @@ -87,12 +87,9 @@ DEV##_get_ccb(void) \ } \ else \ { \ - cb = kmalloc(sizeof(*cb), M_DEVBUF, M_INTWAIT); \ + cb = kmalloc(sizeof(*cb), M_DEVBUF, M_INTWAIT|M_ZERO);\ if (cb != NULL) \ - { \ - bzero(cb, sizeof(*cb)); \ goto out; \ - } \ } \ CCBTYPE##que.count --; \ } \ diff --git a/sys/vfs/gnu/ext2fs/ext2_quota.c b/sys/vfs/gnu/ext2fs/ext2_quota.c index c6407eb72a..d0a4c74e38 100644 --- a/sys/vfs/gnu/ext2fs/ext2_quota.c +++ b/sys/vfs/gnu/ext2fs/ext2_quota.c @@ -35,7 +35,7 @@ * * @(#)ufs_quota.c 8.5 (Berkeley) 5/20/95 * $FreeBSD: src/sys/ufs/ufs/ufs_quota.c,v 1.27.2.3 2002/01/15 10:33:32 phk Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_quota.c,v 1.7 2006/09/05 00:55:50 dillon Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_quota.c,v 1.8 2008/01/05 14:02:41 swildner Exp $ */ #include @@ -748,8 +748,7 @@ ext2_dqget(struct vnode *vp, u_long id, struct ext2mount *ump, int type, if (TAILQ_EMPTY(&ext2_dqfreelist) && ext2_numdquot < MAXQUOTAS * desiredvnodes) ext2_desireddquot += DQUOTINC; if (ext2_numdquot < ext2_desireddquot) { - dq = (struct ext2_dquot *)kmalloc(sizeof *dq, M_EXT2DQUOT, M_WAITOK); - bzero((char *)dq, sizeof *dq); + dq = (struct ext2_dquot *)kmalloc(sizeof *dq, M_EXT2DQUOT, M_WAITOK | M_ZERO); ext2_numdquot++; } else { if ((dq = TAILQ_FIRST(&ext2_dqfreelist)) == NULL) { diff --git a/sys/vfs/gnu/ext2fs/ext2_vfsops.c b/sys/vfs/gnu/ext2fs/ext2_vfsops.c index 76f041a8bb..85b99a6daa 100644 --- a/sys/vfs/gnu/ext2fs/ext2_vfsops.c +++ b/sys/vfs/gnu/ext2fs/ext2_vfsops.c @@ -38,7 +38,7 @@ * * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 * $FreeBSD: src/sys/gnu/ext2fs/ext2_vfsops.c,v 1.63.2.7 2002/07/01 00:18:51 iedowse Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_vfsops.c,v 1.55 2007/05/16 05:20:26 dillon Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_vfsops.c,v 1.56 2008/01/05 14:02:41 swildner Exp $ */ #include "opt_quota.h" @@ -757,8 +757,7 @@ ext2_mountfs(struct vnode *devvp, struct mount *mp, struct ucred *cred) goto out; } } - ump = bsd_malloc(sizeof *ump, M_EXT2MNT, M_WAITOK); - bzero((caddr_t)ump, sizeof *ump); + ump = bsd_malloc(sizeof *ump, M_EXT2MNT, M_WAITOK | M_ZERO); ump->um_malloctype = M_EXT2NODE; ump->um_blkatoff = ext2_blkatoff; ump->um_truncate = ext2_truncate; diff --git a/sys/vfs/hpfs/hpfs_vfsops.c b/sys/vfs/hpfs/hpfs_vfsops.c index 0f60f87214..1ab55b5d66 100644 --- a/sys/vfs/hpfs/hpfs_vfsops.c +++ b/sys/vfs/hpfs/hpfs_vfsops.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.3.2.2 2001/12/25 01:44:45 dillon Exp $ - * $DragonFly: src/sys/vfs/hpfs/hpfs_vfsops.c,v 1.41 2007/05/09 00:53:35 dillon Exp $ + * $DragonFly: src/sys/vfs/hpfs/hpfs_vfsops.c,v 1.42 2008/01/05 14:02:41 swildner Exp $ */ @@ -261,8 +261,7 @@ hpfs_mountfs(struct vnode *devvp, struct mount *mp, struct hpfs_args *argsp) /* * Do actual mount */ - hpmp = kmalloc(sizeof(struct hpfsmount), M_HPFSMNT, M_WAITOK); - bzero(hpmp, sizeof(struct hpfsmount)); + hpmp = kmalloc(sizeof(struct hpfsmount), M_HPFSMNT, M_WAITOK | M_ZERO); /* Read in SuperBlock */ error = bread(devvp, dbtodoff(SUBLOCK), SUSIZE, &bp); diff --git a/sys/vfs/isofs/cd9660/cd9660_vfsops.c b/sys/vfs/isofs/cd9660/cd9660_vfsops.c index 69c0fb674a..3eb9e4a134 100644 --- a/sys/vfs/isofs/cd9660/cd9660_vfsops.c +++ b/sys/vfs/isofs/cd9660/cd9660_vfsops.c @@ -37,7 +37,7 @@ * * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95 * $FreeBSD: src/sys/isofs/cd9660/cd9660_vfsops.c,v 1.74.2.7 2002/04/08 09:39:29 bde Exp $ - * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_vfsops.c,v 1.44 2007/05/09 00:53:35 dillon Exp $ + * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_vfsops.c,v 1.45 2008/01/05 14:02:41 swildner Exp $ */ #include @@ -706,8 +706,7 @@ again: return (error); } MALLOC(ip, struct iso_node *, sizeof(struct iso_node), M_ISOFSNODE, - M_WAITOK); - bzero((caddr_t)ip, sizeof(struct iso_node)); + M_WAITOK | M_ZERO); ip->i_vnode = vp; ip->i_dev = dev; ip->i_number = ino; diff --git a/sys/vfs/msdosfs/msdosfs_vfsops.c b/sys/vfs/msdosfs/msdosfs_vfsops.c index 98621f5348..d23fdc0558 100644 --- a/sys/vfs/msdosfs/msdosfs_vfsops.c +++ b/sys/vfs/msdosfs/msdosfs_vfsops.c @@ -1,5 +1,5 @@ /* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/msdosfs/Attic/msdosfs_vfsops.c,v 1.60.2.8 2004/03/02 09:43:04 tjr Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vfsops.c,v 1.48 2007/08/07 20:05:30 dillon Exp $ */ +/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vfsops.c,v 1.49 2008/01/05 14:02:41 swildner Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -361,8 +361,7 @@ mountmsdosfs(struct vnode *devvp, struct mount *mp, struct msdosfs_args *argp) } #endif - pmp = kmalloc(sizeof *pmp, M_MSDOSFSMNT, M_WAITOK); - bzero((caddr_t)pmp, sizeof *pmp); + pmp = kmalloc(sizeof *pmp, M_MSDOSFSMNT, M_WAITOK | M_ZERO); pmp->pm_mountp = mp; /* diff --git a/sys/vfs/nfs/bootp_subr.c b/sys/vfs/nfs/bootp_subr.c index b741f1a78e..c84365bfa7 100644 --- a/sys/vfs/nfs/bootp_subr.c +++ b/sys/vfs/nfs/bootp_subr.c @@ -38,7 +38,7 @@ * nfs/krpc_subr.c * $NetBSD: krpc_subr.c,v 1.10 1995/08/08 20:43:43 gwr Exp $ * $FreeBSD: src/sys/nfs/bootp_subr.c,v 1.20.2.9 2003/04/24 16:51:08 ambrisko Exp $ - * $DragonFly: src/sys/vfs/nfs/bootp_subr.c,v 1.22 2006/12/23 00:41:29 swildner Exp $ + * $DragonFly: src/sys/vfs/nfs/bootp_subr.c,v 1.23 2008/01/05 14:02:41 swildner Exp $ */ #include "opt_bootp.h" @@ -1540,11 +1540,10 @@ bootpc_init(void) while (time_second == 0) tsleep(&time_second, 0, "arpkludge", 10); - gctx = kmalloc(sizeof(*gctx), M_TEMP, M_WAITOK); + gctx = kmalloc(sizeof(*gctx), M_TEMP, M_WAITOK | M_ZERO); if (gctx == NULL) panic("Failed to allocate bootp global context structure"); - bzero(gctx, sizeof(*gctx)); gctx->xid = ~0xFFFF; gctx->starttime = time_second; diff --git a/sys/vfs/nfs/nfs_srvcache.c b/sys/vfs/nfs/nfs_srvcache.c index f9a3680005..a0c55588af 100644 --- a/sys/vfs/nfs/nfs_srvcache.c +++ b/sys/vfs/nfs/nfs_srvcache.c @@ -35,7 +35,7 @@ * * @(#)nfs_srvcache.c 8.3 (Berkeley) 3/30/95 * $FreeBSD: src/sys/nfs/nfs_srvcache.c,v 1.21 2000/02/13 03:32:06 peter Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_srvcache.c,v 1.12 2006/09/05 03:48:13 dillon Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_srvcache.c,v 1.13 2008/01/05 14:02:41 swildner Exp $ */ /* @@ -219,8 +219,7 @@ loop: NFS_DPF(RC, ("M%03x", nd->nd_retxid & 0xfff)); if (numnfsrvcache < desirednfsrvcache) { rp = (struct nfsrvcache *)kmalloc((u_long)sizeof *rp, - M_NFSD, M_WAITOK); - bzero((char *)rp, sizeof *rp); + M_NFSD, M_WAITOK | M_ZERO); numnfsrvcache++; rp->rc_flag = RC_LOCKED; } else { diff --git a/sys/vfs/nfs/nfs_syscalls.c b/sys/vfs/nfs/nfs_syscalls.c index 9ddb4997dc..1e14b6176b 100644 --- a/sys/vfs/nfs/nfs_syscalls.c +++ b/sys/vfs/nfs/nfs_syscalls.c @@ -35,7 +35,7 @@ * * @(#)nfs_syscalls.c 8.5 (Berkeley) 3/30/95 * $FreeBSD: src/sys/nfs/nfs_syscalls.c,v 1.58.2.1 2000/11/26 02:30:06 dillon Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_syscalls.c,v 1.30 2007/05/18 17:05:13 dillon Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_syscalls.c,v 1.31 2008/01/05 14:02:41 swildner Exp $ */ #include @@ -400,9 +400,8 @@ nfssvc_addsock(struct file *fp, struct sockaddr *mynam, struct thread *td) so->so_snd.ssb_flags &= ~SSB_NOINTR; so->so_snd.ssb_timeo = 0; - slp = (struct nfssvc_sock *) - kmalloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_WAITOK); - bzero((caddr_t)slp, sizeof (struct nfssvc_sock)); + slp = (struct nfssvc_sock *)kmalloc(sizeof (struct nfssvc_sock), + M_NFSSVC, M_WAITOK | M_ZERO); STAILQ_INIT(&slp->ns_rec); TAILQ_INIT(&slp->ns_uidlruhead); TAILQ_INSERT_TAIL(&nfssvc_sockhead, slp, ns_chain); @@ -443,8 +442,7 @@ nfssvc_nfsd(struct nfsd_srvargs *nsd, caddr_t argp, struct thread *td) #endif if (nfsd == (struct nfsd *)0) { nsd->nsd_nfsd = nfsd = (struct nfsd *) - kmalloc(sizeof (struct nfsd), M_NFSD, M_WAITOK); - bzero((caddr_t)nfsd, sizeof (struct nfsd)); + kmalloc(sizeof (struct nfsd), M_NFSD, M_WAITOK|M_ZERO); crit_enter(); nfsd->nfsd_td = td; TAILQ_INSERT_TAIL(&nfsd_head, nfsd, nfsd_chain); @@ -838,15 +836,13 @@ nfsrv_init(int terminating) #if 0 nfs_udpsock = (struct nfssvc_sock *) - kmalloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_WAITOK); - bzero((caddr_t)nfs_udpsock, sizeof (struct nfssvc_sock)); + kmalloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_WAITOK | M_ZERO); STAILQ_INIT(&nfs_udpsock->ns_rec); TAILQ_INIT(&nfs_udpsock->ns_uidlruhead); TAILQ_INSERT_HEAD(&nfssvc_sockhead, nfs_udpsock, ns_chain); nfs_cltpsock = (struct nfssvc_sock *) - kmalloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_WAITOK); - bzero((caddr_t)nfs_cltpsock, sizeof (struct nfssvc_sock)); + kmalloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_WAITOK | M_ZERO); STAILQ_INIT(&nfs_cltpsock->ns_rec); TAILQ_INIT(&nfs_cltpsock->ns_uidlruhead); TAILQ_INSERT_TAIL(&nfssvc_sockhead, nfs_cltpsock, ns_chain); diff --git a/sys/vfs/ntfs/ntfs_subr.c b/sys/vfs/ntfs/ntfs_subr.c index eec2c03fd3..1ace1149f2 100644 --- a/sys/vfs/ntfs/ntfs_subr.c +++ b/sys/vfs/ntfs/ntfs_subr.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_subr.c,v 1.7.2.4 2001/10/12 22:08:49 semenu Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_subr.c,v 1.26 2007/08/21 17:26:48 dillon Exp $ + * $DragonFly: src/sys/vfs/ntfs/ntfs_subr.c,v 1.27 2008/01/05 14:02:41 swildner Exp $ */ #include @@ -380,9 +380,8 @@ ntfs_ntlookup(struct ntfsmount *ntmp, ino_t ino, struct ntnode **ipp) } while (LOCKMGR(&ntfs_hashlock, LK_EXCLUSIVE | LK_SLEEPFAIL)); MALLOC(ip, struct ntnode *, sizeof(struct ntnode), - M_NTFSNTNODE, M_WAITOK); + M_NTFSNTNODE, M_WAITOK | M_ZERO); ddprintf(("ntfs_ntlookup: allocating ntnode: %d: %p\n", ino, ip)); - bzero((caddr_t) ip, sizeof(struct ntnode)); /* Generic initialization */ ip->i_devvp = ntmp->ntm_devvp; @@ -529,8 +528,7 @@ ntfs_attrtontvattr(struct ntfsmount *ntmp, struct ntvattr **rvapp, *rvapp = NULL; MALLOC(vap, struct ntvattr *, sizeof(struct ntvattr), - M_NTFSNTVATTR, M_WAITOK); - bzero(vap, sizeof(struct ntvattr)); + M_NTFSNTVATTR, M_WAITOK | M_ZERO); vap->va_ip = NULL; vap->va_flag = rap->a_hdr.a_flag; vap->va_type = rap->a_hdr.a_type; @@ -712,8 +710,8 @@ ntfs_fget(struct ntfsmount *ntmp, struct ntnode *ip, int attrtype, if (*fpp) return (0); - MALLOC(fp, struct fnode *, sizeof(struct fnode), M_NTFSFNODE, M_WAITOK); - bzero(fp, sizeof(struct fnode)); + MALLOC(fp, struct fnode *, sizeof(struct fnode), M_NTFSFNODE, + M_WAITOK | M_ZERO); dprintf(("ntfs_fget: allocating fnode: %p\n",fp)); fp->f_ip = ip; diff --git a/sys/vfs/ntfs/ntfs_vfsops.c b/sys/vfs/ntfs/ntfs_vfsops.c index e1630ebbb2..4d5b2d1b06 100644 --- a/sys/vfs/ntfs/ntfs_vfsops.c +++ b/sys/vfs/ntfs/ntfs_vfsops.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_vfsops.c,v 1.20.2.5 2001/12/25 01:44:45 dillon Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_vfsops.c,v 1.46 2007/05/09 00:53:35 dillon Exp $ + * $DragonFly: src/sys/vfs/ntfs/ntfs_vfsops.c,v 1.47 2008/01/05 14:02:41 swildner Exp $ */ @@ -436,8 +436,7 @@ ntfs_mountfs(struct vnode *devvp, struct mount *mp, struct ntfs_args *argsp, error = bread(devvp, ntfs_bntodoff(BBLOCK), BBSIZE, &bp); if (error) goto out; - ntmp = kmalloc( sizeof *ntmp, M_NTFSMNT, M_WAITOK ); - bzero( ntmp, sizeof *ntmp ); + ntmp = kmalloc(sizeof *ntmp, M_NTFSMNT, M_WAITOK | M_ZERO); bcopy( bp->b_data, &ntmp->ntm_bootfile, sizeof(struct bootfile) ); brelse( bp ); bp = NULL; diff --git a/sys/vfs/smbfs/smbfs_smb.c b/sys/vfs/smbfs/smbfs_smb.c index 3e3e33d031..ca082f18aa 100644 --- a/sys/vfs/smbfs/smbfs_smb.c +++ b/sys/vfs/smbfs/smbfs_smb.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/smbfs/smbfs_smb.c,v 1.1.2.2 2003/01/17 08:20:26 tjr Exp $ - * $DragonFly: src/sys/vfs/smbfs/smbfs_smb.c,v 1.9 2006/12/23 00:41:30 swildner Exp $ + * $DragonFly: src/sys/vfs/smbfs/smbfs_smb.c,v 1.10 2008/01/05 14:02:41 swildner Exp $ */ #include #include @@ -1173,10 +1173,9 @@ smbfs_findopen(struct smbnode *dnp, const char *wildcard, int wclen, int attr, struct smbfs_fctx *ctx; int error; - ctx = kmalloc(sizeof(*ctx), M_SMBFSDATA, M_WAITOK); + ctx = kmalloc(sizeof(*ctx), M_SMBFSDATA, M_WAITOK | M_ZERO); if (ctx == NULL) return ENOMEM; - bzero(ctx, sizeof(*ctx)); ctx->f_ssp = dnp->n_mount->sm_share; ctx->f_dnp = dnp; ctx->f_flags = SMBFS_RDD_FINDFIRST; diff --git a/sys/vfs/ufs/ffs_softdep.c b/sys/vfs/ufs/ffs_softdep.c index 725a9862e9..ec4e51b727 100644 --- a/sys/vfs/ufs/ffs_softdep.c +++ b/sys/vfs/ufs/ffs_softdep.c @@ -37,7 +37,7 @@ * * from: @(#)ffs_softdep.c 9.59 (McKusick) 6/21/00 * $FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.57.2.11 2002/02/05 18:46:53 dillon Exp $ - * $DragonFly: src/sys/vfs/ufs/ffs_softdep.c,v 1.54 2007/11/07 00:46:39 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/ffs_softdep.c,v 1.55 2008/01/05 14:02:41 swildner Exp $ */ /* @@ -1356,8 +1356,7 @@ softdep_setup_allocdirect(struct inode *ip, ufs_lbn_t lbn, ufs_daddr_t newblkno, struct newblk *newblk; MALLOC(adp, struct allocdirect *, sizeof(struct allocdirect), - M_ALLOCDIRECT, M_SOFTDEP_FLAGS); - bzero(adp, sizeof(struct allocdirect)); + M_ALLOCDIRECT, M_SOFTDEP_FLAGS | M_ZERO); adp->ad_list.wk_type = D_ALLOCDIRECT; adp->ad_lbn = lbn; adp->ad_newblkno = newblkno; @@ -1585,8 +1584,7 @@ newallocindir(struct inode *ip, int ptrno, ufs_daddr_t newblkno, struct allocindir *aip; MALLOC(aip, struct allocindir *, sizeof(struct allocindir), - M_ALLOCINDIR, M_SOFTDEP_FLAGS); - bzero(aip, sizeof(struct allocindir)); + M_ALLOCINDIR, M_SOFTDEP_FLAGS | M_ZERO); aip->ai_list.wk_type = D_ALLOCINDIR; aip->ai_state = ATTACHED; aip->ai_offset = ptrno; @@ -1827,8 +1825,7 @@ softdep_setup_freeblocks(struct inode *ip, off_t length) if (length != 0) panic("softde_setup_freeblocks: non-zero length"); MALLOC(freeblks, struct freeblks *, sizeof(struct freeblks), - M_FREEBLKS, M_SOFTDEP_FLAGS); - bzero(freeblks, sizeof(struct freeblks)); + M_FREEBLKS, M_SOFTDEP_FLAGS | M_ZERO); freeblks->fb_list.wk_type = D_FREEBLKS; freeblks->fb_state = ATTACHED; freeblks->fb_uid = ip->i_uid; @@ -2440,8 +2437,7 @@ softdep_setup_directory_add(struct buf *bp, struct inode *dp, off_t diroffset, lbn = lblkno(fs, diroffset); offset = blkoff(fs, diroffset); MALLOC(dap, struct diradd *, sizeof(struct diradd), M_DIRADD, - M_SOFTDEP_FLAGS); - bzero(dap, sizeof(struct diradd)); + M_SOFTDEP_FLAGS | M_ZERO); dap->da_list.wk_type = D_DIRADD; dap->da_offset = offset; dap->da_newinum = newinum; @@ -2705,8 +2701,7 @@ newdirrem(struct buf *bp, struct inode *dp, struct inode *ip, (void) request_cleanup(FLUSH_REMOVE, 0); num_dirrem += 1; MALLOC(dirrem, struct dirrem *, sizeof(struct dirrem), - M_DIRREM, M_SOFTDEP_FLAGS); - bzero(dirrem, sizeof(struct dirrem)); + M_DIRREM, M_SOFTDEP_FLAGS | M_ZERO); dirrem->dm_list.wk_type = D_DIRREM; dirrem->dm_state = isrmdir ? RMDIR : 0; dirrem->dm_mnt = ITOV(ip)->v_mount; @@ -2810,8 +2805,7 @@ softdep_setup_directory_change(struct buf *bp, struct inode *dp, */ if (newinum != WINO) { MALLOC(dap, struct diradd *, sizeof(struct diradd), - M_DIRADD, M_SOFTDEP_FLAGS); - bzero(dap, sizeof(struct diradd)); + M_DIRADD, M_SOFTDEP_FLAGS | M_ZERO); dap->da_list.wk_type = D_DIRADD; dap->da_state = DIRCHG | ATTACHED | DEPCOMPLETE; dap->da_offset = offset; diff --git a/sys/vfs/ufs/ffs_vfsops.c b/sys/vfs/ufs/ffs_vfsops.c index 562501dcc3..ebeb848566 100644 --- a/sys/vfs/ufs/ffs_vfsops.c +++ b/sys/vfs/ufs/ffs_vfsops.c @@ -32,7 +32,7 @@ * * @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95 * $FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.117.2.10 2002/06/23 22:34:52 iedowse Exp $ - * $DragonFly: src/sys/vfs/ufs/ffs_vfsops.c,v 1.57 2007/06/17 05:08:52 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/ffs_vfsops.c,v 1.58 2008/01/05 14:02:41 swildner Exp $ */ #include "opt_quota.h" @@ -685,8 +685,7 @@ ffs_mountfs(struct vnode *devvp, struct mount *mp, struct malloc_type *mtype) error = EROFS; /* needs translation */ goto out; } - ump = kmalloc(sizeof *ump, M_UFSMNT, M_WAITOK); - bzero((caddr_t)ump, sizeof *ump); + ump = kmalloc(sizeof *ump, M_UFSMNT, M_WAITOK | M_ZERO); ump->um_malloctype = mtype; ump->um_i_effnlink_valid = 1; ump->um_fs = kmalloc((u_long)fs->fs_sbsize, M_UFSMNT, diff --git a/sys/vfs/ufs/ufs_quota.c b/sys/vfs/ufs/ufs_quota.c index 7e8854d34c..49da8ac6be 100644 --- a/sys/vfs/ufs/ufs_quota.c +++ b/sys/vfs/ufs/ufs_quota.c @@ -35,7 +35,7 @@ * * @(#)ufs_quota.c 8.5 (Berkeley) 5/20/95 * $FreeBSD: src/sys/ufs/ufs/ufs_quota.c,v 1.27.2.3 2002/01/15 10:33:32 phk Exp $ - * $DragonFly: src/sys/vfs/ufs/ufs_quota.c,v 1.26 2007/11/07 17:38:16 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/ufs_quota.c,v 1.27 2008/01/05 14:02:41 swildner Exp $ */ #include @@ -789,8 +789,8 @@ ufs_dqget(struct vnode *vp, u_long id, struct ufsmount *ump, int type, if (TAILQ_EMPTY(&ufs_dqfreelist) && ufs_numdquot < MAXQUOTAS * desiredvnodes) ufs_desireddquot += DQUOTINC; if (ufs_numdquot < ufs_desireddquot) { - dq = (struct ufs_dquot *)kmalloc(sizeof *dq, M_DQUOT, M_WAITOK); - bzero((char *)dq, sizeof *dq); + dq = (struct ufs_dquot *) + kmalloc(sizeof *dq, M_DQUOT, M_WAITOK | M_ZERO); ufs_numdquot++; } else { if ((dq = TAILQ_FIRST(&ufs_dqfreelist)) == NULL) { diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 418a012a3f..baa2c16fbb 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -96,7 +96,7 @@ * @(#)swap_pager.c 8.9 (Berkeley) 3/21/94 * * $FreeBSD: src/sys/vm/swap_pager.c,v 1.130.2.12 2002/08/31 21:15:55 dillon Exp $ - * $DragonFly: src/sys/vm/swap_pager.c,v 1.26 2006/12/23 00:41:31 swildner Exp $ + * $DragonFly: src/sys/vm/swap_pager.c,v 1.27 2008/01/05 14:02:41 swildner Exp $ */ #include @@ -380,8 +380,8 @@ swap_pager_swap_init(void) for (n = 1; n < n2 / 8; n *= 2) ; - swhash = kmalloc(sizeof(struct swblock *) * n, M_VMPGDATA, M_WAITOK); - bzero(swhash, sizeof(struct swblock *) * n); + swhash = kmalloc(sizeof(struct swblock *) * n, M_VMPGDATA, + M_WAITOK | M_ZERO); swhash_mask = n - 1; } -- 2.41.0