diff options
author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/nfsclient | |
parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
download | FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Diffstat (limited to 'sys/nfsclient')
-rw-r--r-- | sys/nfsclient/bootp_subr.c | 6 | ||||
-rw-r--r-- | sys/nfsclient/krpc_subr.c | 10 | ||||
-rw-r--r-- | sys/nfsclient/nfs_lock.c | 2 | ||||
-rw-r--r-- | sys/nfsclient/nfs_node.c | 4 | ||||
-rw-r--r-- | sys/nfsclient/nfs_socket.c | 14 | ||||
-rw-r--r-- | sys/nfsclient/nfs_subs.c | 22 | ||||
-rw-r--r-- | sys/nfsclient/nfs_vfsops.c | 2 | ||||
-rw-r--r-- | sys/nfsclient/nfs_vnops.c | 6 |
8 files changed, 33 insertions, 33 deletions
diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c index bfa419e..8bd86b2 100644 --- a/sys/nfsclient/bootp_subr.c +++ b/sys/nfsclient/bootp_subr.c @@ -433,7 +433,7 @@ allocifctx(struct bootpc_globalcontext *gctx) { struct bootpc_ifcontext *ifctx; ifctx = (struct bootpc_ifcontext *) malloc(sizeof(*ifctx), - M_TEMP, M_WAITOK); + M_TEMP, 0); if (ifctx == NULL) panic("Failed to allocate bootp interface context structure"); @@ -1675,7 +1675,7 @@ bootpc_init(void) if (nfs_diskless_valid != 0) return; - gctx = malloc(sizeof(*gctx), M_TEMP, M_WAITOK); + gctx = malloc(sizeof(*gctx), M_TEMP, 0); if (gctx == NULL) panic("Failed to allocate bootp global context structure"); @@ -1942,7 +1942,7 @@ md_lookup_swap(struct sockaddr_in *mdsin, char *path, u_char *fhp, int *fhsizep, u_int32_t v3[21]; } fattribs; - m = m_get(M_TRYWAIT, MT_DATA); + m = m_get(0, MT_DATA); if (m == NULL) return ENOBUFS; diff --git a/sys/nfsclient/krpc_subr.c b/sys/nfsclient/krpc_subr.c index 4690104..e470aeb 100644 --- a/sys/nfsclient/krpc_subr.c +++ b/sys/nfsclient/krpc_subr.c @@ -149,7 +149,7 @@ krpc_portmap(struct sockaddr_in *sin, u_int prog, u_int vers, u_int16_t *portp, return 0; } - m = m_get(M_TRYWAIT, MT_DATA); + m = m_get(0, MT_DATA); if (m == NULL) return ENOBUFS; sdata = mtod(m, struct sdata *); @@ -271,7 +271,7 @@ krpc_call(struct sockaddr_in *sa, u_int prog, u_int vers, u_int func, /* * Prepend RPC message header. */ - mhead = m_gethdr(M_TRYWAIT, MT_DATA); + mhead = m_gethdr(0, MT_DATA); mhead->m_next = *data; call = mtod(mhead, struct rpc_call *); mhead->m_len = sizeof(*call); @@ -311,7 +311,7 @@ krpc_call(struct sockaddr_in *sa, u_int prog, u_int vers, u_int func, timo = 0; for (;;) { /* Send RPC request (or re-send). */ - m = m_copym(mhead, 0, M_COPYALL, M_TRYWAIT); + m = m_copym(mhead, 0, M_COPYALL, 0); if (m == NULL) { error = ENOBUFS; goto out; @@ -465,9 +465,9 @@ xdr_string_encode(char *str, int len) if (mlen > MCLBYTES) /* If too big, we just can't do it. */ return (NULL); - m = m_get(M_TRYWAIT, MT_DATA); + m = m_get(0, MT_DATA); if (mlen > MLEN) { - MCLGET(m, M_TRYWAIT); + MCLGET(m, 0); if ((m->m_flags & M_EXT) == 0) { (void) m_free(m); /* There can be only one. */ return (NULL); diff --git a/sys/nfsclient/nfs_lock.c b/sys/nfsclient/nfs_lock.c index 67f049a..1e098db 100644 --- a/sys/nfsclient/nfs_lock.c +++ b/sys/nfsclient/nfs_lock.c @@ -114,7 +114,7 @@ nfs_dolock(struct vop_advlock_args *ap) */ if (p->p_nlminfo == NULL) { MALLOC(p->p_nlminfo, struct nlminfo *, - sizeof(struct nlminfo), M_LOCKF, M_WAITOK | M_ZERO); + sizeof(struct nlminfo), M_LOCKF, M_ZERO); p->p_nlminfo->pid_start = p->p_stats->p_start; } msg.lm_msg_ident.pid_start = p->p_nlminfo->pid_start; diff --git a/sys/nfsclient/nfs_node.c b/sys/nfsclient/nfs_node.c index 30f4aff..b5ee0bd 100644 --- a/sys/nfsclient/nfs_node.c +++ b/sys/nfsclient/nfs_node.c @@ -224,7 +224,7 @@ loop: * might cause a bogus v_data pointer to get dereferenced * elsewhere if zalloc should block. */ - np = uma_zalloc(nfsnode_zone, M_WAITOK); + np = uma_zalloc(nfsnode_zone, 0); error = getnewvnode("nfs", mntp, nfsv2_vnodeop_p, &nvp); if (error) { @@ -255,7 +255,7 @@ loop: } LIST_INSERT_HEAD(nhpp, np, n_hash); if (fhsize > NFS_SMALLFH) { - MALLOC(np->n_fhp, nfsfh_t *, fhsize, M_NFSBIGFH, M_WAITOK); + MALLOC(np->n_fhp, nfsfh_t *, fhsize, M_NFSBIGFH, 0); } else np->n_fhp = &np->n_fh; bcopy((caddr_t)fhp, (caddr_t)np->n_fhp, fhsize); diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c index 15cf946..cdf7cf1 100644 --- a/sys/nfsclient/nfs_socket.c +++ b/sys/nfsclient/nfs_socket.c @@ -525,7 +525,7 @@ tryagain: goto tryagain; } while (rep->r_flags & R_MUSTRESEND) { - m = m_copym(rep->r_mreq, 0, M_COPYALL, M_TRYWAIT); + m = m_copym(rep->r_mreq, 0, M_COPYALL, 0); nfsstats.rpcretries++; error = nfs_send(so, rep->r_nmp->nm_nam, m, rep); if (error) { @@ -864,7 +864,7 @@ nfs_request(struct vnode *vp, struct mbuf *mrest, int procnum, return (ESTALE); } nmp = VFSTONFS(vp->v_mount); - MALLOC(rep, struct nfsreq *, sizeof(struct nfsreq), M_NFSREQ, M_WAITOK); + MALLOC(rep, struct nfsreq *, sizeof(struct nfsreq), M_NFSREQ, 0); rep->r_nmp = nmp; rep->r_vp = vp; rep->r_td = td; @@ -887,7 +887,7 @@ nfs_request(struct vnode *vp, struct mbuf *mrest, int procnum, * For stream protocols, insert a Sun RPC Record Mark. */ if (nmp->nm_sotype == SOCK_STREAM) { - M_PREPEND(m, NFSX_UNSIGNED, M_TRYWAIT); + M_PREPEND(m, NFSX_UNSIGNED, 0); *mtod(m, u_int32_t *) = htonl(0x80000000 | (m->m_pkthdr.len - NFSX_UNSIGNED)); } @@ -928,7 +928,7 @@ tryagain: if (nmp->nm_soflags & PR_CONNREQUIRED) error = nfs_sndlock(rep); if (!error) { - m2 = m_copym(m, 0, M_COPYALL, M_TRYWAIT); + m2 = m_copym(m, 0, M_COPYALL, 0); error = nfs_send(nmp->nm_so, nmp->nm_nam, m2, rep); if (nmp->nm_soflags & PR_CONNREQUIRED) nfs_sndunlock(rep); @@ -1130,7 +1130,7 @@ nfs_timer(void *arg) ((nmp->nm_flag & NFSMNT_DUMBTIMR) || (rep->r_flags & R_SENT) || nmp->nm_sent < nmp->nm_cwnd) && - (m = m_copym(rep->r_mreq, 0, M_COPYALL, M_DONTWAIT))){ + (m = m_copym(rep->r_mreq, 0, M_COPYALL, M_NOWAIT))){ if ((nmp->nm_flag & NFSMNT_NOCONN) == 0) error = (*so->so_proto->pr_usrreqs->pru_send) (so, 0, m, NULL, NULL, td); @@ -1377,9 +1377,9 @@ nfs_realign(struct mbuf **pm, int hsiz) ++nfs_realign_test; while ((m = *pm) != NULL) { if ((m->m_len & 0x3) || (mtod(m, intptr_t) & 0x3)) { - MGET(n, M_TRYWAIT, MT_DATA); + MGET(n, 0, MT_DATA); if (m->m_len >= MINCLSIZE) { - MCLGET(n, M_TRYWAIT); + MCLGET(n, 0); } n->m_len = 0; break; diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c index 2318a04..178cbbb 100644 --- a/sys/nfsclient/nfs_subs.c +++ b/sys/nfsclient/nfs_subs.c @@ -142,9 +142,9 @@ nfsm_reqhead(struct vnode *vp, u_long procid, int hsiz) { struct mbuf *mb; - MGET(mb, M_TRYWAIT, MT_DATA); + MGET(mb, 0, MT_DATA); if (hsiz >= MINCLSIZE) - MCLGET(mb, M_TRYWAIT); + MCLGET(mb, 0); mb->m_len = 0; return (mb); } @@ -168,9 +168,9 @@ nfsm_rpchead(struct ucred *cr, int nmflag, int procid, int auth_type, int grpsiz, authsiz; authsiz = nfsm_rndup(auth_len); - MGETHDR(mb, M_TRYWAIT, MT_DATA); + MGETHDR(mb, 0, MT_DATA); if ((authsiz + 10 * NFSX_UNSIGNED) >= MINCLSIZE) { - MCLGET(mb, M_TRYWAIT); + MCLGET(mb, 0); } else if ((authsiz + 10 * NFSX_UNSIGNED) < MHLEN) { MH_ALIGN(mb, authsiz + 10 * NFSX_UNSIGNED); } else { @@ -271,9 +271,9 @@ nfsm_uiotombuf(struct uio *uiop, struct mbuf **mq, int siz, caddr_t *bpos) while (left > 0) { mlen = M_TRAILINGSPACE(mp); if (mlen == 0) { - MGET(mp, M_TRYWAIT, MT_DATA); + MGET(mp, 0, MT_DATA); if (clflg) - MCLGET(mp, M_TRYWAIT); + MCLGET(mp, 0); mp->m_len = 0; mp2->m_next = mp; mp2 = mp; @@ -304,7 +304,7 @@ nfsm_uiotombuf(struct uio *uiop, struct mbuf **mq, int siz, caddr_t *bpos) } if (rem > 0) { if (rem > M_TRAILINGSPACE(mp)) { - MGET(mp, M_TRYWAIT, MT_DATA); + MGET(mp, 0, MT_DATA); mp->m_len = 0; mp2->m_next = mp; } @@ -349,9 +349,9 @@ nfsm_strtmbuf(struct mbuf **mb, char **bpos, const char *cp, long siz) } /* Loop around adding mbufs */ while (siz > 0) { - MGET(m1, M_TRYWAIT, MT_DATA); + MGET(m1, 0, MT_DATA); if (siz > MLEN) - MCLGET(m1, M_TRYWAIT); + MCLGET(m1, 0); m1->m_len = NFSMSIZ(m1); m2->m_next = m1; m2 = m1; @@ -716,7 +716,7 @@ nfs_getcookie(struct nfsnode *np, off_t off, int add) if (!dp) { if (add) { MALLOC(dp, struct nfsdmap *, sizeof (struct nfsdmap), - M_NFSDIROFF, M_WAITOK); + M_NFSDIROFF, 0); dp->ndm_eocookie = 0; LIST_INSERT_HEAD(&np->n_cookies, dp, ndm_list); } else @@ -731,7 +731,7 @@ nfs_getcookie(struct nfsnode *np, off_t off, int add) dp = LIST_NEXT(dp, ndm_list); } else if (add) { MALLOC(dp2, struct nfsdmap *, sizeof (struct nfsdmap), - M_NFSDIROFF, M_WAITOK); + M_NFSDIROFF, 0); dp2->ndm_eocookie = 0; LIST_INSERT_AFTER(dp, dp2, ndm_list); dp = dp2; diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index 51f6330..037dfc6 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -808,7 +808,7 @@ mountnfs(struct nfs_args *argp, struct mount *mp, struct sockaddr *nam, FREE(nam, M_SONAME); return (0); } else { - nmp = uma_zalloc(nfsmount_zone, M_WAITOK); + nmp = uma_zalloc(nfsmount_zone, 0); bzero((caddr_t)nmp, sizeof (struct nfsmount)); TAILQ_INIT(&nmp->nm_bufq); mp->mnt_data = (qaddr_t)nmp; diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index 919f2a3..f47d9da 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -404,7 +404,7 @@ nfs_access(struct vop_access_args *ap) error = nfs_readrpc(vp, &auio, ap->a_cred); else if (vp->v_type == VDIR) { char* bp; - bp = malloc(NFS_DIRBLKSIZ, M_TEMP, M_WAITOK); + bp = malloc(NFS_DIRBLKSIZ, M_TEMP, 0); aiov.iov_base = bp; aiov.iov_len = auio.uio_resid = NFS_DIRBLKSIZ; error = nfs_readdirrpc(vp, &auio, ap->a_cred); @@ -2370,7 +2370,7 @@ nfs_sillyrename(struct vnode *dvp, struct vnode *vp, struct componentname *cnp) panic("nfs: sillyrename dir"); #endif MALLOC(sp, struct sillyrename *, sizeof (struct sillyrename), - M_NFSREQ, M_WAITOK); + M_NFSREQ, 0); sp->s_cred = crhold(cnp->cn_cred); sp->s_dvp = dvp; VREF(dvp); @@ -2438,7 +2438,7 @@ nfs_lookitup(struct vnode *dvp, const char *name, int len, struct ucred *cred, free((caddr_t)np->n_fhp, M_NFSBIGFH); np->n_fhp = &np->n_fh; } else if (np->n_fhsize <= NFS_SMALLFH && fhlen>NFS_SMALLFH) - np->n_fhp =(nfsfh_t *)malloc(fhlen, M_NFSBIGFH, M_WAITOK); + np->n_fhp =(nfsfh_t *)malloc(fhlen, M_NFSBIGFH, 0); bcopy((caddr_t)nfhp, (caddr_t)np->n_fhp, fhlen); np->n_fhsize = fhlen; newvp = NFSTOV(np); |