diff options
| author | ru <ru@FreeBSD.org> | 2008-03-25 09:39:02 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2008-03-25 09:39:02 +0000 |
| commit | 3b1bf8c2e9222b7d27e8b9084e637a84005de7ba (patch) | |
| tree | cf0376c9359f2d1ca6e4e8e4ad4a4f722dba61a7 /sys/nfsserver/nfs_srvcache.c | |
| parent | 0655a583e2ccba8b534e710284a730a0d6af1375 (diff) | |
| download | FreeBSD-src-3b1bf8c2e9222b7d27e8b9084e637a84005de7ba.zip FreeBSD-src-3b1bf8c2e9222b7d27e8b9084e637a84005de7ba.tar.gz | |
Replaced the misleading uses of a historical artefact M_TRYWAIT with M_WAIT.
Removed dead code that assumed that M_TRYWAIT can return NULL; it's not true
since the advent of MBUMA.
Reviewed by: arch
There are ongoing disputes as to whether we want to switch to directly using
UMA flags M_WAITOK/M_NOWAIT for mbuf(9) allocation.
Diffstat (limited to 'sys/nfsserver/nfs_srvcache.c')
| -rw-r--r-- | sys/nfsserver/nfs_srvcache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/nfsserver/nfs_srvcache.c b/sys/nfsserver/nfs_srvcache.c index ca6b8c2..a0f272b 100644 --- a/sys/nfsserver/nfs_srvcache.c +++ b/sys/nfsserver/nfs_srvcache.c @@ -227,7 +227,7 @@ loop: nfsrvstats.srvcache_nonidemdonehits++; NFSD_UNLOCK(); *repp = m_copym(rp->rc_reply, 0, M_COPYALL, - M_TRYWAIT); + M_WAIT); NFSD_LOCK(); ret = RC_REPLY; } else { @@ -348,7 +348,7 @@ loop: } else { NFSD_UNLOCK(); rp->rc_reply = m_copym(repmbuf, - 0, M_COPYALL, M_TRYWAIT); + 0, M_COPYALL, M_WAIT); NFSD_LOCK(); rp->rc_flag |= RC_REPMBUF; } |
