diff options
author | Alfred Perlstein <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
---|---|---|
committer | Alfred Perlstein <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
commit | 44956c9863dc03344b03bdf6a83acf4e743f8e50 (patch) | |
tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/nfsserver/nfs_srvcache.c | |
parent | 1326e03f7f8018164ece91fc0a3f15f9c65ff64a (diff) | |
download | src-44956c9863dc03344b03bdf6a83acf4e743f8e50.tar.gz src-44956c9863dc03344b03bdf6a83acf4e743f8e50.zip |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Notes
Notes:
svn path=/head/; revision=109623
Diffstat (limited to 'sys/nfsserver/nfs_srvcache.c')
-rw-r--r-- | sys/nfsserver/nfs_srvcache.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/nfsserver/nfs_srvcache.c b/sys/nfsserver/nfs_srvcache.c index 1986c0b62857..a9e84e921167 100644 --- a/sys/nfsserver/nfs_srvcache.c +++ b/sys/nfsserver/nfs_srvcache.c @@ -193,7 +193,7 @@ loop: } else if (rp->rc_flag & RC_REPMBUF) { nfsrvstats.srvcache_nonidemdonehits++; *repp = m_copym(rp->rc_reply, 0, M_COPYALL, - M_TRYWAIT); + 0); ret = RC_REPLY; } else { nfsrvstats.srvcache_idemdonehits++; @@ -212,7 +212,7 @@ loop: NFS_DPF(RC, ("M%03x", nd->nd_retxid & 0xfff)); if (numnfsrvcache < desirednfsrvcache) { rp = (struct nfsrvcache *)malloc((u_long)sizeof *rp, - M_NFSD, M_WAITOK | M_ZERO); + M_NFSD, M_ZERO); numnfsrvcache++; rp->rc_flag = RC_LOCKED; } else { @@ -303,7 +303,7 @@ loop: rp->rc_flag |= RC_REPSTATUS; } else { rp->rc_reply = m_copym(repmbuf, - 0, M_COPYALL, M_TRYWAIT); + 0, M_COPYALL, 0); rp->rc_flag |= RC_REPMBUF; } } |