summaryrefslogtreecommitdiff
path: root/sys/nfs/nfs_syscalls.c
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2014-11-15 00:03:13 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2014-11-15 00:03:13 +0000
commitc3d0139db1ad2fcb4f60d5f0b484141c326b4064 (patch)
treed5d1afcbf0d780f1409eb7540b7e0bb5b7294e65 /sys/nfs/nfs_syscalls.c
parentbc12c86a75ed337690facd5ac2ed837f666bc171 (diff)
add sizes for free(ptr, sizeof(*ptr)). use sizeof(*ptr) for malloc sizes.
Diffstat (limited to 'sys/nfs/nfs_syscalls.c')
-rw-r--r--sys/nfs/nfs_syscalls.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index 84c3216f535..da84ada82ae 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_syscalls.c,v 1.97 2014/07/12 18:43:52 tedu Exp $ */
+/* $OpenBSD: nfs_syscalls.c,v 1.98 2014/11/15 00:03:12 tedu Exp $ */
/* $NetBSD: nfs_syscalls.c,v 1.19 1996/02/18 11:53:52 fvdl Exp $ */
/*
@@ -271,7 +271,7 @@ nfssvc_addsock(struct file *fp, struct mbuf *mynam)
if (tslp)
slp = tslp;
else {
- slp = malloc(sizeof(struct nfssvc_sock), M_NFSSVC,
+ slp = malloc(sizeof(*slp), M_NFSSVC,
M_WAITOK|M_ZERO);
TAILQ_INSERT_TAIL(&nfssvc_sockhead, slp, ns_chain);
}
@@ -456,7 +456,7 @@ loop:
done:
TAILQ_REMOVE(&nfsd_head, nfsd, nfsd_chain);
splx(s);
- free((caddr_t)nfsd, M_NFSD, 0);
+ free(nfsd, M_NFSD, sizeof(*nfsd));
if (--nfs_numnfsd == 0)
nfsrv_init(1); /* Reinitialize everything */
return (error);
@@ -506,7 +506,7 @@ nfsrv_slpderef(struct nfssvc_sock *slp)
{
if (--(slp->ns_sref) == 0 && (slp->ns_flag & SLP_VALID) == 0) {
TAILQ_REMOVE(&nfssvc_sockhead, slp, ns_chain);
- free((caddr_t)slp, M_NFSSVC, 0);
+ free(slp, M_NFSSVC, sizeof(*slp));
}
}
@@ -530,7 +530,7 @@ nfsrv_init(int terminating)
if (slp->ns_flag & SLP_VALID)
nfsrv_zapsock(slp);
TAILQ_REMOVE(&nfssvc_sockhead, slp, ns_chain);
- free((caddr_t)slp, M_NFSSVC, 0);
+ free(slp, M_NFSSVC, sizeof(*slp));
}
nfsrv_cleancache(); /* And clear out server cache */
}
@@ -545,7 +545,7 @@ nfsrv_init(int terminating)
TAILQ_INIT(&nfsd_head);
nfsd_head_flag &= ~NFSD_CHECKSLP;
- nfs_udpsock = malloc(sizeof(struct nfssvc_sock), M_NFSSVC,
+ nfs_udpsock = malloc(sizeof(*nfs_udpsock), M_NFSSVC,
M_WAITOK|M_ZERO);
TAILQ_INSERT_HEAD(&nfssvc_sockhead, nfs_udpsock, ns_chain);