summaryrefslogtreecommitdiff
path: root/sys/nfs/nfs_socket.c
diff options
context:
space:
mode:
authorThordur I. Bjornsson <thib@cvs.openbsd.org>2007-09-20 12:54:32 +0000
committerThordur I. Bjornsson <thib@cvs.openbsd.org>2007-09-20 12:54:32 +0000
commit35a7fe647ce46eafedd8a154db1b3b6c04c630a5 (patch)
treeb72d86f8c636b2132383a7135e63d7795f1c5d42 /sys/nfs/nfs_socket.c
parent2650f9c8b741b5eeac7830ef59dea2409937f8ed (diff)
MALLOC/FREE -> malloc/free + M_ZERO.
Uneeded includes and casts... ok krw@
Diffstat (limited to 'sys/nfs/nfs_socket.c')
-rw-r--r--sys/nfs/nfs_socket.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index e3ed1525640..38fe77d854f 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_socket.c,v 1.49 2007/06/25 20:40:00 thib Exp $ */
+/* $OpenBSD: nfs_socket.c,v 1.50 2007/09/20 12:54:31 thib Exp $ */
/* $NetBSD: nfs_socket.c,v 1.27 1996/04/15 20:20:00 thorpej Exp $ */
/*
@@ -2070,8 +2070,7 @@ nfsrv_dorec(slp, nfsd, ndp)
nam->m_next = NULL;
} else
nam = NULL;
- MALLOC(nd, struct nfsrv_descript *, sizeof (struct nfsrv_descript),
- M_NFSRVDESC, M_WAITOK);
+ nd = malloc(sizeof(struct nfsrv_descript), M_NFSRVDESC, M_WAITOK);
nfs_realign(&m, 10 * NFSX_UNSIGNED);
nd->nd_md = nd->nd_mrep = m;
nd->nd_nam2 = nam;
@@ -2079,7 +2078,7 @@ nfsrv_dorec(slp, nfsd, ndp)
error = nfs_getreq(nd, nfsd, TRUE);
if (error) {
m_freem(nam);
- free((caddr_t)nd, M_NFSRVDESC);
+ free(nd, M_NFSRVDESC);
return (error);
}
*ndp = nd;