Author: rmacklem
Date: Sat Apr 11 23:37:58 2020
New Revision: 359811
URL: https://svnweb.freebsd.org/changeset/base/359811
Log:
Replace mbuf macros with the code they would generate in the NFS code.
When the code was ported to Mac OS/X, mbuf handling functions were
converted to using the Mac OS/X accessor functions. For FreeBSD, they
are a simple set of macros in sys/fs/nfs/nfskpiport.h.
Since porting to Mac OS/X is no longer a consideration, replacement of
these macros with the code generated by them makes the code more
readable.
When support for external page mbufs is added as needed by the KERN_TLS,
the patch becomes simpler if done without the macros.
This patch should not result in any semantic change.
This is the final patch of this series and the macros should now be
able to be deleted from the .h files in a future commit.
Modified:
head/sys/fs/nfs/nfs_commonkrpc.c
head/sys/fs/nfsclient/nfs_clrpcops.c
Modified: head/sys/fs/nfs/nfs_commonkrpc.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonkrpc.c Sat Apr 11 20:57:15 2020
(r359810)
+++ head/sys/fs/nfs/nfs_commonkrpc.c Sat Apr 11 23:37:58 2020
(r359811)
@@ -893,7 +893,7 @@ tryagain:
*/
newnfs_realign(&nd->nd_mrep, M_WAITOK);
nd->nd_md = nd->nd_mrep;
- nd->nd_dpos = NFSMTOD(nd->nd_md, caddr_t);
+ nd->nd_dpos = mtod(nd->nd_md, caddr_t);
nd->nd_repstat = 0;
if (nd->nd_procnum != NFSPROC_NULL &&
nd->nd_procnum != NFSV4PROC_CBNULL) {
Modified: head/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clrpcops.c Sat Apr 11 20:57:15 2020
(r359810)
+++ head/sys/fs/nfsclient/nfs_clrpcops.c Sat Apr 11 23:37:58 2020
(r359811)
@@ -238,7 +238,7 @@ nfsrpc_null(vnode_t vp, struct ucred *cred, NFSPROC_T
error = nfscl_request(nd, vp, p, cred, NULL);
if (nd->nd_repstat && !error)
error = nd->nd_repstat;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -344,7 +344,7 @@ nfsrpc_accessrpc(vnode_t vp, u_int32_t mode, struct uc
} else
error = nd->nd_repstat;
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -679,7 +679,7 @@ nfsmout:
*dpp = ndp;
else if (ndp != NULL)
free(ndp, M_NFSCLDELEG);
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -722,7 +722,7 @@ nfsrpc_opendowngrade(vnode_t vp, u_int32_t mode, struc
if (error == NFSERR_STALESTATEID)
nfscl_initiate_recovery(op->nfso_own->nfsow_clp);
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -880,7 +880,7 @@ nfsrpc_closerpc(struct nfsrv_descript *nd, struct nfsm
if (error == NFSERR_STALESTATEID)
nfscl_initiate_recovery(op->nfso_own->nfsow_clp);
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -922,7 +922,7 @@ nfsrpc_openconfirm(vnode_t vp, u_int8_t *nfhp, int fhl
if (error == NFSERR_STALESTATEID)
nfscl_initiate_recovery(op->nfso_own->nfsow_clp);
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -1077,7 +1077,7 @@ nfsrpc_setclient(struct nfsmount *nmp, struct nfsclcli
tsep->nfsess_clientid.lval[1] = *tl++;
confirm.lval[0] = *tl++;
confirm.lval[1] = *tl;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
nd->nd_mrep = NULL;
/*
@@ -1095,7 +1095,7 @@ nfsrpc_setclient(struct nfsmount *nmp, struct nfsclcli
cred, NFS_PROG, NFS_VER4, NULL, 1, NULL, NULL);
if (error)
return (error);
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
nd->nd_mrep = NULL;
if (nd->nd_repstat == 0) {
nfscl_reqstart(nd, NFSPROC_GETATTR, nmp, nmp->nm_fh,
@@ -1123,7 +1123,7 @@ nfsrpc_setclient(struct nfsmount *nmp, struct nfsclcli
}
error = nd->nd_repstat;
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -1150,7 +1150,7 @@ nfsrpc_getattr(vnode_t vp, struct ucred *cred, NFSPROC
error = nfsm_loadattr(nd, nap);
else
error = nd->nd_repstat;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -1190,7 +1190,7 @@ nfsrpc_getattrnovp(struct nfsmount *nmp, u_int8_t *fhp
error = nfsm_loadattr(nd, nap);
} else
error = nd->nd_repstat;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -1315,7 +1315,7 @@ nfsrpc_setattrrpc(vnode_t vp, struct vattr *vap,
error = nfsrv_getattrbits(nd, &attrbits, NULL, NULL);
if (!(nd->nd_flag & ND_NFSV3) && !nd->nd_repstat && !error)
error = nfscl_postop_attr(nd, rnap, attrflagp, stuff);
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
if (nd->nd_repstat && !error)
error = nd->nd_repstat;
return (error);
@@ -1387,7 +1387,7 @@ nfsrpc_lookup(vnode_t dvp, char *name, int len, struct
nfhp->nfh_len = np->n_fhp->nfh_len;
NFSBCOPY(np->n_fhp->nfh_fh, nfhp->nfh_fh, nfhp->nfh_len);
*nfhpp = nfhp;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (0);
}
if (nd->nd_flag & ND_NFSV3)
@@ -1418,7 +1418,7 @@ nfsrpc_lookup(vnode_t dvp, char *name, int len, struct
if ((nd->nd_flag & ND_NFSV3) && !error)
error = nfscl_postop_attr(nd, dnap, dattrflagp, stuff);
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
if (!error && nd->nd_repstat)
error = nd->nd_repstat;
return (error);
@@ -1476,7 +1476,7 @@ nfsrpc_readlink(vnode_t vp, struct uio *uiop, struct u
if (nd->nd_repstat && !error)
error = nd->nd_repstat;
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -1617,7 +1617,7 @@ nfsrpc_readrpc(vnode_t vp, struct uio *uiop, struct uc
error = nfsm_mbufuio(nd, uiop, retlen);
if (error)
goto nfsmout;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
nd->nd_mrep = NULL;
tsiz -= retlen;
if (!(nd->nd_flag & ND_NFSV2)) {
@@ -1629,7 +1629,7 @@ nfsrpc_readrpc(vnode_t vp, struct uio *uiop, struct uc
return (0);
nfsmout:
if (nd->nd_mrep != NULL)
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -1885,13 +1885,13 @@ nfsrpc_writerpc(vnode_t vp, struct uio *uiop, int *iom
if (error)
goto nfsmout;
NFSWRITERPC_SETTIME(wccflag, np, nap, (nd->nd_flag & ND_NFSV4));
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
nd->nd_mrep = NULL;
tsiz -= len;
}
nfsmout:
if (nd->nd_mrep != NULL)
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
*iomode = committed;
if (nd->nd_repstat && !error)
error = nd->nd_repstat;
@@ -1974,7 +1974,7 @@ nfsrpc_mknod(vnode_t dvp, char *name, int namelen, str
if (!error && nd->nd_repstat)
error = nd->nd_repstat;
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -2098,7 +2098,7 @@ nfsrpc_createv23(vnode_t dvp, char *name, int namelen,
if (nd->nd_repstat != 0 && error == 0)
error = nd->nd_repstat;
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -2343,7 +2343,7 @@ nfsmout:
*dpp = dp;
else if (dp != NULL)
free(dp, M_NFSCLDELEG);
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -2404,7 +2404,7 @@ tryagain:
* If the Delegreturn failed, try again without
* it. The server will Recall, as required.
*/
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
goto tryagain;
}
for (i = 0; i < (ret * 2); i++) {
@@ -2420,7 +2420,7 @@ tryagain:
if (nd->nd_repstat && !error)
error = nd->nd_repstat;
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -2532,7 +2532,7 @@ tryagain:
* If the Delegreturn failed, try again without
* it. The server will Recall, as required.
*/
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
goto tryagain;
}
for (i = 0; i < (ret * 2); i++) {
@@ -2548,7 +2548,7 @@ tryagain:
* If ret > 1, the first iteration of this
* loop is the second DelegReturn result.
*/
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
goto tryagain;
} else {
nd->nd_flag |= ND_NOMOREDATA;
@@ -2578,7 +2578,7 @@ tryagain:
if (nd->nd_repstat && !error)
error = nd->nd_repstat;
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -2641,7 +2641,7 @@ nfsrpc_link(vnode_t dvp, vnode_t vp, char *name, int n
if (nd->nd_repstat && !error)
error = nd->nd_repstat;
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -2693,7 +2693,7 @@ nfsrpc_symlink(vnode_t dvp, char *name, int namelen, c
}
if (nd->nd_repstat && !error)
error = nd->nd_repstat;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
/*
* Kludge: Map EEXIST => 0 assuming that it is a reply to a retry.
* Only do this if vfs.nfs.ignore_eexist is set.
@@ -2775,7 +2775,7 @@ nfsrpc_mkdir(vnode_t dvp, char *name, int namelen, str
if (nd->nd_repstat && !error)
error = nd->nd_repstat;
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
/*
* Kludge: Map EEXIST => 0 assuming that it is a reply to a retry.
* Only do this if vfs.nfs.ignore_eexist is set.
@@ -2810,7 +2810,7 @@ nfsrpc_rmdir(vnode_t dvp, char *name, int namelen, str
error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, dstuff);
if (nd->nd_repstat && !error)
error = nd->nd_repstat;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
/*
* Kludge: Map ENOENT => 0 assuming that you have a reply to a retry.
*/
@@ -2976,7 +2976,7 @@ nfsrpc_readdir(vnode_t vp, struct uio *uiop, nfsuint64
} else {
error = nd->nd_repstat;
}
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
if (error)
return (error);
nd->nd_mrep = NULL;
@@ -3225,7 +3225,7 @@ nfsrpc_readdir(vnode_t vp, struct uio *uiop, nfsuint64
goto nfsmout;
}
}
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
nd->nd_mrep = NULL;
}
/*
@@ -3276,7 +3276,7 @@ nfsrpc_readdir(vnode_t vp, struct uio *uiop, nfsuint64
nfsmout:
if (nd->nd_mrep != NULL)
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -3413,7 +3413,7 @@ nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsui
} else {
error = nd->nd_repstat;
}
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
if (error)
return (error);
nd->nd_mrep = NULL;
@@ -3728,7 +3728,7 @@ nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsui
goto nfsmout;
}
}
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
nd->nd_mrep = NULL;
}
/*
@@ -3779,7 +3779,7 @@ nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsui
nfsmout:
if (nd->nd_mrep != NULL)
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
#endif /* !APPLE */
@@ -3830,7 +3830,7 @@ nfsrpc_commit(vnode_t vp, u_quad_t offset, int cnt, st
nfsmout:
if (!error && nd->nd_repstat)
error = nd->nd_repstat;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -4073,7 +4073,7 @@ nfsrpc_lockt(struct nfsrv_descript *nd, vnode_t vp,
} else if (nd->nd_repstat == NFSERR_STALECLIENTID)
nfscl_initiate_recovery(clp);
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -4123,7 +4123,7 @@ nfsrpc_locku(struct nfsrv_descript *nd, struct nfsmoun
} else if (nd->nd_repstat == NFSERR_STALESTATEID)
nfscl_initiate_recovery(lp->nfsl_open->nfso_own->nfsow_clp);
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -4211,7 +4211,7 @@ nfsrpc_lock(struct nfsrv_descript *nd, struct nfsmount
} else if (nd->nd_repstat == NFSERR_STALESTATEID)
nfscl_initiate_recovery(lp->nfsl_open->nfso_own->nfsow_clp);
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -4291,7 +4291,7 @@ nfsrpc_statfs(vnode_t vp, struct nfsstatfs *sbp, struc
sbp->sf_bavail = fxdr_unsigned(u_int32_t, *tl);
}
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -4352,7 +4352,7 @@ nfsrpc_pathconf(vnode_t vp, struct nfsv3_pathconf *pc,
}
}
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -4391,7 +4391,7 @@ nfsrpc_fsinfo(vnode_t vp, struct nfsfsinfo *fsp, struc
fsp->fs_properties = fxdr_unsigned(u_int32_t, *tl);
}
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -4445,7 +4445,7 @@ nfsrpc_renew(struct nfsclclient *clp, struct nfsclds *
if (error)
return (error);
error = nd->nd_repstat;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -4484,7 +4484,7 @@ nfsrpc_rellockown(struct nfsmount *nmp, struct nfscllo
if (error)
return (error);
error = nd->nd_repstat;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -4553,7 +4553,7 @@ nfsrpc_getdirpath(struct nfsmount *nmp, u_char *dirpat
}
error = nd->nd_repstat;
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -4586,7 +4586,7 @@ nfsrpc_delegreturn(struct nfscldeleg *dp, struct ucred
if (error)
return (error);
error = nd->nd_repstat;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -4616,7 +4616,7 @@ nfsrpc_getacl(vnode_t vp, struct ucred *cred, NFSPROC_
NULL, NULL, NULL, aclp, 0, NULL, NULL, NULL, p, cred);
else
error = nd->nd_repstat;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -4660,7 +4660,7 @@ nfsrpc_setaclrpc(vnode_t vp, struct ucred *cred, NFSPR
if (error)
return (error);
/* Don't care about the pre/postop attributes */
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (nd->nd_repstat);
}
@@ -4750,7 +4750,7 @@ nfsrpc_exchangeid(struct nfsmount *nmp, struct nfsclcl
}
error = nd->nd_repstat;
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -4888,7 +4888,7 @@ nfsrpc_createsession(struct nfsmount *nmp, struct nfsc
}
error = nd->nd_repstat;
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -4916,7 +4916,7 @@ nfsrpc_destroysession(struct nfsmount *nmp, struct nfs
if (error != 0)
return (error);
error = nd->nd_repstat;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -4945,7 +4945,7 @@ nfsrpc_destroyclient(struct nfsmount *nmp, struct nfsc
if (error != 0)
return (error);
error = nd->nd_repstat;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -4977,7 +4977,7 @@ nfsrpc_layoutget(struct nfsmount *nmp, uint8_t *fhp, i
flhp);
if (error == 0 && nd->nd_repstat != 0)
error = nd->nd_repstat;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -5211,7 +5211,7 @@ nfsrpc_getdeviceinfo(struct nfsmount *nmp, uint8_t *de
nfsmout:
if (error != 0 && ndi != NULL)
nfscl_freedevinfo(ndi);
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -5260,7 +5260,7 @@ nfsrpc_layoutcommit(struct nfsmount *nmp, uint8_t *fh,
if (error != 0)
return (error);
error = nd->nd_repstat;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -5348,7 +5348,7 @@ nfsrpc_layoutreturn(struct nfsmount *nmp, uint8_t *fh,
} else
error = nd->nd_repstat;
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -5645,7 +5645,7 @@ nfsrpc_reclaimcomplete(struct nfsmount *nmp, struct uc
if (error != 0)
return (error);
error = nd->nd_repstat;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -5908,10 +5908,10 @@ nfsm_copym(struct mbuf *m, int off, int xfer)
while (m3->m_next != NULL)
m3 = m3->m_next;
NFSMGET(m4);
- tl = NFSMTOD(m4, uint32_t *);
+ tl = mtod(m4, uint32_t *);
*tl = 0;
- mbuf_setlen(m4, rem);
- mbuf_setnext(m3, m4);
+ m4->m_len = rem;
+ m3->m_next = m4;
}
return (m2);
}
@@ -6275,7 +6275,7 @@ nfsrpc_readds(vnode_t vp, struct uio *uiop, nfsv4state
error = nfsm_mbufuio(nd, uiop, retlen);
nfsmout:
if (nd->nd_mrep != NULL)
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -6400,7 +6400,7 @@ nfsrpc_writeds(vnode_t vp, struct uio *uiop, int *iomo
}
nfsmout:
if (nd->nd_mrep != NULL)
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
*iomode = committed;
if (nd->nd_repstat != 0 && error == 0)
error = nd->nd_repstat;
@@ -6511,7 +6511,7 @@ nfsrpc_writedsmir(vnode_t vp, int *iomode, int *must_c
}
nfsmout:
if (nd->nd_mrep != NULL)
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
*iomode = committed;
if (nd->nd_repstat != 0 && error == 0)
error = nd->nd_repstat;
@@ -6698,7 +6698,7 @@ nfsrpc_commitds(vnode_t vp, uint64_t offset, int cnt,
nfsmout:
if (error == 0 && nd->nd_repstat != 0)
error = nd->nd_repstat;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -6783,7 +6783,7 @@ nfsrpc_advise(vnode_t vp, off_t offset, uint64_t cnt,
return (error);
if (nd->nd_repstat != 0)
error = nd->nd_repstat;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -6837,7 +6837,7 @@ nfsrpc_adviseds(vnode_t vp, uint64_t offset, int cnt,
return (error);
if (nd->nd_repstat != 0)
error = nd->nd_repstat;
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -7001,7 +7001,7 @@ nfsrpc_allocaterpc(vnode_t vp, off_t off, off_t len, n
} else
error = nd->nd_repstat;
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -7616,7 +7616,7 @@ nfsrpc_openlayoutrpc(struct nfsmount *nmp, vnode_t vp,
error = nd->nd_repstat;
nfsmout:
free(ndp, M_NFSCLDELEG);
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -7873,7 +7873,7 @@ nfsmout:
*dpp = dp;
else
free(dp, M_NFSCLDELEG);
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -8190,7 +8190,7 @@ nfsrpc_copyrpc(vnode_t invp, off_t inoff, vnode_t outv
if (error == 0)
error = nd->nd_repstat;
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -8284,7 +8284,7 @@ nfsrpc_seekrpc(vnode_t vp, off_t *offp, nfsv4stateid_t
}
error = nd->nd_repstat;
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -8355,7 +8355,7 @@ nfsrpc_getextattr(vnode_t vp, const char *name, struct
if (error == 0)
error = nd->nd_repstat;
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -8376,7 +8376,7 @@ nfsrpc_setextattr(vnode_t vp, const char *name, struct
NFSCL_REQSTART(nd, NFSPROC_SETEXTATTR, vp);
if (uiop->uio_resid > nd->nd_maxreq) {
/* nd_maxreq is set by NFSCL_REQSTART(). */
- mbuf_freem(nd->nd_mreq);
+ m_freem(nd->nd_mreq);
return (EINVAL);
}
NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED);
@@ -8403,7 +8403,7 @@ nfsrpc_setextattr(vnode_t vp, const char *name, struct
if (error == 0)
error = nd->nd_repstat;
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -8441,7 +8441,7 @@ nfsrpc_rmextattr(vnode_t vp, const char *name, struct
if (error == 0)
error = nd->nd_repstat;
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
@@ -8518,7 +8518,7 @@ nfsrpc_listextattr(vnode_t vp, uint64_t *cookiep, stru
if (error == 0)
error = nd->nd_repstat;
nfsmout:
- mbuf_freem(nd->nd_mrep);
+ m_freem(nd->nd_mrep);
return (error);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
