From dd75d1d73b4f3034c1d9f621a49fff58b1d71eb1 Mon Sep 17 00:00:00 2001 From: dwmalone Date: Fri, 8 Dec 2000 21:51:06 +0000 Subject: Convert more malloc+bzero to malloc+M_ZERO. Submitted by: josh@zipperup.org Submitted by: Robert Drehmel --- sys/nfs/nfs_nqlease.c | 7 +++---- sys/nfs/nfs_srvcache.c | 3 +-- sys/nfs/nfs_syscalls.c | 13 +++++-------- 3 files changed, 9 insertions(+), 14 deletions(-) (limited to 'sys/nfs') diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c index 2ff330e..6669010 100644 --- a/sys/nfs/nfs_nqlease.c +++ b/sys/nfs/nfs_nqlease.c @@ -262,8 +262,7 @@ nqsrv_getlease(vp, duration, flags, slp, procp, nam, cachablep, frev, cred) if (!ok) { *lphp = (struct nqm *) malloc(sizeof (struct nqm), - M_NQMHOST, M_WAITOK); - bzero((caddr_t)*lphp, sizeof (struct nqm)); + M_NQMHOST, M_WAITOK | M_ZERO); lph = (*lphp)->lpm_hosts; } nqsrv_addhost(lph, slp, nam); @@ -307,8 +306,8 @@ doreply: "nqsrvnuml", 0); } while (nfsstats.srvnqnfs_leases > nqsrv_maxnumlease); } - MALLOC(lp, struct nqlease *, sizeof (struct nqlease), M_NQLEASE, M_WAITOK); - bzero((caddr_t)lp, sizeof (struct nqlease)); + MALLOC(lp, struct nqlease *, sizeof (struct nqlease), M_NQLEASE, + M_WAITOK | M_ZERO); if (flags & ND_WRITE) lp->lc_flag |= (LC_WRITE | LC_WRITTEN); nqsrv_addhost(&lp->lc_host, slp, nam); diff --git a/sys/nfs/nfs_srvcache.c b/sys/nfs/nfs_srvcache.c index 9eb168f..99fae0e 100644 --- a/sys/nfs/nfs_srvcache.c +++ b/sys/nfs/nfs_srvcache.c @@ -220,8 +220,7 @@ loop: NFS_DPF(RC, ("M%03x", nd->nd_retxid & 0xfff)); if (numnfsrvcache < desirednfsrvcache) { rp = (struct nfsrvcache *)malloc((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/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c index 83cc56b..d1a8ead 100644 --- a/sys/nfs/nfs_syscalls.c +++ b/sys/nfs/nfs_syscalls.c @@ -388,8 +388,8 @@ nfssvc_addsock(fp, mynam, p) so->so_snd.sb_timeo = 0; slp = (struct nfssvc_sock *) - malloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_WAITOK); - bzero((caddr_t)slp, sizeof (struct nfssvc_sock)); + malloc(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); @@ -433,8 +433,7 @@ nfssvc_nfsd(nsd, argp, p) #endif if (nfsd == (struct nfsd *)0) { nsd->nsd_nfsd = nfsd = (struct nfsd *) - malloc(sizeof (struct nfsd), M_NFSD, M_WAITOK); - bzero((caddr_t)nfsd, sizeof (struct nfsd)); + malloc(sizeof (struct nfsd), M_NFSD, M_WAITOK | M_ZERO); s = splnet(); nfsd->nfsd_procp = p; TAILQ_INSERT_TAIL(&nfsd_head, nfsd, nfsd_chain); @@ -853,15 +852,13 @@ nfsrv_init(terminating) #if 0 nfs_udpsock = (struct nfssvc_sock *) - malloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_WAITOK); - bzero((caddr_t)nfs_udpsock, sizeof (struct nfssvc_sock)); + malloc(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 *) - malloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_WAITOK); - bzero((caddr_t)nfs_cltpsock, sizeof (struct nfssvc_sock)); + malloc(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); -- cgit v1.1