diff options
Diffstat (limited to 'sys/nfs4client/nfs4_vnops.c')
| -rw-r--r-- | sys/nfs4client/nfs4_vnops.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sys/nfs4client/nfs4_vnops.c b/sys/nfs4client/nfs4_vnops.c index 0f54077..db2b30a 100644 --- a/sys/nfs4client/nfs4_vnops.c +++ b/sys/nfs4client/nfs4_vnops.c @@ -506,8 +506,8 @@ nfs4_openrpc(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, np->n_dvp = dvp; np->n_namelen = cnp->cn_namelen; /* XXX memory leaks on these; track! */ if (np->n_name != NULL) - FREE(np->n_name, M_NFSREQ); - MALLOC(np->n_name, u_char *, np->n_namelen + 1, M_NFSREQ, M_WAITOK); + free(np->n_name, M_NFSREQ); + np->n_name = malloc(np->n_namelen + 1, M_NFSREQ, M_WAITOK); bcopy(cnp->cn_nameptr, np->n_name, np->n_namelen); np->n_name[np->n_namelen] = '\0'; if (flags & FWRITE) @@ -1071,8 +1071,8 @@ nfs4_lookup(struct vop_lookup_args *ap) np->n_dvp = dvp; np->n_namelen = cnp->cn_namelen; if (np->n_name != NULL) - FREE(np->n_name, M_NFSREQ); - MALLOC(np->n_name, u_char *, np->n_namelen + 1, M_NFSREQ, M_WAITOK); + free(np->n_name, M_NFSREQ); + np->n_name = malloc(np->n_namelen + 1, M_NFSREQ, M_WAITOK); bcopy(cnp->cn_nameptr, np->n_name, np->n_namelen); np->n_name[np->n_namelen] = '\0'; @@ -1455,7 +1455,7 @@ nfs4_createrpc(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, m_freem(mrep); /* XXX */ - /*FREE(cnp->cn_pnbuf, M_NAMEI);*/ + /*free(cnp->cn_pnbuf, M_NAMEI);*/ if (error != 0 && newvp != NULL) vput(newvp); else if (error == 0) @@ -2235,7 +2235,7 @@ nfs4_sillyrename(struct vnode *dvp, struct vnode *vp, struct componentname *cnp) if (vp->v_type == VDIR) panic("nfs: sillyrename dir"); #endif - MALLOC(sp, struct sillyrename *, sizeof (struct sillyrename), + sp = malloc(sizeof (struct sillyrename), M_NFSREQ, M_WAITOK); sp->s_cred = crhold(cnp->cn_cred); sp->s_dvp = dvp; @@ -2351,9 +2351,8 @@ nfs4_lookitup(struct vnode *dvp, const char *name, int len, struct ucred *cred, np->n_dvp = dvp; np->n_namelen = len; if (np->n_name != NULL) - FREE(np->n_name, M_NFSREQ); - MALLOC(np->n_name, u_char *, - np->n_namelen + 1, M_NFSREQ, M_WAITOK); + free(np->n_name, M_NFSREQ); + np->n_name = malloc( np->n_namelen + 1, M_NFSREQ, M_WAITOK); memcpy(np->n_name, name, len); np->n_name[len] = '\0'; } |
