diff options
| author | glebius <glebius@FreeBSD.org> | 2012-12-05 08:04:20 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2012-12-05 08:04:20 +0000 |
| commit | 8e20fa5ae93243e19700ca06c01524b90fe3b784 (patch) | |
| tree | bf083a0829f8044362fc83354c8e8b60d1f7932a /sys/fs/nfs | |
| parent | d0604243f84872a5dd39fc735ebcdb4fbe1b6bb5 (diff) | |
| download | FreeBSD-src-8e20fa5ae93243e19700ca06c01524b90fe3b784.zip FreeBSD-src-8e20fa5ae93243e19700ca06c01524b90fe3b784.tar.gz | |
Mechanically substitute flags from historic mbuf allocator with
malloc(9) flags within sys.
Exceptions:
- sys/contrib not touched
- sys/mbuf.h edited manually
Diffstat (limited to 'sys/fs/nfs')
| -rw-r--r-- | sys/fs/nfs/nfs_commonsubs.c | 4 | ||||
| -rw-r--r-- | sys/fs/nfs/nfsm_subs.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 71cfbab..5fe8315 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -382,7 +382,7 @@ nfsm_strtom(struct nfsrv_descript *nd, const char *cp, int siz) while (siz > 0) { if (left == 0) { if (siz > ncl_mbuf_mlen) - NFSMCLGET(m1, M_WAIT); + NFSMCLGET(m1, M_WAITOK); else NFSMGET(m1); mbuf_setlen(m1, 0); @@ -3455,7 +3455,7 @@ nfsrvd_rephead(struct nfsrv_descript *nd) */ if ((nd->nd_flag & ND_GSSINITREPLY) == 0 && nfs_bigreply[nd->nd_procnum]) { - NFSMCLGET(mreq, M_WAIT); + NFSMCLGET(mreq, M_WAITOK); nd->nd_mreq = mreq; nd->nd_mb = mreq; } else { diff --git a/sys/fs/nfs/nfsm_subs.h b/sys/fs/nfs/nfsm_subs.h index a2777a0..6e91b99 100644 --- a/sys/fs/nfs/nfsm_subs.h +++ b/sys/fs/nfs/nfsm_subs.h @@ -73,7 +73,7 @@ nfsm_build(struct nfsrv_descript *nd, int siz) struct mbuf *mb2; if (siz > M_TRAILINGSPACE(nd->nd_mb)) { - NFSMCLGET(mb2, M_DONTWAIT); + NFSMCLGET(mb2, M_NOWAIT); if (siz > MLEN) panic("build > MLEN"); mbuf_setlen(mb2, 0); |
