From 3b1bf8c2e9222b7d27e8b9084e637a84005de7ba Mon Sep 17 00:00:00 2001 From: ru Date: Tue, 25 Mar 2008 09:39:02 +0000 Subject: 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. --- sys/nfs/nfs_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/nfs') diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c index 54c3f41..4c0a2c9 100644 --- a/sys/nfs/nfs_common.c +++ b/sys/nfs/nfs_common.c @@ -263,7 +263,7 @@ nfsm_build_xx(int s, struct mbuf **mb, caddr_t *bpos) void *ret; if (s > M_TRAILINGSPACE(*mb)) { - MGET(mb2, M_TRYWAIT, MT_DATA); + MGET(mb2, M_WAIT, MT_DATA); if (s > MLEN) panic("build > MLEN"); (*mb)->m_next = mb2; @@ -280,7 +280,7 @@ nfsm_build_xx(int s, struct mbuf **mb, caddr_t *bpos) void * nfsm_dissect_xx(int s, struct mbuf **md, caddr_t *dpos) { - return nfsm_dissect_xx_sub(s, md, dpos, M_TRYWAIT); + return nfsm_dissect_xx_sub(s, md, dpos, M_WAIT); } void * -- cgit v1.1