From dcdaa35dc670769cb6106cbfd637c36bbb1422f3 Mon Sep 17 00:00:00 2001 From: jhb Date: Tue, 1 Aug 2006 15:32:25 +0000 Subject: Use TAILQ_FOREACH_SAFE() in a couple of places. --- sys/nfsserver/nfs_srvcache.c | 3 +-- sys/nfsserver/nfs_syscalls.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/nfsserver/nfs_srvcache.c b/sys/nfsserver/nfs_srvcache.c index a116414..272534f 100644 --- a/sys/nfsserver/nfs_srvcache.c +++ b/sys/nfsserver/nfs_srvcache.c @@ -360,8 +360,7 @@ nfsrv_cleancache(void) NFSD_LOCK_ASSERT(); - for (rp = TAILQ_FIRST(&nfsrvlruhead); rp != 0; rp = nextrp) { - nextrp = TAILQ_NEXT(rp, rc_lru); + TAILQ_FOREACH_SAFE(rp, &nfsrvlruhead, rc_lru, nextrp) { LIST_REMOVE(rp, rc_hash); TAILQ_REMOVE(&nfsrvlruhead, rp, rc_lru); if (rp->rc_flag & RC_REPMBUF) diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c index 87fe38f..5b261f1 100644 --- a/sys/nfsserver/nfs_syscalls.c +++ b/sys/nfsserver/nfs_syscalls.c @@ -720,9 +720,7 @@ nfsrv_init(int terminating) panic("nfsd init"); nfssvc_sockhead_flag |= SLP_INIT; if (terminating) { - for (slp = TAILQ_FIRST(&nfssvc_sockhead); slp != NULL; - slp = nslp) { - nslp = TAILQ_NEXT(slp, ns_chain); + TAILQ_FOREACH_SAFE(slp, &nfssvc_sockhead, ns_chain, nslp) { if (slp->ns_flag & SLP_VALID) nfsrv_zapsock(slp); TAILQ_REMOVE(&nfssvc_sockhead, slp, ns_chain); -- cgit v1.1