Module Name: src
Committed By: christos
Date: Sat Nov 23 14:20:46 UTC 2013
Modified Files:
src/sys/nfs: nfs_export.c
Log Message:
convert from CIRCLEQ to TAILQ
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/nfs/nfs_export.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/nfs/nfs_export.c
diff -u src/sys/nfs/nfs_export.c:1.56 src/sys/nfs/nfs_export.c:1.57
--- src/sys/nfs/nfs_export.c:1.56 Sun Sep 15 09:03:59 2013
+++ src/sys/nfs/nfs_export.c Sat Nov 23 09:20:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_export.c,v 1.56 2013/09/15 13:03:59 martin Exp $ */
+/* $NetBSD: nfs_export.c,v 1.57 2013/11/23 14:20:46 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 2004, 2005, 2008 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_export.c,v 1.56 2013/09/15 13:03:59 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_export.c,v 1.57 2013/11/23 14:20:46 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -118,13 +118,13 @@ struct netcred {
* Network export information.
*/
struct netexport {
- CIRCLEQ_ENTRY(netexport) ne_list;
+ TAILQ_ENTRY(netexport) ne_list;
struct mount *ne_mount;
struct netcred ne_defexported; /* Default export */
struct radix_node_head *ne_rtable[AF_MAX+1]; /* Individual exports */
};
-CIRCLEQ_HEAD(, netexport) netexport_list =
- CIRCLEQ_HEAD_INITIALIZER(netexport_list);
+TAILQ_HEAD(, netexport) netexport_list =
+ TAILQ_HEAD_INITIALIZER(netexport_list);
/* Publicly exported file system. */
struct nfs_public nfs_pub;
@@ -207,9 +207,9 @@ netexport_fini(void)
struct mount *mp;
int error;
- while (!CIRCLEQ_EMPTY(&netexport_list)) {
+ while (!TAILQ_EMPTY(&netexport_list)) {
netexport_wrlock();
- ne = CIRCLEQ_FIRST(&netexport_list);
+ ne = TAILQ_FIRST(&netexport_list);
mp = ne->ne_mount;
error = vfs_busy(mp, NULL);
netexport_wrunlock();
@@ -340,14 +340,14 @@ static void
netexport_insert(struct netexport *ne)
{
- CIRCLEQ_INSERT_HEAD(&netexport_list, ne, ne_list);
+ TAILQ_INSERT_HEAD(&netexport_list, ne, ne_list);
}
static void
netexport_remove(struct netexport *ne)
{
- CIRCLEQ_REMOVE(&netexport_list, ne, ne_list);
+ TAILQ_REMOVE(&netexport_list, ne, ne_list);
}
static struct netexport *
@@ -355,7 +355,7 @@ netexport_lookup(const struct mount *mp)
{
struct netexport *ne;
- CIRCLEQ_FOREACH(ne, &netexport_list, ne_list) {
+ TAILQ_FOREACH(ne, &netexport_list, ne_list) {
if (ne->ne_mount == mp) {
goto done;
}
@@ -370,7 +370,7 @@ netexport_lookup_byfsid(const fsid_t *fs
{
struct netexport *ne;
- CIRCLEQ_FOREACH(ne, &netexport_list, ne_list) {
+ TAILQ_FOREACH(ne, &netexport_list, ne_list) {
const struct mount *mp = ne->ne_mount;
if (mp->mnt_stat.f_fsidx.__fsid_val[0] == fsid->__fsid_val[0] &&
