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/dev/iscsi | |
| 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/dev/iscsi')
| -rw-r--r-- | sys/dev/iscsi/initiator/isc_soc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/iscsi/initiator/isc_soc.c b/sys/dev/iscsi/initiator/isc_soc.c index 0826ff65040e..bbe891e7765c 100644 --- a/sys/dev/iscsi/initiator/isc_soc.c +++ b/sys/dev/iscsi/initiator/isc_soc.c @@ -100,7 +100,7 @@ isc_sendPDU(isc_session_t *sp, pduq_t *pq) iv++; #else /* USE_MBUF */ /* mbuf for the iSCSI header */ - MGETHDR(mh, M_TRYWAIT, MT_DATA); + MGETHDR(mh, M_WAIT, MT_DATA); mh->m_len = mh->m_pkthdr.len = sizeof(union ipdu_u); mh->m_pkthdr.rcvif = NULL; MH_ALIGN(mh, sizeof(union ipdu_u)); @@ -160,7 +160,7 @@ isc_sendPDU(isc_session_t *sp, pduq_t *pq) while (len > 0) { int l; - MGET(md, M_TRYWAIT, MT_DATA); + MGET(md, M_WAIT, MT_DATA); md->m_ext.ref_cnt = &nil_refcnt; l = min(MCLBYTES, len); MEXTADD(md, pp->ds + off, l, nil_fn, @@ -187,7 +187,7 @@ isc_sendPDU(isc_session_t *sp, pduq_t *pq) iv->iov_len = sizeof(int); iv++; #else /* USE_MBUF */ - MGET(me, M_TRYWAIT, MT_DATA); + MGET(me, M_WAIT, MT_DATA); me->m_len = sizeof(int); MH_ALIGN(mh, sizeof(int)); bcopy(&pp->ds_dig, me->m_data, sizeof(int)); |