diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2008-03-25 09:39:02 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2008-03-25 09:39:02 +0000 |
| commit | ea26d587291046c59102b34124187e7f602ee07d (patch) | |
| tree | cf0376c9359f2d1ca6e4e8e4ad4a4f722dba61a7 /sys/nfs | |
| parent | b2798e25738fc58f40da5f2fe18186b8efc3c2c6 (diff) | |
| download | src-ea26d587291046c59102b34124187e7f602ee07d.tar.gz src-ea26d587291046c59102b34124187e7f602ee07d.zip | |
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.
Notes
Notes:
svn path=/head/; revision=177599
Diffstat (limited to 'sys/nfs')
| -rw-r--r-- | sys/nfs/nfs_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c index 54c3f418f9ff..4c0a2c994c9b 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 * |