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/nfsclient/nfs_socket.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/nfsclient/nfs_socket.c')
| -rw-r--r-- | sys/nfsclient/nfs_socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c index 3975577..140edb4 100644 --- a/sys/nfsclient/nfs_socket.c +++ b/sys/nfsclient/nfs_socket.c @@ -1169,7 +1169,7 @@ nfs_request(struct vnode *vp, struct mbuf *mrest, int procnum, * For stream protocols, insert a Sun RPC Record Mark. */ if (nmp->nm_sotype == SOCK_STREAM) { - M_PREPEND(m, NFSX_UNSIGNED, M_TRYWAIT); + M_PREPEND(m, NFSX_UNSIGNED, M_WAIT); *mtod(m, u_int32_t *) = htonl(0x80000000 | (m->m_pkthdr.len - NFSX_UNSIGNED)); } @@ -1213,7 +1213,7 @@ tryagain: if (nmp->nm_sotype == SOCK_STREAM) nmp->nm_nfstcpstate.sock_send_inprog++; mtx_unlock(&nmp->nm_mtx); - m2 = m_copym(m, 0, M_COPYALL, M_TRYWAIT); + m2 = m_copym(m, 0, M_COPYALL, M_WAIT); error = nfs_send(nmp->nm_so, nmp->nm_nam, m2, rep); mtx_lock(&nmp->nm_mtx); mtx_lock(&rep->r_mtx); |
