aboutsummaryrefslogtreecommitdiff
path: root/sys/netsmb
diff options
context:
space:
mode:
authorGleb Smirnoff <glebius@FreeBSD.org>2012-12-05 08:04:20 +0000
committerGleb Smirnoff <glebius@FreeBSD.org>2012-12-05 08:04:20 +0000
commiteb1b1807afd1266445720b768b1bdbcdf7655a0a (patch)
treebf083a0829f8044362fc83354c8e8b60d1f7932a /sys/netsmb
parent6dbda21756f4e6634972b1a9405c49fe0605de6d (diff)
downloadsrc-eb1b1807afd1266445720b768b1bdbcdf7655a0a.tar.gz
src-eb1b1807afd1266445720b768b1bdbcdf7655a0a.zip
Mechanically substitute flags from historic mbuf allocator with
malloc(9) flags within sys. Exceptions: - sys/contrib not touched - sys/mbuf.h edited manually
Notes
Notes: svn path=/head/; revision=243882
Diffstat (limited to 'sys/netsmb')
-rw-r--r--sys/netsmb/smb_iod.c2
-rw-r--r--sys/netsmb/smb_rq.c2
-rw-r--r--sys/netsmb/smb_trantcp.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/netsmb/smb_iod.c b/sys/netsmb/smb_iod.c
index 78def4739f1f..e4c805a33698 100644
--- a/sys/netsmb/smb_iod.c
+++ b/sys/netsmb/smb_iod.c
@@ -255,7 +255,7 @@ 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_WAIT);
+ m = m_copym(rqp->sr_rq.mb_top, 0, M_COPYALL, M_WAITOK);
error = rqp->sr_lerror = SMB_TRAN_SEND(vcp, m, td);
if (error == 0) {
getnanotime(&rqp->sr_timesent);
diff --git a/sys/netsmb/smb_rq.c b/sys/netsmb/smb_rq.c
index 566a25211558..957102901cf4 100644
--- a/sys/netsmb/smb_rq.c
+++ b/sys/netsmb/smb_rq.c
@@ -427,7 +427,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_WAIT);
+ m0 = m_split(mtop, offset, M_WAITOK);
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 a7c7e05b351d..dd39ac5fed8c 100644
--- a/sys/netsmb/smb_trantcp.c
+++ b/sys/netsmb/smb_trantcp.c
@@ -580,7 +580,7 @@ smb_nbst_send(struct smb_vc *vcp, struct mbuf *m0, struct thread *td)
error = ENOTCONN;
goto abort;
}
- M_PREPEND(m0, 4, M_WAIT);
+ M_PREPEND(m0, 4, M_WAITOK);
nb_sethdr(m0, NB_SSN_MESSAGE, m_fixhdr(m0) - 4);
error = nb_sosend(nbp->nbp_tso, m0, 0, td);
return error;