Module Name: src
Committed By: riz
Date: Sat Nov 23 16:15:25 UTC 2013
Modified Files:
src/sys/coda: coda_vfsops.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/gdbscripts: vchain
Log Message:
Since mountlist is now a TAILQ, convert some missed usages
so things build again.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/coda/coda_vfsops.c
cvs rdiff -u -r1.28 -r1.29 src/sys/compat/netbsd32/netbsd32_compat_20.c
cvs rdiff -u -r1.47 -r1.48 src/sys/compat/osf1/osf1_mount.c
cvs rdiff -u -r1.51 -r1.52 src/sys/compat/ultrix/ultrix_fs.c
cvs rdiff -u -r1.6 -r1.7 src/sys/gdbscripts/vchain
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/coda/coda_vfsops.c
diff -u src/sys/coda/coda_vfsops.c:1.74 src/sys/coda/coda_vfsops.c:1.75
--- src/sys/coda/coda_vfsops.c:1.74 Thu Aug 2 16:06:58 2012
+++ src/sys/coda/coda_vfsops.c Sat Nov 23 16:15:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_vfsops.c,v 1.74 2012/08/02 16:06:58 christos Exp $ */
+/* $NetBSD: coda_vfsops.c,v 1.75 2013/11/23 16:15:24 riz Exp $ */
/*
*
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_vfsops.c,v 1.74 2012/08/02 16:06:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_vfsops.c,v 1.75 2013/11/23 16:15:24 riz Exp $");
#ifndef _KERNEL_OPT
#define NVCODA 4
@@ -615,8 +615,8 @@ struct mount *devtomp(dev_t dev)
{
struct mount *mp, *nmp;
- for (mp = mountlist.cqh_first; mp != (void*)&mountlist; mp = nmp) {
- nmp = mp->mnt_list.cqe_next;
+ for (mp = mountlist.tqh_first; mp != (void*)&mountlist; mp = nmp) {
+ nmp = mp->mnt_list.tqe_next;
if ((!strcmp(mp->mnt_op->vfs_name, MOUNT_UFS)) &&
((VFSTOUFS(mp))->um_dev == (dev_t) dev)) {
/* mount corresponds to UFS and the device matches one we want */
Index: src/sys/compat/netbsd32/netbsd32_compat_20.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_20.c:1.28 src/sys/compat/netbsd32/netbsd32_compat_20.c:1.29
--- src/sys/compat/netbsd32/netbsd32_compat_20.c:1.28 Fri Apr 23 15:19:20 2010
+++ src/sys/compat/netbsd32/netbsd32_compat_20.c Sat Nov 23 16:15:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_20.c,v 1.28 2010/04/23 15:19:20 rmind Exp $ */
+/* $NetBSD: netbsd32_compat_20.c,v 1.29 2013/11/23 16:15:24 riz 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.28 2010/04/23 15:19:20 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.29 2013/11/23 16:15:24 riz 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 = mountlist.cqh_first; mp != (void *)&mountlist; mp = nmp) {
+ for (mp = mountlist.tqh_first; mp != (void *)&mountlist; 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.47 src/sys/compat/osf1/osf1_mount.c:1.48
--- src/sys/compat/osf1/osf1_mount.c:1.47 Tue Mar 2 21:09:21 2010
+++ src/sys/compat/osf1/osf1_mount.c Sat Nov 23 16:15:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_mount.c,v 1.47 2010/03/02 21:09:21 pooka Exp $ */
+/* $NetBSD: osf1_mount.c,v 1.48 2013/11/23 16:15:25 riz 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.47 2010/03/02 21:09:21 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osf1_mount.c,v 1.48 2013/11/23 16:15:25 riz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -144,7 +144,7 @@ osf1_sys_getfsstat(struct lwp *l, const
maxcount = SCARG(uap, bufsize) / sizeof(struct osf1_statfs);
osf_sfsp = (void *)SCARG(uap, buf);
mutex_enter(&mountlist_lock);
- for (count = 0, mp = mountlist.cqh_first; mp != (void *)&mountlist;
+ for (count = 0, mp = mountlist.tqh_first; mp != (void *)&mountlist;
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.51 src/sys/compat/ultrix/ultrix_fs.c:1.52
--- src/sys/compat/ultrix/ultrix_fs.c:1.51 Mon Dec 14 00:47:11 2009
+++ src/sys/compat/ultrix/ultrix_fs.c Sat Nov 23 16:15:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ultrix_fs.c,v 1.51 2009/12/14 00:47:11 matt Exp $ */
+/* $NetBSD: ultrix_fs.c,v 1.52 2013/11/23 16:15:25 riz Exp $ */
/*
* Copyright (c) 1995, 1997 Jonathan Stone
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ultrix_fs.c,v 1.51 2009/12/14 00:47:11 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_fs.c,v 1.52 2013/11/23 16:15:25 riz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -248,14 +248,14 @@ ultrix_sys_getmnt(struct lwp *l, const s
sizeof(*SCARG(uap, start)))) != 0)
goto bad;
mutex_enter(&mountlist_lock);
- for (skip = start, mp = mountlist.cqh_first;
+ for (skip = start, mp = mountlist.tqh_first;
mp != (void*)&mountlist && skip-- > 0; mp = nmp)
- nmp = mp->mnt_list.cqe_next;
+ nmp = mp->mnt_list.tqe_next;
mutex_exit(&mountlist_lock);
}
mutex_enter(&mountlist_lock);
- for (count = 0, mp = mountlist.cqh_first;
+ for (count = 0, mp = mountlist.tqh_first;
mp != (void*)&mountlist && count < maxcount; mp = nmp) {
if (vfs_busy(mp, &nmp)) {
continue;
Index: src/sys/gdbscripts/vchain
diff -u src/sys/gdbscripts/vchain:1.6 src/sys/gdbscripts/vchain:1.7
--- src/sys/gdbscripts/vchain:1.6 Wed Nov 18 18:04:26 2009
+++ src/sys/gdbscripts/vchain Sat Nov 23 16:15:25 2013
@@ -1,4 +1,4 @@
-# $NetBSD: vchain,v 1.6 2009/11/18 18:04:26 eeh Exp $
+# $NetBSD: vchain,v 1.7 2013/11/23 16:15:25 riz Exp $
# @(#)vchain 8.1 (Berkeley) 6/10/93
#
@@ -35,11 +35,11 @@ print the vnode chain for a given mount
end
define vall
- set $mp=mountlist.cqh_first
+ set $mp=mountlist.tqh_first
while ($mp)
printf "\tmount point at 0x%x\n", $mp
mp_vchain $mp
- set $mp=$mp->mnt_list.cqe_next
+ set $mp=$mp->mnt_list.tqe_next
# "break"
if ((const void *)$mp == (const void *)&mountlist)
@@ -52,14 +52,14 @@ print vnode chains for all mount points
end
define mountdump
- set $mp=mountlist.cqh_first
+ set $mp=mountlist.tqh_first
while ($mp)
printf "%s on %s type %s, (mp 0x%x, privdata 0x%x)\n", \
$mp->mnt_stat->f_mntfromname, $mp->mnt_stat->f_mntonname, \
$mp->mnt_op->vfs_name, $mp, $mp->mnt_data
- set $mp=$mp->mnt_list.cqe_next
+ set $mp=$mp->mnt_list.tqe_next
if ((const void *)$mp == (const void *)&mountlist)
set $mp = 0
end
end
-end
\ No newline at end of file
+end
