Make sure these all agree on the same definitons of various variables.

This commit is contained in:
matt 2002-12-01 23:02:10 +00:00
parent b5e32a190e
commit 9bd0cc2bb9
8 changed files with 24 additions and 24 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_node.c,v 1.55 2002/10/01 14:59:21 christos Exp $ */ /* $NetBSD: nfs_node.c,v 1.56 2002/12/01 23:02:10 matt Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -39,7 +39,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_node.c,v 1.55 2002/10/01 14:59:21 christos Exp $"); __KERNEL_RCSID(0, "$NetBSD: nfs_node.c,v 1.56 2002/12/01 23:02:10 matt Exp $");
#include "opt_nfs.h" #include "opt_nfs.h"
@ -63,7 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: nfs_node.c,v 1.55 2002/10/01 14:59:21 christos Exp $
#include <nfs/nqnfs.h> #include <nfs/nqnfs.h>
#include <nfs/nfs_var.h> #include <nfs/nfs_var.h>
LIST_HEAD(nfsnodehashhead, nfsnode) *nfsnodehashtbl; struct nfsnodehashhead *nfsnodehashtbl;
u_long nfsnodehash; u_long nfsnodehash;
struct lock nfs_hashlock; struct lock nfs_hashlock;

View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_nqlease.c,v 1.41 2002/10/21 12:52:33 yamt Exp $ */ /* $NetBSD: nfs_nqlease.c,v 1.42 2002/12/01 23:02:10 matt Exp $ */
/* /*
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -53,7 +53,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_nqlease.c,v 1.41 2002/10/21 12:52:33 yamt Exp $"); __KERNEL_RCSID(0, "$NetBSD: nfs_nqlease.c,v 1.42 2002/12/01 23:02:10 matt Exp $");
#include "fs_nfs.h" #include "fs_nfs.h"
#include "opt_nfs.h" #include "opt_nfs.h"
@ -131,8 +131,8 @@ const int nqnfs_piggy[NFS_NPROCS] = {
0, 0,
}; };
extern nfstype nfsv2_type[9]; extern const nfstype nfsv2_type[9];
extern nfstype nfsv3_type[9]; extern const nfstype nfsv3_type[9];
extern struct nfssvc_sock *nfs_udpsock; extern struct nfssvc_sock *nfs_udpsock;
#ifdef ISO #ifdef ISO
extern struct nfssvc_sock *nfs_cltpsock extern struct nfssvc_sock *nfs_cltpsock

View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_serv.c,v 1.65 2002/09/27 19:30:46 bouyer Exp $ */ /* $NetBSD: nfs_serv.c,v 1.66 2002/12/01 23:02:10 matt Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -59,7 +59,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.65 2002/09/27 19:30:46 bouyer Exp $"); __KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.66 2002/12/01 23:02:10 matt Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -91,8 +91,8 @@ extern u_int32_t nfs_xdrneg1;
extern u_int32_t nfs_false, nfs_true; extern u_int32_t nfs_false, nfs_true;
extern enum vtype nv3tov_type[8]; extern enum vtype nv3tov_type[8];
extern struct nfsstats nfsstats; extern struct nfsstats nfsstats;
extern nfstype nfsv2_type[9]; extern const nfstype nfsv2_type[9];
extern nfstype nfsv3_type[9]; extern const nfstype nfsv3_type[9];
int nfsrvw_procrastinate = NFS_GATHERDELAY * 1000; int nfsrvw_procrastinate = NFS_GATHERDELAY * 1000;
/* /*

View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_socket.c,v 1.76 2002/09/27 15:38:00 provos Exp $ */ /* $NetBSD: nfs_socket.c,v 1.77 2002/12/01 23:02:10 matt Exp $ */
/* /*
* Copyright (c) 1989, 1991, 1993, 1995 * Copyright (c) 1989, 1991, 1993, 1995
@ -43,7 +43,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.76 2002/09/27 15:38:00 provos Exp $"); __KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.77 2002/12/01 23:02:10 matt Exp $");
#include "fs_nfs.h" #include "fs_nfs.h"
#include "opt_nfs.h" #include "opt_nfs.h"
@ -112,7 +112,7 @@ extern u_int32_t rpc_reply, rpc_msgdenied, rpc_mismatch, rpc_vers,
rpc_auth_kerb; rpc_auth_kerb;
extern u_int32_t nfs_prog, nqnfs_prog; extern u_int32_t nfs_prog, nqnfs_prog;
extern time_t nqnfsstarttime; extern time_t nqnfsstarttime;
extern int nfsv3_procid[NFS_NPROCS]; extern const int nfsv3_procid[NFS_NPROCS];
extern int nfs_ticks; extern int nfs_ticks;
/* /*

View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_srvcache.c,v 1.19 2001/11/10 10:59:10 lukem Exp $ */ /* $NetBSD: nfs_srvcache.c,v 1.20 2002/12/01 23:02:11 matt Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -45,7 +45,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_srvcache.c,v 1.19 2001/11/10 10:59:10 lukem Exp $"); __KERNEL_RCSID(0, "$NetBSD: nfs_srvcache.c,v 1.20 2002/12/01 23:02:11 matt Exp $");
#include "opt_iso.h" #include "opt_iso.h"
@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: nfs_srvcache.c,v 1.19 2001/11/10 10:59:10 lukem Exp
#include <nfs/nfs_var.h> #include <nfs/nfs_var.h>
extern struct nfsstats nfsstats; extern struct nfsstats nfsstats;
extern int nfsv2_procid[NFS_NPROCS]; extern const int nfsv2_procid[NFS_NPROCS];
long numnfsrvcache, desirednfsrvcache = NFSRVCACHESIZ; long numnfsrvcache, desirednfsrvcache = NFSRVCACHESIZ;
#define NFSRCHASH(xid) \ #define NFSRCHASH(xid) \

View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_subs.c,v 1.106 2002/10/23 09:14:50 jdolecek Exp $ */ /* $NetBSD: nfs_subs.c,v 1.107 2002/12/01 23:02:11 matt Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -74,7 +74,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.106 2002/10/23 09:14:50 jdolecek Exp $"); __KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.107 2002/12/01 23:02:11 matt Exp $");
#include "fs_nfs.h" #include "fs_nfs.h"
#include "opt_nfs.h" #include "opt_nfs.h"
@ -580,7 +580,6 @@ extern const int nqnfs_piggy[NFS_NPROCS];
extern struct nfsnodehashhead *nfsnodehashtbl; extern struct nfsnodehashhead *nfsnodehashtbl;
extern u_long nfsnodehash; extern u_long nfsnodehash;
LIST_HEAD(nfsnodehashhead, nfsnode);
u_long nfsdirhashmask; u_long nfsdirhashmask;
int nfs_webnamei __P((struct nameidata *, struct vnode *, struct proc *)); int nfs_webnamei __P((struct nameidata *, struct vnode *, struct proc *));

View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_vnops.c,v 1.156 2002/10/23 09:14:51 jdolecek Exp $ */ /* $NetBSD: nfs_vnops.c,v 1.157 2002/12/01 23:02:11 matt Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -43,7 +43,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.156 2002/10/23 09:14:51 jdolecek Exp $"); __KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.157 2002/12/01 23:02:11 matt Exp $");
#include "opt_nfs.h" #include "opt_nfs.h"
#include "opt_uvmhist.h" #include "opt_uvmhist.h"
@ -267,7 +267,7 @@ const struct vnodeopv_desc fifo_nfsv2nodeop_opv_desc =
*/ */
extern u_int32_t nfs_true, nfs_false; extern u_int32_t nfs_true, nfs_false;
extern u_int32_t nfs_xdrneg1; extern u_int32_t nfs_xdrneg1;
extern nfstype nfsv3_type[9]; extern const nfstype nfsv3_type[9];
struct proc *nfs_iodwant[NFS_MAXASYNCDAEMON]; struct proc *nfs_iodwant[NFS_MAXASYNCDAEMON];
struct nfsmount *nfs_iodmount[NFS_MAXASYNCDAEMON]; struct nfsmount *nfs_iodmount[NFS_MAXASYNCDAEMON];

View File

@ -1,4 +1,4 @@
/* $NetBSD: nfsnode.h,v 1.36 2002/10/23 09:14:52 jdolecek Exp $ */ /* $NetBSD: nfsnode.h,v 1.37 2002/12/01 23:02:11 matt Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -146,6 +146,7 @@ struct nfsnode {
struct ucred *n_rcred; struct ucred *n_rcred;
struct ucred *n_wcred; struct ucred *n_wcred;
}; };
LIST_HEAD(nfsnodehashhead, nfsnode);
/* /*
* Values for n_commitflags * Values for n_commitflags