Module Name: src
Committed By: christos
Date: Wed Nov 27 17:24:44 UTC 2013
Modified Files:
src/sys/arch/amiga/amiga: cc.c
src/sys/arch/atari/atari: stalloc.c
src/sys/arch/hpc/hpc: config_hook.c
src/sys/coda: coda_vfsops.c
src/sys/compat/common: vfs_syscalls_20.c
src/sys/compat/netbsd32: netbsd32_compat_20.c
src/sys/compat/osf1: osf1_mount.c
src/sys/compat/ultrix: ultrix_fs.c
src/sys/fs/nfs/server: nfs_nfsdcache.c nfs_nfsdstate.c
src/sys/kern: kern_verifiedexec.c vfs_subr.c vfs_syscalls.c
src/sys/miscfs/procfs: procfs_linux.c
src/sys/ufs/lfs: lfs_bio.c lfs_vfsops.c
Log Message:
Change the queue.3 *_END(&head) macros to NULL. Since we don't have CIRCLEQ
anymore, all the macros expand to NULL anyway, so this improves readability.
Requested by rmind@
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/amiga/amiga/cc.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/atari/atari/stalloc.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hpc/hpc/config_hook.c
cvs rdiff -u -r1.77 -r1.78 src/sys/coda/coda_vfsops.c
cvs rdiff -u -r1.36 -r1.37 src/sys/compat/common/vfs_syscalls_20.c
cvs rdiff -u -r1.30 -r1.31 src/sys/compat/netbsd32/netbsd32_compat_20.c
cvs rdiff -u -r1.49 -r1.50 src/sys/compat/osf1/osf1_mount.c
cvs rdiff -u -r1.53 -r1.54 src/sys/compat/ultrix/ultrix_fs.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/fs/nfs/server/nfs_nfsdcache.c \
src/sys/fs/nfs/server/nfs_nfsdstate.c
cvs rdiff -u -r1.130 -r1.131 src/sys/kern/kern_verifiedexec.c
cvs rdiff -u -r1.440 -r1.441 src/sys/kern/vfs_subr.c
cvs rdiff -u -r1.470 -r1.471 src/sys/kern/vfs_syscalls.c
cvs rdiff -u -r1.65 -r1.66 src/sys/miscfs/procfs/procfs_linux.c
cvs rdiff -u -r1.127 -r1.128 src/sys/ufs/lfs/lfs_bio.c
cvs rdiff -u -r1.316 -r1.317 src/sys/ufs/lfs/lfs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/amiga/cc.c
diff -u src/sys/arch/amiga/amiga/cc.c:1.23 src/sys/arch/amiga/amiga/cc.c:1.24
--- src/sys/arch/amiga/amiga/cc.c:1.23 Sat Nov 23 17:48:00 2013
+++ src/sys/arch/amiga/amiga/cc.c Wed Nov 27 12:24:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cc.c,v 1.23 2013/11/23 22:48:00 christos Exp $ */
+/* $NetBSD: cc.c,v 1.24 2013/11/27 17:24:43 christos Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cc.c,v 1.23 2013/11/23 22:48:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cc.c,v 1.24 2013/11/27 17:24:43 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -90,22 +90,22 @@ add_vbl_function(struct vbl_node *add, s
struct vbl_node *n, *prev;
s = spl3();
- prev = LIST_END(&vbl_list);
+ prev = NULL;
LIST_FOREACH(n, &vbl_list, link) {
if (add->priority > n->priority) {
/* insert add_node before. */
- if (prev == LIST_END(&vbl_list)) {
+ if (prev == NULL) {
LIST_INSERT_HEAD(&vbl_list, add, link);
} else {
LIST_INSERT_AFTER(prev, add, link);
}
- add = LIST_END(&vbl_list);
+ add = NULL;
break;
}
prev = n;
}
- if (add != LIST_END(&vbl_list)) {
- if (prev == LIST_END(&vbl_list)) {
+ if (add != NULL) {
+ if (prev == NULL) {
LIST_INSERT_HEAD(&vbl_list, add, link);
} else {
LIST_INSERT_AFTER(prev, add, link);
@@ -136,7 +136,7 @@ vbl_handler(void)
n->flags |= VBLNF_OFF;
n->flags &= ~(VBLNF_TURNOFF);
} else {
- if (n != LIST_END(&vbl_list))
+ if (n != NULL)
n->function(n->data);
}
}
@@ -504,7 +504,7 @@ alloc_chipmem(u_long size)
if (size <= mn->size)
break;
- if (mn == TAILQ_END(&free_list))
+ if (mn == NULL)
return NULL;
if ((mn->size - size) <= sizeof (*mn)) {
@@ -513,7 +513,7 @@ alloc_chipmem(u_long size)
* for a new node in between.
*/
TAILQ_REMOVE(&free_list, mn, free_link);
- TAILQ_NEXT(mn, free_link) = TAILQ_END(&free_list);
+ TAILQ_NEXT(mn, free_link) = NULL;
size = mn->size; /* increase size. (or same) */
chip_total -= mn->size;
splx(s);
@@ -533,7 +533,7 @@ alloc_chipmem(u_long size)
* and mark as not on free list
*/
TAILQ_INSERT_AFTER(&chip_list, new, mn, link);
- TAILQ_NEXT(mn, free_link) = TAILQ_END(&free_list);
+ TAILQ_NEXT(mn, free_link) = NULL;
chip_total -= size + sizeof(struct mem_node);
splx(s);
@@ -557,8 +557,8 @@ free_chipmem(void *mem)
/*
* check ahead of us.
*/
- if (TAILQ_NEXT(next, link) != TAILQ_END(&chip_list) &&
- TAILQ_NEXT(next, free_link) != TAILQ_END(&free_list)) {
+ if (TAILQ_NEXT(next, link) != NULL &&
+ TAILQ_NEXT(next, free_link) != NULL) {
/*
* if next is: a valid node and a free node. ==> merge
*/
@@ -568,12 +568,12 @@ free_chipmem(void *mem)
chip_total += mn->size + sizeof(struct mem_node);
mn->size += next->size + sizeof(struct mem_node);
}
- if (TAILQ_PREV(prev, chiplist, link) != TAILQ_END(&chip_list) &&
- TAILQ_PREV(prev, freelist, free_link) != TAILQ_END(&free_list)) {
+ if (TAILQ_PREV(prev, chiplist, link) != NULL &&
+ TAILQ_PREV(prev, freelist, free_link) != NULL) {
/*
* if prev is: a valid node and a free node. ==> merge
*/
- if (TAILQ_NEXT(mn, free_link) == TAILQ_END(&free_list))
+ if (TAILQ_NEXT(mn, free_link) == NULL)
chip_total += mn->size + sizeof(struct mem_node);
else {
/* already on free list */
@@ -582,20 +582,18 @@ free_chipmem(void *mem)
}
TAILQ_REMOVE(&chip_list, mn, link);
prev->size += mn->size + sizeof(struct mem_node);
- } else if (TAILQ_NEXT(mn, free_link) == TAILQ_END(&free_list)) {
+ } else if (TAILQ_NEXT(mn, free_link) == NULL) {
/*
* we still are not on free list and we need to be.
* <-- | -->
*/
- while (TAILQ_NEXT(next, link) != TAILQ_END(&chip_list) &&
- TAILQ_PREV(prev, chiplist, link) != TAILQ_END(&chip_list)) {
- if (TAILQ_NEXT(next, free_link) !=
- TAILQ_END(&free_list)) {
+ while (TAILQ_NEXT(next, link) != NULL &&
+ TAILQ_PREV(prev, chiplist, link) != NULL) {
+ if (TAILQ_NEXT(next, free_link) != NULL) {
TAILQ_INSERT_BEFORE(next, mn, free_link);
break;
}
- if (TAILQ_NEXT(prev, free_link) !=
- TAILQ_END(&free_list)) {
+ if (TAILQ_NEXT(prev, free_link) != NULL) {
TAILQ_INSERT_AFTER(&free_list, prev, mn,
free_link);
break;
@@ -603,8 +601,8 @@ free_chipmem(void *mem)
prev = TAILQ_PREV(prev, chiplist, link);
next = TAILQ_NEXT(next, link);
}
- if (TAILQ_NEXT(mn, free_link) == TAILQ_END(&free_list)) {
- if (TAILQ_NEXT(next, link) == TAILQ_END(&chip_list)) {
+ if (TAILQ_NEXT(mn, free_link) == NULL) {
+ if (TAILQ_NEXT(next, link) == NULL) {
/*
* we are not on list so we can add
* ourselves to the tail. (we walked to it.)
Index: src/sys/arch/atari/atari/stalloc.c
diff -u src/sys/arch/atari/atari/stalloc.c:1.14 src/sys/arch/atari/atari/stalloc.c:1.15
--- src/sys/arch/atari/atari/stalloc.c:1.14 Sat Nov 23 17:52:40 2013
+++ src/sys/arch/atari/atari/stalloc.c Wed Nov 27 12:24:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: stalloc.c,v 1.14 2013/11/23 22:52:40 christos Exp $ */
+/* $NetBSD: stalloc.c,v 1.15 2013/11/27 17:24:43 christos Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman (Atari modifications)
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stalloc.c,v 1.14 2013/11/23 22:52:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stalloc.c,v 1.15 2013/11/27 17:24:43 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -93,18 +93,18 @@ alloc_stmem(u_long size, void **phys_add
/*
* walk list of available nodes, finding the best-fit.
*/
- bfit = TAILQ_END(&free_list);
+ bfit = NULL;
TAILQ_FOREACH(mn, &free_list, free_link) {
if (size <= mn->size) {
- if ((bfit != TAILQ_END(&free_list)) &&
+ if ((bfit != NULL) &&
(bfit->size < mn->size))
continue;
bfit = mn;
}
}
- if (bfit != TAILQ_END(&free_list))
+ if (bfit != NULL)
mn = bfit;
- if (mn == TAILQ_END(&free_list)) {
+ if (mn == NULL) {
printf("St-mem pool exhausted, binpatch 'st_pool_size'"
"to get more\n");
splx(s);
@@ -117,7 +117,7 @@ alloc_stmem(u_long size, void **phys_add
* for a new node in between.
*/
TAILQ_REMOVE(&free_list, mn, free_link);
- TAILQ_NEXT(mn, free_link) = TAILQ_END(&free_list);
+ TAILQ_NEXT(mn, free_link) = NULL;
size = mn->size; /* increase size. (or same) */
stmem_total -= mn->size;
splx(s);
@@ -138,7 +138,7 @@ alloc_stmem(u_long size, void **phys_add
* and mark as not on free list
*/
TAILQ_INSERT_AFTER(&st_list, new, mn, link);
- TAILQ_NEXT(mn, free_link) = TAILQ_END(&free_list);
+ TAILQ_NEXT(mn, free_link) = NULL;
stmem_total -= size + sizeof(struct mem_node);
splx(s);
@@ -163,8 +163,7 @@ free_stmem(void *mem)
/*
* check ahead of us.
*/
- if (next != LIST_END(&st_list) &&
- TAILQ_NEXT(next, free_link) != TAILQ_END(&free_list)) {
+ if (next != NULL && TAILQ_NEXT(next, free_link) != NULL) {
/*
* if next is: a valid node and a free node. ==> merge
*/
@@ -174,12 +173,11 @@ free_stmem(void *mem)
stmem_total += mn->size + sizeof(struct mem_node);
mn->size += next->size + sizeof(struct mem_node);
}
- if (prev != LIST_END(&st_list) &&
- TAILQ_PREV(prev, freelist, free_link) != TAILQ_END(&free_list)) {
+ if (prev != NULL && TAILQ_PREV(prev, freelist, free_link) != NULL) {
/*
* if prev is: a valid node and a free node. ==> merge
*/
- if (TAILQ_NEXT(mn, free_link) == TAILQ_END(&free_list))
+ if (TAILQ_NEXT(mn, free_link) == NULL)
stmem_total += mn->size + sizeof(struct mem_node);
else {
/* already on free list */
@@ -188,20 +186,17 @@ free_stmem(void *mem)
}
TAILQ_REMOVE(&st_list, mn, link);
prev->size += mn->size + sizeof(struct mem_node);
- } else if (TAILQ_NEXT(mn, free_link) == TAILQ_END(&free_list)) {
+ } else if (TAILQ_NEXT(mn, free_link) == NULL) {
/*
* we still are not on free list and we need to be.
* <-- | -->
*/
- while (next != LIST_END(&st_list) &&
- prev != LIST_END(&st_list)) {
- if (TAILQ_NEXT(next, free_link) !=
- TAILQ_END(&free_list)) {
+ while (next != NULL && prev != NULL) {
+ if (TAILQ_NEXT(next, free_link) != NULL) {
TAILQ_INSERT_BEFORE(next, mn, free_link);
break;
}
- if (TAILQ_NEXT(prev, free_link) !=
- TAILQ_END(&free_list)) {
+ if (TAILQ_NEXT(prev, free_link) != NULL) {
TAILQ_INSERT_AFTER(&free_list, prev, mn,
free_link);
break;
@@ -209,8 +204,8 @@ free_stmem(void *mem)
prev = TAILQ_PREV(prev, stlist, link);
next = TAILQ_NEXT(next, link);
}
- if (TAILQ_NEXT(mn, free_link) == TAILQ_END(&free_list)) {
- if (next == LIST_END(&st_list)) {
+ if (TAILQ_NEXT(mn, free_link) == NULL) {
+ if (next == NULL) {
/*
* we are not on list so we can add
* ourselves to the tail. (we walked to it.)
Index: src/sys/arch/hpc/hpc/config_hook.c
diff -u src/sys/arch/hpc/hpc/config_hook.c:1.9 src/sys/arch/hpc/hpc/config_hook.c:1.10
--- src/sys/arch/hpc/hpc/config_hook.c:1.9 Sat Nov 23 17:31:53 2013
+++ src/sys/arch/hpc/hpc/config_hook.c Wed Nov 27 12:24:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: config_hook.c,v 1.9 2013/11/23 22:31:53 christos Exp $ */
+/* $NetBSD: config_hook.c,v 1.10 2013/11/27 17:24:43 christos Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: config_hook.c,v 1.9 2013/11/23 22:31:53 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: config_hook.c,v 1.10 2013/11/27 17:24:43 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -103,8 +103,7 @@ config_hook(int type, long id, enum conf
type, id);
s = splhigh();
TAILQ_REMOVE(&hook_lists[type], prev_hr, hr_link);
- TAILQ_NEXT(prev_hr, hr_link) =
- TAILQ_END(&hook_lists[type]);
+ TAILQ_NEXT(prev_hr, hr_link) = NULL;
splx(s);
}
break;
@@ -157,10 +156,10 @@ config_unhook(config_hook_tag hrx)
int s;
struct hook_rec *hr = (struct hook_rec*)hrx, *cr;
- if (TAILQ_NEXT(hr, hr_link) != TAILQ_END(&hook_lists[hr->hr_type])) {
+ if (TAILQ_NEXT(hr, hr_link) != NULL) {
s = splhigh();
TAILQ_REMOVE(&hook_lists[hr->hr_type], hr, hr_link);
- TAILQ_NEXT(hr, hr_link) = TAILQ_END(&hook_lists[hr->hr_type]);
+ TAILQ_NEXT(hr, hr_link) = NULL;
/* update call list */
TAILQ_FOREACH(cr, &call_list, hr_link) {
if (cr->hr_type == hr->hr_type &&
@@ -185,7 +184,8 @@ __config_hook_call(int type, long id, vo
res = -1;
if (reverse) {
- TAILQ_FOREACH_REVERSE(hr, &hook_lists[type], hook_list, hr_link) {
+ TAILQ_FOREACH_REVERSE(hr, &hook_lists[type], hook_list,
+ hr_link) {
if (hr->hr_id == id)
res = (*hr->hr_func)(hr->hr_ctx, type, id,msg);
}
Index: src/sys/coda/coda_vfsops.c
diff -u src/sys/coda/coda_vfsops.c:1.77 src/sys/coda/coda_vfsops.c:1.78
--- src/sys/coda/coda_vfsops.c:1.77 Sat Nov 23 18:14:55 2013
+++ src/sys/coda/coda_vfsops.c Wed Nov 27 12:24:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_vfsops.c,v 1.77 2013/11/23 23:14:55 christos Exp $ */
+/* $NetBSD: coda_vfsops.c,v 1.78 2013/11/27 17:24:44 christos Exp $ */
/*
*
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_vfsops.c,v 1.77 2013/11/23 23:14:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_vfsops.c,v 1.78 2013/11/27 17:24:44 christos Exp $");
#ifndef _KERNEL_OPT
#define NVCODA 4
@@ -623,7 +623,6 @@ struct mount *devtomp(dev_t dev)
break;
}
}
- mp = mp == TAILQ_END(&mountlist) ? NULL : mp;
mutex_exit(&mountlist_lock);
return mp;
}
Index: src/sys/compat/common/vfs_syscalls_20.c
diff -u src/sys/compat/common/vfs_syscalls_20.c:1.36 src/sys/compat/common/vfs_syscalls_20.c:1.37
--- src/sys/compat/common/vfs_syscalls_20.c:1.36 Sat Nov 23 08:35:36 2013
+++ src/sys/compat/common/vfs_syscalls_20.c Wed Nov 27 12:24:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls_20.c,v 1.36 2013/11/23 13:35:36 christos Exp $ */
+/* $NetBSD: vfs_syscalls_20.c,v 1.37 2013/11/27 17:24:44 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_20.c,v 1.36 2013/11/23 13:35:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_20.c,v 1.37 2013/11/27 17:24:44 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -214,8 +214,7 @@ compat_20_sys_getfsstat(struct lwp *l, c
sfsp = SCARG(uap, buf);
mutex_enter(&mountlist_lock);
count = 0;
- for (mp = TAILQ_FIRST(&mountlist); mp != TAILQ_END(&mountlist);
- mp = nmp) {
+ for (mp = TAILQ_FIRST(&mountlist); mp != NULL; mp = nmp) {
if (vfs_busy(mp, &nmp)) {
continue;
}
Index: src/sys/compat/netbsd32/netbsd32_compat_20.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_20.c:1.30 src/sys/compat/netbsd32/netbsd32_compat_20.c:1.31
--- src/sys/compat/netbsd32/netbsd32_compat_20.c:1.30 Sat Nov 23 15:53:46 2013
+++ src/sys/compat/netbsd32/netbsd32_compat_20.c Wed Nov 27 12:24:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_20.c,v 1.30 2013/11/23 20:53:46 christos Exp $ */
+/* $NetBSD: netbsd32_compat_20.c,v 1.31 2013/11/27 17:24:44 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.30 2013/11/23 20:53:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.31 2013/11/27 17:24:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -102,7 +102,7 @@ compat_20_netbsd32_getfsstat(struct lwp
sfsp = SCARG_P32(uap, buf);
mutex_enter(&mountlist_lock);
count = 0;
- for (mp = TAILQ_FIRST(&mountlist); mp != TAILQ_END(&mountlist); mp = nmp) {
+ for (mp = TAILQ_FIRST(&mountlist); mp != NULL; mp = nmp) {
if (vfs_busy(mp, &nmp)) {
continue;
}
Index: src/sys/compat/osf1/osf1_mount.c
diff -u src/sys/compat/osf1/osf1_mount.c:1.49 src/sys/compat/osf1/osf1_mount.c:1.50
--- src/sys/compat/osf1/osf1_mount.c:1.49 Sat Nov 23 18:30:39 2013
+++ src/sys/compat/osf1/osf1_mount.c Wed Nov 27 12:24:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_mount.c,v 1.49 2013/11/23 23:30:39 christos Exp $ */
+/* $NetBSD: osf1_mount.c,v 1.50 2013/11/27 17:24:44 christos Exp $ */
/*
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osf1_mount.c,v 1.49 2013/11/23 23:30:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osf1_mount.c,v 1.50 2013/11/27 17:24:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -145,7 +145,7 @@ osf1_sys_getfsstat(struct lwp *l, const
osf_sfsp = (void *)SCARG(uap, buf);
mutex_enter(&mountlist_lock);
for (count = 0, mp = TAILQ_FIRST(&mountlist);
- mp != TAILQ_END(&mountlist);
+ mp != NULL;
mp = nmp) {
if (vfs_busy(mp, &nmp)) {
continue;
Index: src/sys/compat/ultrix/ultrix_fs.c
diff -u src/sys/compat/ultrix/ultrix_fs.c:1.53 src/sys/compat/ultrix/ultrix_fs.c:1.54
--- src/sys/compat/ultrix/ultrix_fs.c:1.53 Sat Nov 23 18:34:04 2013
+++ src/sys/compat/ultrix/ultrix_fs.c Wed Nov 27 12:24:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ultrix_fs.c,v 1.53 2013/11/23 23:34:04 christos Exp $ */
+/* $NetBSD: ultrix_fs.c,v 1.54 2013/11/27 17:24:44 christos Exp $ */
/*
* Copyright (c) 1995, 1997 Jonathan Stone
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ultrix_fs.c,v 1.53 2013/11/23 23:34:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_fs.c,v 1.54 2013/11/27 17:24:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -249,7 +249,7 @@ ultrix_sys_getmnt(struct lwp *l, const s
goto bad;
mutex_enter(&mountlist_lock);
for (skip = start, mp = TAILQ_FIRST(&mountlist);
- mp != TAILQ_END(&mountlist) && skip-- > 0;
+ mp != NULL && skip-- > 0;
mp = TAILQ_NEXT(mp, mnt_list))
continue;
mutex_exit(&mountlist_lock);
@@ -257,7 +257,7 @@ ultrix_sys_getmnt(struct lwp *l, const s
mutex_enter(&mountlist_lock);
for (count = 0, mp = TAILQ_FIRST(&mountlist);
- mp != TAILQ_END(&mountlist) && count < maxcount; mp = nmp) {
+ mp != NULL && count < maxcount; mp = nmp) {
if (vfs_busy(mp, &nmp)) {
continue;
}
Index: src/sys/fs/nfs/server/nfs_nfsdcache.c
diff -u src/sys/fs/nfs/server/nfs_nfsdcache.c:1.1.1.1 src/sys/fs/nfs/server/nfs_nfsdcache.c:1.2
--- src/sys/fs/nfs/server/nfs_nfsdcache.c:1.1.1.1 Mon Sep 30 03:19:57 2013
+++ src/sys/fs/nfs/server/nfs_nfsdcache.c Wed Nov 27 12:24:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_nfsdcache.c,v 1.1.1.1 2013/09/30 07:19:57 dholland Exp $ */
+/* $NetBSD: nfs_nfsdcache.c,v 1.2 2013/11/27 17:24:44 christos Exp $ */
/*-
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
/* __FBSDID("FreeBSD: head/sys/fs/nfsserver/nfs_nfsdcache.c 254337 2013-08-14 21:11:26Z rmacklem "); */
-__RCSID("$NetBSD: nfs_nfsdcache.c,v 1.1.1.1 2013/09/30 07:19:57 dholland Exp $");
+__RCSID("$NetBSD: nfs_nfsdcache.c,v 1.2 2013/11/27 17:24:44 christos Exp $");
/*
* Here is the basic algorithm:
@@ -630,7 +630,7 @@ tryagain:
* Get all the matches and put them on the temp list.
*/
rp = LIST_FIRST(hp);
- while (rp != LIST_END(hp)) {
+ while (rp != NULL) {
nextrp = LIST_NEXT(rp, rc_hash);
if (newrp->rc_xid == rp->rc_xid &&
(!(rp->rc_flag & RC_INPROG) ||
@@ -668,13 +668,13 @@ tryagain:
if (i != 1)
hit = 0;
hitrp = rp = LIST_FIRST(&nfsrc_templist);
- while (rp != LIST_END(&nfsrc_templist)) {
+ while (rp != NULL) {
nextrp = LIST_NEXT(rp, rc_hash);
LIST_REMOVE(rp, rc_hash);
LIST_INSERT_HEAD(hp, rp, rc_hash);
rp = nextrp;
}
- if (LIST_FIRST(&nfsrc_templist) != LIST_END(&nfsrc_templist))
+ if (LIST_FIRST(&nfsrc_templist) != NULL)
panic("nfs gettcp cache templist");
if (hit) {
Index: src/sys/fs/nfs/server/nfs_nfsdstate.c
diff -u src/sys/fs/nfs/server/nfs_nfsdstate.c:1.1.1.1 src/sys/fs/nfs/server/nfs_nfsdstate.c:1.2
--- src/sys/fs/nfs/server/nfs_nfsdstate.c:1.1.1.1 Mon Sep 30 03:19:52 2013
+++ src/sys/fs/nfs/server/nfs_nfsdstate.c Wed Nov 27 12:24:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_nfsdstate.c,v 1.1.1.1 2013/09/30 07:19:52 dholland Exp $ */
+/* $NetBSD: nfs_nfsdstate.c,v 1.2 2013/11/27 17:24:44 christos Exp $ */
/*-
* Copyright (c) 2009 Rick Macklem, University of Guelph
* All rights reserved.
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
/* __FBSDID("FreeBSD: head/sys/fs/nfsserver/nfs_nfsdstate.c 245909 2013-01-25 15:25:24Z jhb "); */
-__RCSID("$NetBSD: nfs_nfsdstate.c,v 1.1.1.1 2013/09/30 07:19:52 dholland Exp $");
+__RCSID("$NetBSD: nfs_nfsdstate.c,v 1.2 2013/11/27 17:24:44 christos Exp $");
#ifndef APPLEKEXT
#include <fs/nfs/nfsport.h>
@@ -446,7 +446,7 @@ nfsrv_getclient(nfsquad_t clientid, int
if (clp->lc_clientid.lval[1] == clientid.lval[1])
break;
}
- if (clp == LIST_END(hp)) {
+ if (clp == NULL) {
if (opflags & CLOPS_CONFIRM)
error = NFSERR_STALECLIENTID;
else
@@ -638,7 +638,7 @@ nfsrv_dumpclients(struct nfsd_dumpclient
*/
while (i < NFSCLIENTHASHSIZE && cnt < maxcnt) {
clp = LIST_FIRST(&nfsclienthash[i]);
- while (clp != LIST_END(&nfsclienthash[i]) && cnt < maxcnt) {
+ while (clp != NULL && cnt < maxcnt) {
nfsrv_dumpaclient(clp, &dumpp[cnt]);
cnt++;
clp = LIST_NEXT(clp, lc_hash);
@@ -749,7 +749,7 @@ nfsrv_dumplocks(vnode_t vp, struct nfsd_
* For each open share on file, dump it out.
*/
stp = LIST_FIRST(&lfp->lf_open);
- while (stp != LIST_END(&lfp->lf_open) && cnt < maxcnt) {
+ while (stp != NULL && cnt < maxcnt) {
ldumpp[cnt].ndlck_flags = stp->ls_flags;
ldumpp[cnt].ndlck_stateid.seqid = stp->ls_stateid.seqid;
ldumpp[cnt].ndlck_stateid.other[0] = stp->ls_stateid.other[0];
@@ -780,7 +780,7 @@ nfsrv_dumplocks(vnode_t vp, struct nfsd_
* and all locks.
*/
lop = LIST_FIRST(&lfp->lf_lock);
- while (lop != LIST_END(&lfp->lf_lock) && cnt < maxcnt) {
+ while (lop != NULL && cnt < maxcnt) {
stp = lop->lo_stp;
ldumpp[cnt].ndlck_flags = lop->lo_flags;
ldumpp[cnt].ndlck_first = lop->lo_first;
@@ -812,7 +812,7 @@ nfsrv_dumplocks(vnode_t vp, struct nfsd_
* and the delegations.
*/
stp = LIST_FIRST(&lfp->lf_deleg);
- while (stp != LIST_END(&lfp->lf_deleg) && cnt < maxcnt) {
+ while (stp != NULL && cnt < maxcnt) {
ldumpp[cnt].ndlck_flags = stp->ls_flags;
ldumpp[cnt].ndlck_stateid.seqid = stp->ls_stateid.seqid;
ldumpp[cnt].ndlck_stateid.other[0] = stp->ls_stateid.other[0];
@@ -906,7 +906,7 @@ nfsrv_servertimer(void)
*/
for (i = 0; i < NFSCLIENTHASHSIZE; i++) {
clp = LIST_FIRST(&nfsclienthash[i]);
- while (clp != LIST_END(&nfsclienthash[i])) {
+ while (clp != NULL) {
nclp = LIST_NEXT(clp, lc_hash);
if (!(clp->lc_flags & LCL_EXPIREIT)) {
if (((clp->lc_expiry + NFSRV_STALELEASE) < NFSD_MONOSEC
@@ -948,7 +948,7 @@ nfsrv_servertimer(void)
* of open owners and subsequent open confirms.
*/
stp = LIST_FIRST(&clp->lc_open);
- while (stp != LIST_END(&clp->lc_open)) {
+ while (stp != NULL) {
nstp = LIST_NEXT(stp, ls_list);
if (LIST_EMPTY(&stp->ls_open)) {
stp->ls_noopens++;
@@ -1075,7 +1075,7 @@ nfsrv_freeopenowner(struct nfsstate *stp
* Now, free all associated opens.
*/
nstp = LIST_FIRST(&stp->ls_open);
- while (nstp != LIST_END(&stp->ls_open)) {
+ while (nstp != NULL) {
tstp = nstp;
nstp = LIST_NEXT(nstp, ls_list);
(void) nfsrv_freeopen(tstp, NULL, cansleep, p);
@@ -1171,7 +1171,7 @@ nfsrv_freeallnfslocks(struct nfsstate *s
uint64_t first, end;
lop = LIST_FIRST(&stp->ls_lock);
- while (lop != LIST_END(&stp->ls_lock)) {
+ while (lop != NULL) {
nlop = LIST_NEXT(lop, lo_lckowner);
/*
* Since all locks should be for the same file, lfp should
@@ -1264,7 +1264,7 @@ nfsrv_getstate(struct nfsclient *clp, nf
/*
* If no state id in list, return NFSERR_BADSTATEID.
*/
- if (stp == LIST_END(hp)) {
+ if (stp == NULL) {
error = NFSERR_BADSTATEID;
goto out;
}
@@ -1737,7 +1737,7 @@ tryagain:
* the current concensus?)
*/
tstp = LIST_FIRST(&lfp->lf_deleg);
- while (tstp != LIST_END(&lfp->lf_deleg)) {
+ while (tstp != NULL) {
nstp = LIST_NEXT(tstp, ls_file);
if ((((new_stp->ls_flags&(NFSLCK_LOCK|NFSLCK_UNLOCK|NFSLCK_TEST))||
((new_stp->ls_flags & NFSLCK_CHECK) &&
@@ -2091,7 +2091,7 @@ tryagain:
NFSX_STATEIDOTHER))
break;
}
- if (stp == LIST_END(&lfp->lf_deleg) ||
+ if (stp == NULL ||
((new_stp->ls_flags & NFSLCK_WRITEACCESS) &&
(stp->ls_flags & NFSLCK_DELEGREAD))) {
NFSUNLOCKSTATE();
@@ -2163,7 +2163,7 @@ tryagain:
if (!(new_stp->ls_flags &
(NFSLCK_DELEGPREV | NFSLCK_DELEGCUR | NFSLCK_RECLAIM))) {
stp = LIST_FIRST(&lfp->lf_deleg);
- while (stp != LIST_END(&lfp->lf_deleg)) {
+ while (stp != NULL) {
nstp = LIST_NEXT(stp, ls_file);
if ((readonly && stp->ls_clp != clp &&
(stp->ls_flags & NFSLCK_DELEGWRITE)) ||
@@ -2348,7 +2348,7 @@ tryagain:
NFSX_STATEIDOTHER))
break;
}
- if (stp == LIST_END(&lfp->lf_deleg) ||
+ if (stp == NULL ||
((new_stp->ls_flags & NFSLCK_WRITEACCESS) &&
(stp->ls_flags & NFSLCK_DELEGREAD))) {
NFSUNLOCKSTATE();
@@ -2451,7 +2451,7 @@ tryagain:
*/
if (!(new_stp->ls_flags & (NFSLCK_DELEGPREV | NFSLCK_DELEGCUR))) {
stp = LIST_FIRST(&lfp->lf_deleg);
- while (stp != LIST_END(&lfp->lf_deleg)) {
+ while (stp != NULL) {
nstp = LIST_NEXT(stp, ls_file);
if (stp->ls_clp != clp && (stp->ls_flags & NFSLCK_DELEGREAD))
writedeleg = 0;
@@ -2572,7 +2572,7 @@ tryagain:
break;
}
}
- if (stp == LIST_END(&clp->lc_olddeleg))
+ if (stp == NULL)
error = NFSERR_EXPIRED;
} else if (new_stp->ls_flags & (NFSLCK_DELEGREAD | NFSLCK_DELEGWRITE)) {
/*
@@ -2585,7 +2585,7 @@ tryagain:
if (stp->ls_clp == clp)
break;
}
- if (stp == LIST_END(&lfp->lf_deleg) && openstp == NULL) {
+ if (stp == NULL && openstp == NULL) {
/*
* This is the Claim_Previous case with a delegation
* type != Delegate_None.
@@ -3112,7 +3112,7 @@ nfsrv_releaselckown(struct nfsstate *new
LIST_FOREACH(ownstp, &clp->lc_open, ls_list) {
LIST_FOREACH(openstp, &ownstp->ls_open, ls_list) {
stp = LIST_FIRST(&openstp->ls_open);
- while (stp != LIST_END(&openstp->ls_open)) {
+ while (stp != NULL) {
nstp = LIST_NEXT(stp, ls_list);
/*
* If the owner matches, check for locks and
@@ -3242,12 +3242,12 @@ nfsrv_insertlock(struct nfslock *new_lop
if (stp != NULL) {
/* Insert in increasing lo_first order */
lop = LIST_FIRST(&lfp->lf_lock);
- if (lop == LIST_END(&lfp->lf_lock) ||
+ if (lop == NULL ||
new_lop->lo_first <= lop->lo_first) {
LIST_INSERT_HEAD(&lfp->lf_lock, new_lop, lo_lckfile);
} else {
nlop = LIST_NEXT(lop, lo_lckfile);
- while (nlop != LIST_END(&lfp->lf_lock) &&
+ while (nlop != NULL &&
nlop->lo_first < new_lop->lo_first) {
lop = nlop;
nlop = LIST_NEXT(lop, lo_lckfile);
@@ -4066,7 +4066,7 @@ nfsrv_setupstable(NFSPROC_T *p)
!NFSBCMP(tsp->client, sp->nst_client, tsp->len))
break;
}
- if (sp == LIST_END(&sf->nsf_head)) {
+ if (sp == NULL) {
sp = (struct nfsrv_stable *)malloc(tsp->len +
sizeof (struct nfsrv_stable) - 1, M_TEMP,
M_WAITOK);
@@ -4219,7 +4219,7 @@ nfsrv_markstable(struct nfsclient *clp)
!NFSBCMP(sp->nst_client, clp->lc_id, sp->nst_len))
break;
}
- if (sp == LIST_END(&nfsrv_stablefirst.nsf_head))
+ if (sp == NULL)
return;
/*
@@ -4251,7 +4251,7 @@ nfsrv_checkstable(struct nfsclient *clp)
* If not in the list, state was revoked or no state was issued
* since the previous reboot, a reclaim is denied.
*/
- if (sp == LIST_END(&nfsrv_stablefirst.nsf_head) ||
+ if (sp == NULL ||
(sp->nst_flag & NFSNST_REVOKE) ||
!(nfsrv_stablefirst.nsf_flags & NFSNSF_OK))
return (1);
@@ -4602,7 +4602,7 @@ nfsrv_cleandeleg(vnode_t vp, struct nfsl
int ret = 0;
stp = LIST_FIRST(&lfp->lf_deleg);
- while (stp != LIST_END(&lfp->lf_deleg)) {
+ while (stp != NULL) {
nstp = LIST_NEXT(stp, ls_file);
if (stp->ls_clp != clp) {
ret = nfsrv_delegconflict(stp, haslockp, p, vp);
@@ -4810,7 +4810,7 @@ nfsrv_checkgetattr(struct nfsrv_descript
if (stp->ls_flags & NFSLCK_DELEGWRITE)
break;
}
- if (stp == LIST_END(&lfp->lf_deleg)) {
+ if (stp == NULL) {
NFSUNLOCKSTATE();
goto out;
}
Index: src/sys/kern/kern_verifiedexec.c
diff -u src/sys/kern/kern_verifiedexec.c:1.130 src/sys/kern/kern_verifiedexec.c:1.131
--- src/sys/kern/kern_verifiedexec.c:1.130 Sat Nov 23 08:35:36 2013
+++ src/sys/kern/kern_verifiedexec.c Wed Nov 27 12:24:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_verifiedexec.c,v 1.130 2013/11/23 13:35:36 christos Exp $ */
+/* $NetBSD: kern_verifiedexec.c,v 1.131 2013/11/27 17:24:44 christos Exp $ */
/*-
* Copyright (c) 2005, 2006 Elad Efrat <[email protected]>
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.130 2013/11/23 13:35:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.131 2013/11/27 17:24:44 christos Exp $");
#include "opt_veriexec.h"
@@ -1552,8 +1552,7 @@ veriexec_dump(struct lwp *l, prop_array_
struct mount *mp, *nmp;
mutex_enter(&mountlist_lock);
- for (mp = TAILQ_FIRST(&mountlist); mp != TAILQ_END(&mountlist);
- mp = nmp) {
+ for (mp = TAILQ_FIRST(&mountlist); mp != NULL; mp = nmp) {
/* If it fails, the file-system is [being] unmounted. */
if (vfs_busy(mp, &nmp) != 0)
continue;
@@ -1575,8 +1574,7 @@ veriexec_flush(struct lwp *l)
int error = 0;
mutex_enter(&mountlist_lock);
- for (mp = TAILQ_FIRST(&mountlist); mp != TAILQ_END(&mountlist);
- mp = nmp) {
+ for (mp = TAILQ_FIRST(&mountlist); mp != NULL; mp = nmp) {
int lerror;
/* If it fails, the file-system is [being] unmounted. */
Index: src/sys/kern/vfs_subr.c
diff -u src/sys/kern/vfs_subr.c:1.440 src/sys/kern/vfs_subr.c:1.441
--- src/sys/kern/vfs_subr.c:1.440 Sat Nov 23 08:35:36 2013
+++ src/sys/kern/vfs_subr.c Wed Nov 27 12:24:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_subr.c,v 1.440 2013/11/23 13:35:36 christos Exp $ */
+/* $NetBSD: vfs_subr.c,v 1.441 2013/11/27 17:24:44 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.440 2013/11/23 13:35:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.441 2013/11/27 17:24:44 christos Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -631,8 +631,7 @@ sysctl_kern_vnode(SYSCTLFN_ARGS)
sysctl_unlock();
mutex_enter(&mountlist_lock);
- for (mp = TAILQ_FIRST(&mountlist); mp != TAILQ_END(&mountlist);
- mp = nmp) {
+ for (mp = TAILQ_FIRST(&mountlist); mp != NULL; mp = nmp) {
if (vfs_busy(mp, &nmp)) {
continue;
}
@@ -1264,8 +1263,7 @@ printlockedvnodes(void)
printf("Locked vnodes\n");
mutex_enter(&mountlist_lock);
- for (mp = TAILQ_FIRST(&mountlist); mp != TAILQ_END(&mountlist);
- mp = nmp) {
+ for (mp = TAILQ_FIRST(&mountlist); mp != NULL; mp = nmp) {
if (vfs_busy(mp, &nmp)) {
continue;
}
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.470 src/sys/kern/vfs_syscalls.c:1.471
--- src/sys/kern/vfs_syscalls.c:1.470 Sat Nov 23 08:35:36 2013
+++ src/sys/kern/vfs_syscalls.c Wed Nov 27 12:24:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.470 2013/11/23 13:35:36 christos Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.471 2013/11/27 17:24:44 christos Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.470 2013/11/23 13:35:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.471 2013/11/27 17:24:44 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -622,8 +622,7 @@ do_sys_sync(struct lwp *l)
int asyncflag;
mutex_enter(&mountlist_lock);
- for (mp = TAILQ_FIRST(&mountlist); mp != TAILQ_END(&mountlist);
- mp = nmp) {
+ for (mp = TAILQ_FIRST(&mountlist); mp != NULL; mp = nmp) {
if (vfs_busy(mp, &nmp)) {
continue;
}
@@ -1237,8 +1236,7 @@ do_sys_getvfsstat(struct lwp *l, void *s
maxcount = bufsize / entry_sz;
mutex_enter(&mountlist_lock);
count = 0;
- for (mp = TAILQ_FIRST(&mountlist); mp != TAILQ_END(&mountlist);
- mp = nmp) {
+ for (mp = TAILQ_FIRST(&mountlist); mp != NULL; mp = nmp) {
if (vfs_busy(mp, &nmp)) {
continue;
}
Index: src/sys/miscfs/procfs/procfs_linux.c
diff -u src/sys/miscfs/procfs/procfs_linux.c:1.65 src/sys/miscfs/procfs/procfs_linux.c:1.66
--- src/sys/miscfs/procfs/procfs_linux.c:1.65 Sat Nov 23 08:35:36 2013
+++ src/sys/miscfs/procfs/procfs_linux.c Wed Nov 27 12:24:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_linux.c,v 1.65 2013/11/23 13:35:36 christos Exp $ */
+/* $NetBSD: procfs_linux.c,v 1.66 2013/11/27 17:24:44 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.65 2013/11/23 13:35:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.66 2013/11/27 17:24:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -599,8 +599,7 @@ procfs_domounts(struct lwp *curl, struct
bf = malloc(LBFSZ, M_TEMP, M_WAITOK);
mutex_enter(&mountlist_lock);
- for (mp = TAILQ_FIRST(&mountlist); mp != TAILQ_END(&mountlist);
- mp = nmp) {
+ for (mp = TAILQ_FIRST(&mountlist); mp != NULL; mp = nmp) {
struct statvfs sfs;
if (vfs_busy(mp, &nmp))
Index: src/sys/ufs/lfs/lfs_bio.c
diff -u src/sys/ufs/lfs/lfs_bio.c:1.127 src/sys/ufs/lfs/lfs_bio.c:1.128
--- src/sys/ufs/lfs/lfs_bio.c:1.127 Sat Nov 23 08:35:37 2013
+++ src/sys/ufs/lfs/lfs_bio.c Wed Nov 27 12:24:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_bio.c,v 1.127 2013/11/23 13:35:37 christos Exp $ */
+/* $NetBSD: lfs_bio.c,v 1.128 2013/11/27 17:24:44 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2008 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.127 2013/11/23 13:35:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.128 2013/11/27 17:24:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -570,8 +570,7 @@ lfs_flush(struct lfs *fs, int flags, int
} else {
locked_fakequeue_count = 0;
mutex_enter(&mountlist_lock);
- for (mp = TAILQ_FIRST(&mountlist); mp != TAILQ_END(&mountlist);
- mp = nmp) {
+ for (mp = TAILQ_FIRST(&mountlist); mp != NULL; mp = nmp) {
if (vfs_busy(mp, &nmp)) {
DLOG((DLOG_FLUSH, "lfs_flush: fs vfs_busy\n"));
continue;
Index: src/sys/ufs/lfs/lfs_vfsops.c
diff -u src/sys/ufs/lfs/lfs_vfsops.c:1.316 src/sys/ufs/lfs/lfs_vfsops.c:1.317
--- src/sys/ufs/lfs/lfs_vfsops.c:1.316 Sat Nov 23 08:35:37 2013
+++ src/sys/ufs/lfs/lfs_vfsops.c Wed Nov 27 12:24:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vfsops.c,v 1.316 2013/11/23 13:35:37 christos Exp $ */
+/* $NetBSD: lfs_vfsops.c,v 1.317 2013/11/27 17:24:44 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.316 2013/11/23 13:35:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.317 2013/11/27 17:24:44 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -454,8 +454,7 @@ lfs_writerd(void *arg)
mutex_enter(&mountlist_lock);
lfsc = 0;
skipc = 0;
- for (mp = TAILQ_FIRST(&mountlist); mp != TAILQ_END(&mountlist);
- mp = nmp) {
+ for (mp = TAILQ_FIRST(&mountlist); mp != NULL; mp = nmp) {
if (vfs_busy(mp, &nmp)) {
++skipc;
continue;
