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/netsmb/smb_iod.c | 4 ++-- sys/netsmb/smb_rq.c | 4 +--- sys/netsmb/smb_trantcp.c | 4 +--- 3 files changed, 4 insertions(+), 8 deletions(-) (limited to 'sys/netsmb') diff --git a/sys/netsmb/smb_iod.c b/sys/netsmb/smb_iod.c index e265f43..860ff4b 100644 --- a/sys/netsmb/smb_iod.c +++ b/sys/netsmb/smb_iod.c @@ -261,8 +261,8 @@ smb_iod_sendrq(struct smbiod *iod, struct smb_rq *rqp) } SMBSDEBUG("M:%04x, P:%04x, U:%04x, T:%04x\n", rqp->sr_mid, 0, 0, 0); m_dumpm(rqp->sr_rq.mb_top); - m = m_copym(rqp->sr_rq.mb_top, 0, M_COPYALL, M_TRYWAIT); - error = rqp->sr_lerror = m ? SMB_TRAN_SEND(vcp, m, td) : ENOBUFS; + m = m_copym(rqp->sr_rq.mb_top, 0, M_COPYALL, M_WAIT); + error = rqp->sr_lerror = SMB_TRAN_SEND(vcp, m, td); if (error == 0) { getnanotime(&rqp->sr_timesent); iod->iod_lastrqsent = rqp->sr_timesent; diff --git a/sys/netsmb/smb_rq.c b/sys/netsmb/smb_rq.c index fb7e5d5..5d2557c 100644 --- a/sys/netsmb/smb_rq.c +++ b/sys/netsmb/smb_rq.c @@ -433,9 +433,7 @@ smb_t2_placedata(struct mbuf *mtop, u_int16_t offset, u_int16_t count, struct mbuf *m, *m0; int len; - m0 = m_split(mtop, offset, M_TRYWAIT); - if (m0 == NULL) - return EBADRPC; + m0 = m_split(mtop, offset, M_WAIT); len = m_length(m0, &m); m->m_len -= len - count; if (mdp->md_top == NULL) { diff --git a/sys/netsmb/smb_trantcp.c b/sys/netsmb/smb_trantcp.c index 5e34943..88fd556 100644 --- a/sys/netsmb/smb_trantcp.c +++ b/sys/netsmb/smb_trantcp.c @@ -572,9 +572,7 @@ smb_nbst_send(struct smb_vc *vcp, struct mbuf *m0, struct thread *td) error = ENOTCONN; goto abort; } - M_PREPEND(m0, 4, M_TRYWAIT); - if (m0 == NULL) - return ENOBUFS; + M_PREPEND(m0, 4, M_WAIT); nb_sethdr(m0, NB_SSN_MESSAGE, m_fixhdr(m0) - 4); error = nb_sosend(nbp->nbp_tso, m0, 0, td); return error; -- cgit v1.1