diff options
author | des <des@FreeBSD.org> | 2008-10-23 15:53:51 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2008-10-23 15:53:51 +0000 |
commit | 66f807ed8b3634dc73d9f7526c484e43f094c0ee (patch) | |
tree | 21e792ce590e1bcf9b343890605a1b4c6a9016b3 /sys/nfsserver | |
parent | a779c60ce0a41cd14710a8a12cfa22955108b27a (diff) | |
download | FreeBSD-src-66f807ed8b3634dc73d9f7526c484e43f094c0ee.zip FreeBSD-src-66f807ed8b3634dc73d9f7526c484e43f094c0ee.tar.gz |
Retire the MALLOC and FREE macros. They are an abomination unto style(9).
MFC after: 3 months
Diffstat (limited to 'sys/nfsserver')
-rw-r--r-- | sys/nfsserver/nfs_serv.c | 38 | ||||
-rw-r--r-- | sys/nfsserver/nfs_srvcache.c | 2 | ||||
-rw-r--r-- | sys/nfsserver/nfs_srvsock.c | 6 | ||||
-rw-r--r-- | sys/nfsserver/nfs_syscalls.c | 16 |
4 files changed, 31 insertions, 31 deletions
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c index a117cb8..a339e55 100644 --- a/sys/nfsserver/nfs_serv.c +++ b/sys/nfsserver/nfs_serv.c @@ -940,7 +940,7 @@ nfsrv_read(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, m2 = m; } } - MALLOC(iv, struct iovec *, i * sizeof (struct iovec), + iv = malloc(i * sizeof (struct iovec), M_TEMP, M_WAITOK); uiop->uio_iov = iv2 = iv; m = mb; @@ -968,7 +968,7 @@ nfsrv_read(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, error = VOP_READ(vp, uiop, IO_NODELOCKED | ioflag, cred); off = uiop->uio_offset; nh->nh_nextr = off; - FREE((caddr_t)iv2, M_TEMP); + free((caddr_t)iv2, M_TEMP); if (error || (getret = VOP_GETATTR(vp, vap, cred))) { if (!error) error = getret; @@ -1141,7 +1141,7 @@ nfsrv_write(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, } if (len > 0) { - MALLOC(ivp, struct iovec *, cnt * sizeof (struct iovec), M_TEMP, + ivp = malloc(cnt * sizeof (struct iovec), M_TEMP, M_WAITOK); uiop->uio_iov = iv = ivp; uiop->uio_iovcnt = cnt; @@ -1176,7 +1176,7 @@ nfsrv_write(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, error = VOP_WRITE(vp, uiop, ioflags, cred); /* Unlocked write. */ nfsrvstats.srvvop_writes++; - FREE((caddr_t)iv, M_TEMP); + free((caddr_t)iv, M_TEMP); } aftat_ret = VOP_GETATTR(vp, vap, cred); vput(vp); @@ -1465,7 +1465,7 @@ loop1: mp = mp->m_next; } uiop->uio_iovcnt = i; - MALLOC(iov, struct iovec *, i * sizeof (struct iovec), + iov = malloc(i * sizeof (struct iovec), M_TEMP, M_WAITOK); uiop->uio_iov = ivp = iov; mp = mrep; @@ -1493,7 +1493,7 @@ loop1: vn_finished_write(mntp); } VFS_UNLOCK_GIANT(mvfslocked); - FREE((caddr_t)iov, M_TEMP); + free((caddr_t)iov, M_TEMP); } m_freem(mrep); if (vp) { @@ -2676,7 +2676,7 @@ nfsrv_symlink(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, } if (error) goto out; - MALLOC(pathcp, caddr_t, len2 + 1, M_TEMP, M_WAITOK); + pathcp = malloc(len2 + 1, M_TEMP, M_WAITOK); iv.iov_base = pathcp; iv.iov_len = len2; io.uio_resid = len2; @@ -2754,7 +2754,7 @@ out: * make any sense? XXX can nfsm_reply() block? */ if (pathcp) { - FREE(pathcp, M_TEMP); + free(pathcp, M_TEMP); pathcp = NULL; } if (dirp) { @@ -2792,7 +2792,7 @@ nfsmout: if (dirp) vrele(dirp); if (pathcp) - FREE(pathcp, M_TEMP); + free(pathcp, M_TEMP); vn_finished_write(mp); VFS_UNLOCK_GIANT(vfslocked); @@ -3221,7 +3221,7 @@ nfsrv_readdir(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, /* * end section. Allocate rbuf and continue */ - MALLOC(rbuf, caddr_t, siz, M_TEMP, M_WAITOK); + rbuf = malloc(siz, M_TEMP, M_WAITOK); again: iv.iov_base = rbuf; iv.iov_len = fullsiz; @@ -3281,8 +3281,8 @@ again: tl = nfsm_build(u_int32_t *, 2 * NFSX_UNSIGNED); *tl++ = nfsrv_nfs_false; *tl = nfsrv_nfs_true; - FREE((caddr_t)rbuf, M_TEMP); - FREE((caddr_t)cookies, M_TEMP); + free((caddr_t)rbuf, M_TEMP); + free((caddr_t)cookies, M_TEMP); error = 0; goto nfsmout; } @@ -3409,8 +3409,8 @@ again: mp->m_len = bp - mtod(mp, caddr_t); } else mp->m_len += bp - bpos; - FREE((caddr_t)rbuf, M_TEMP); - FREE((caddr_t)cookies, M_TEMP); + free((caddr_t)rbuf, M_TEMP); + free((caddr_t)cookies, M_TEMP); nfsmout: if (vp) @@ -3503,7 +3503,7 @@ nfsrv_readdirplus(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, goto nfsmout; } VOP_UNLOCK(vp, 0); - MALLOC(rbuf, caddr_t, siz, M_TEMP, M_WAITOK); + rbuf = malloc(siz, M_TEMP, M_WAITOK); again: iv.iov_base = rbuf; iv.iov_len = fullsiz; @@ -3557,8 +3557,8 @@ again: tl += 2; *tl++ = nfsrv_nfs_false; *tl = nfsrv_nfs_true; - FREE((caddr_t)cookies, M_TEMP); - FREE((caddr_t)rbuf, M_TEMP); + free((caddr_t)cookies, M_TEMP); + free((caddr_t)rbuf, M_TEMP); error = 0; goto nfsmout; } @@ -3756,8 +3756,8 @@ invalid: mp->m_len = bp - mtod(mp, caddr_t); } else mp->m_len += bp - bpos; - FREE((caddr_t)cookies, M_TEMP); - FREE((caddr_t)rbuf, M_TEMP); + free((caddr_t)cookies, M_TEMP); + free((caddr_t)rbuf, M_TEMP); nfsmout: if (vp) vrele(vp); diff --git a/sys/nfsserver/nfs_srvcache.c b/sys/nfsserver/nfs_srvcache.c index a0f272b..1e36a45 100644 --- a/sys/nfsserver/nfs_srvcache.c +++ b/sys/nfsserver/nfs_srvcache.c @@ -265,7 +265,7 @@ loop: if (rp->rc_flag & RC_REPMBUF) m_freem(rp->rc_reply); if (rp->rc_flag & RC_NAM) - FREE(rp->rc_nam, M_SONAME); + free(rp->rc_nam, M_SONAME); rp->rc_flag &= (RC_LOCKED | RC_WANTED); } TAILQ_INSERT_TAIL(&nfsrvlruhead, rp, rc_lru); diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c index ad557d3..a29d8c4 100644 --- a/sys/nfsserver/nfs_srvsock.c +++ b/sys/nfsserver/nfs_srvsock.c @@ -494,7 +494,7 @@ nfsrv_rcv(struct socket *so, void *arg, int waitflag) waitflag == M_DONTWAIT ? M_NOWAIT : M_WAITOK); if (!rec) { if (nam) - FREE(nam, M_SONAME); + free(nam, M_SONAME); m_freem(mp); NFSD_LOCK(); continue; @@ -693,7 +693,7 @@ nfsrv_dorec(struct nfssvc_sock *slp, struct nfsd *nfsd, m = rec->nr_packet; free(rec, M_NFSRVDESC); NFSD_UNLOCK(); - MALLOC(nd, struct nfsrv_descript *, sizeof (struct nfsrv_descript), + nd = malloc(sizeof (struct nfsrv_descript), M_NFSRVDESC, M_WAITOK); nd->nd_cr = crget(); NFSD_LOCK(); @@ -703,7 +703,7 @@ nfsrv_dorec(struct nfssvc_sock *slp, struct nfsd *nfsd, error = nfs_getreq(nd, nfsd, TRUE); if (error) { if (nam) { - FREE(nam, M_SONAME); + free(nam, M_SONAME); } if (nd->nd_cr != NULL) crfree(nd->nd_cr); diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c index f3b69e7..23db48c 100644 --- a/sys/nfsserver/nfs_syscalls.c +++ b/sys/nfsserver/nfs_syscalls.c @@ -202,7 +202,7 @@ nfssvc_addsock(struct file *fp, struct sockaddr *mynam) tslp = nfs_udpsock; if (tslp->ns_flag & SLP_VALID) { if (mynam != NULL) - FREE(mynam, M_SONAME); + free(mynam, M_SONAME); return (EPERM); } } @@ -211,7 +211,7 @@ nfssvc_addsock(struct file *fp, struct sockaddr *mynam) error = soreserve(so, siz, siz); if (error) { if (mynam != NULL) - FREE(mynam, M_SONAME); + free(mynam, M_SONAME); return (error); } @@ -459,7 +459,7 @@ nfssvc_nfsd() nfsrvstats.srv_errs++; nfsrv_updatecache(nd, FALSE, mreq); if (nd->nd_nam2) - FREE(nd->nd_nam2, M_SONAME); + free(nd->nd_nam2, M_SONAME); break; } nfsrvstats.srvrpccnt[nd->nd_procnum]++; @@ -496,7 +496,7 @@ nfssvc_nfsd() m_freem(m); } if (nd->nd_nam2) - FREE(nd->nd_nam2, M_SONAME); + free(nd->nd_nam2, M_SONAME); if (nd->nd_mrep) m_freem(nd->nd_mrep); if (error == EPIPE) @@ -515,13 +515,13 @@ nfssvc_nfsd() case RC_DROPIT: m_freem(nd->nd_mrep); if (nd->nd_nam2) - FREE(nd->nd_nam2, M_SONAME); + free(nd->nd_nam2, M_SONAME); break; }; if (nd) { if (nd->nd_cr != NULL) crfree(nd->nd_cr); - FREE((caddr_t)nd, M_NFSRVDESC); + free((caddr_t)nd, M_NFSRVDESC); nd = NULL; } @@ -596,12 +596,12 @@ nfsrv_zapsock(struct nfssvc_sock *slp) closef(fp, NULL); NFSD_LOCK(); if (slp->ns_nam) - FREE(slp->ns_nam, M_SONAME); + free(slp->ns_nam, M_SONAME); m_freem(slp->ns_raw); while ((rec = STAILQ_FIRST(&slp->ns_rec)) != NULL) { STAILQ_REMOVE_HEAD(&slp->ns_rec, nr_link); if (rec->nr_address) - FREE(rec->nr_address, M_SONAME); + free(rec->nr_address, M_SONAME); m_freem(rec->nr_packet); free(rec, M_NFSRVDESC); } |