summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorblambert <blambert@openbsd.org>2008-06-14 01:21:17 +0000
committerblambert <blambert@openbsd.org>2008-06-14 01:21:17 +0000
commitb2342f5fe97715033eedfb31b60712ac4fb668c0 (patch)
tree26604112179fedab300aa611083fbde43ed49980
parentMove bpf_mtap_hdr() above the trunk_*_input() routines. (diff)
downloadwireguard-openbsd-b2342f5fe97715033eedfb31b60712ac4fb668c0.tar.xz
wireguard-openbsd-b2342f5fe97715033eedfb31b60712ac4fb668c0.zip
Clean up nfsrv_wakenfsd(); variable name change to be in line with the
rest of NFS code, canonical for() -> LIST_FOREACH() change, minor readability changes. ANSIfy function while here. ok thib@
-rw-r--r--sys/nfs/nfs_socket.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index db24ae45f8c..246bc65ef97 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_socket.c,v 1.62 2008/06/13 03:54:26 blambert Exp $ */
+/* $OpenBSD: nfs_socket.c,v 1.63 2008/06/14 01:21:17 blambert Exp $ */
/* $NetBSD: nfs_socket.c,v 1.27 1996/04/15 20:20:00 thorpej Exp $ */
/*
@@ -1913,25 +1913,25 @@ nfsrv_dorec(slp, nfsd, ndp)
* running nfsds will go look for the work in the nfssvc_sock list.
*/
void
-nfsrv_wakenfsd(slp)
- struct nfssvc_sock *slp;
+nfsrv_wakenfsd(struct nfssvc_sock *slp)
{
- struct nfsd *nd;
+ struct nfsd *nfsd;
if ((slp->ns_flag & SLP_VALID) == 0)
return;
- for (nd = TAILQ_FIRST(&nfsd_head); nd != NULL;
- nd = TAILQ_NEXT(nd, nfsd_chain)) {
- if (nd->nfsd_flag & NFSD_WAITING) {
- nd->nfsd_flag &= ~NFSD_WAITING;
- if (nd->nfsd_slp)
+
+ TAILQ_FOREACH(nfsd, &nfsd_head, nfsd_chain) {
+ if (nfsd->nfsd_flag & NFSD_WAITING) {
+ nfsd->nfsd_flag &= ~NFSD_WAITING;
+ if (nfsd->nfsd_slp)
panic("nfsd wakeup");
slp->ns_sref++;
- nd->nfsd_slp = slp;
- wakeup((caddr_t)nd);
+ nfsd->nfsd_slp = slp;
+ wakeup(nfsd);
return;
}
}
+
slp->ns_flag |= SLP_DOREC;
nfsd_head_flag |= NFSD_CHECKSLP;
}