Module Name: src
Committed By: christos
Date: Sat Nov 23 23:34:04 UTC 2013
Modified Files:
src/sys/compat/ultrix: ultrix_fs.c
Log Message:
fix previous, list ends in NULL, and don't open-code
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/compat/ultrix/ultrix_fs.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/compat/ultrix/ultrix_fs.c
diff -u src/sys/compat/ultrix/ultrix_fs.c:1.52 src/sys/compat/ultrix/ultrix_fs.c:1.53
--- src/sys/compat/ultrix/ultrix_fs.c:1.52 Sat Nov 23 11:15:25 2013
+++ src/sys/compat/ultrix/ultrix_fs.c Sat Nov 23 18:34:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ultrix_fs.c,v 1.52 2013/11/23 16:15:25 riz Exp $ */
+/* $NetBSD: ultrix_fs.c,v 1.53 2013/11/23 23:34:04 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.52 2013/11/23 16:15:25 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_fs.c,v 1.53 2013/11/23 23:34:04 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -248,15 +248,16 @@ ultrix_sys_getmnt(struct lwp *l, const s
sizeof(*SCARG(uap, start)))) != 0)
goto bad;
mutex_enter(&mountlist_lock);
- for (skip = start, mp = mountlist.tqh_first;
- mp != (void*)&mountlist && skip-- > 0; mp = nmp)
- nmp = mp->mnt_list.tqe_next;
+ for (skip = start, mp = TAILQ_FIRST(&mountlist);
+ mp != TAILQ_END(&mountlist) && skip-- > 0;
+ mp = TAILQ_NEXT(mp, mnt_list))
+ continue;
mutex_exit(&mountlist_lock);
}
mutex_enter(&mountlist_lock);
- for (count = 0, mp = mountlist.tqh_first;
- mp != (void*)&mountlist && count < maxcount; mp = nmp) {
+ for (count = 0, mp = TAILQ_FIRST(&mountlist);
+ mp != TAILQ_END(&mountlist) && count < maxcount; mp = nmp) {
if (vfs_busy(mp, &nmp)) {
continue;
}
