diff options
author | peter <peter@FreeBSD.org> | 2001-09-28 04:37:08 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2001-09-28 04:37:08 +0000 |
commit | 562ebdfbed6da83efa5110cabff6bbb6c685cfea (patch) | |
tree | 70885e3ccbc8ca40ca489f691745bc22fb96720d /sys/nfsserver/nfs_srvcache.c | |
parent | d1e3264e13fc0aa3ac602b4919d9a89d613bc315 (diff) | |
download | FreeBSD-src-562ebdfbed6da83efa5110cabff6bbb6c685cfea.zip FreeBSD-src-562ebdfbed6da83efa5110cabff6bbb6c685cfea.tar.gz |
Unwind some more macros. NFSMADV() was kinda silly since it was right
next to equivalent m_len adjustments. Move the nfsm_subs.h macros
into groups depending on which phase they are used in, since that
affects the error recovery requirements. Collect some of the common error
checking into a single macro as preparation for unwinding some more.
Have nfs_rephead return a value instead of secretly modifying args.
Remove some unused function arguments that were being passed around.
Clarify nfsm_reply()'s error handling (I hope).
Diffstat (limited to 'sys/nfsserver/nfs_srvcache.c')
-rw-r--r-- | sys/nfsserver/nfs_srvcache.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/nfsserver/nfs_srvcache.c b/sys/nfsserver/nfs_srvcache.c index 4bab5d0..2222ffa 100644 --- a/sys/nfsserver/nfs_srvcache.c +++ b/sys/nfsserver/nfs_srvcache.c @@ -150,8 +150,7 @@ nfsrv_initcache(void) * Update/add new request at end of lru list */ int -nfsrv_getcache(struct nfsrv_descript *nd, struct nfssvc_sock *slp, - struct mbuf **repp) +nfsrv_getcache(struct nfsrv_descript *nd, struct mbuf **repp) { struct nfsrvcache *rp; struct mbuf *mb; @@ -188,8 +187,8 @@ loop: ret = RC_DROPIT; } else if (rp->rc_flag & RC_REPSTATUS) { nfsrvstats.srvcache_nonidemdonehits++; - nfs_rephead(0, nd, slp, rp->rc_status, - repp, &mb, &bpos); + *repp = nfs_rephead(0, nd, rp->rc_status, + &mb, &bpos); ret = RC_REPLY; } else if (rp->rc_flag & RC_REPMBUF) { nfsrvstats.srvcache_nonidemdonehits++; |