diff options
Diffstat (limited to 'sys/nfsserver')
-rw-r--r-- | sys/nfsserver/nfs_fha.c | 2 | ||||
-rw-r--r-- | sys/nfsserver/nfs_serv.c | 8 | ||||
-rw-r--r-- | sys/nfsserver/nfs_srvkrpc.c | 6 | ||||
-rw-r--r-- | sys/nfsserver/nfs_srvsubs.c | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/sys/nfsserver/nfs_fha.c b/sys/nfsserver/nfs_fha.c index 76537d7..2dd20c1 100644 --- a/sys/nfsserver/nfs_fha.c +++ b/sys/nfsserver/nfs_fha.c @@ -202,7 +202,7 @@ fha_extract_info(struct svc_req *req, struct fha_info *i) procnum == NFSPROC_NULL) goto out; - error = nfs_realign(&req->rq_args, M_DONTWAIT); + error = nfs_realign(&req->rq_args, M_NOWAIT); if (error) goto out; md = req->rq_args; diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c index f0da468..bef72af 100644 --- a/sys/nfsserver/nfs_serv.c +++ b/sys/nfsserver/nfs_serv.c @@ -693,8 +693,8 @@ nfsrv_readlink(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, len = 0; i = 0; while (len < NFS_MAXPATHLEN) { - MGET(nmp, M_WAIT, MT_DATA); - MCLGET(nmp, M_WAIT); + MGET(nmp, M_WAITOK, MT_DATA); + MCLGET(nmp, M_WAITOK); nmp->m_len = NFSMSIZ(nmp); if (len == 0) mp3 = mp = nmp; @@ -878,8 +878,8 @@ nfsrv_read(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, i++; } if (left > 0) { - MGET(m, M_WAIT, MT_DATA); - MCLGET(m, M_WAIT); + MGET(m, M_WAITOK, MT_DATA); + MCLGET(m, M_WAITOK); m->m_len = 0; m2->m_next = m; m2 = m; diff --git a/sys/nfsserver/nfs_srvkrpc.c b/sys/nfsserver/nfs_srvkrpc.c index 2581092..64f2aaa 100644 --- a/sys/nfsserver/nfs_srvkrpc.c +++ b/sys/nfsserver/nfs_srvkrpc.c @@ -217,14 +217,14 @@ nfs_rephead(int siz, struct nfsrv_descript *nd, int err, if (err && (nd->nd_flag & ND_NFSV3) == 0) /* XXX recheck */ siz = 0; - MGET(mreq, M_WAIT, MT_DATA); + MGET(mreq, M_WAITOK, MT_DATA); /* * If this is a big reply, use a cluster */ mreq->m_len = 0; if (siz >= MINCLSIZE) { - MCLGET(mreq, M_WAIT); + MCLGET(mreq, M_WAITOK); } mb = mreq; bpos = mtod(mb, caddr_t); @@ -278,7 +278,7 @@ nfssvc_program(struct svc_req *rqst, SVCXPRT *xprt) mreq = mrep = NULL; mreq = rqst->rq_args; rqst->rq_args = NULL; - (void)nfs_realign(&mreq, M_WAIT); + (void)nfs_realign(&mreq, M_WAITOK); /* * Note: we want rq_addr, not svc_getrpccaller for nd_nam2 - diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c index ba3a9fe..eedac6c 100644 --- a/sys/nfsserver/nfs_srvsubs.c +++ b/sys/nfsserver/nfs_srvsubs.c @@ -1301,8 +1301,8 @@ nfsm_clget_xx(u_int32_t **tl, struct mbuf *mb, struct mbuf **mp, if (*bp >= *be) { if (*mp == mb) (*mp)->m_len += *bp - bpos; - MGET(nmp, M_WAIT, MT_DATA); - MCLGET(nmp, M_WAIT); + MGET(nmp, M_WAITOK, MT_DATA); + MCLGET(nmp, M_WAITOK); nmp->m_len = NFSMSIZ(nmp); (*mp)->m_next = nmp; *mp = nmp; |