Instantiate `nfs_mount_type' in a standard file so that it is present

when nfs is an LKM.  Declare it in a header file.  Don't forget to use
it in non-Lite2 code.  Initialize it to -1 instead of to 0, since 0
will soon be the mount type number for the first vfs loaded.

NetBSD uses strcmp() to avoid this ugly global.

9 files changed, 13 insertions, 16 deletions

diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 1c1a427..ae94741 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.160 1998/08/12 20:17:42 bde Exp $
+ * $Id: vfs_subr.c,v 1.161 1998/08/29 13:13:10 bde Exp $
  */
 
 /*
@@ -119,6 +119,7 @@ struct mntlist mountlist;	/* mounted filesystem list */
 struct simplelock mountlist_slock;
 static struct simplelock mntid_slock;
 struct simplelock mntvnode_slock;
+int	nfs_mount_type = -1;
 static struct simplelock vnode_free_list_slock;
 static struct simplelock spechash_slock;
 struct nfs_public nfs_pub;	/* publicly exported FS */
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 1c1a427..ae94741 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.160 1998/08/12 20:17:42 bde Exp $
+ * $Id: vfs_subr.c,v 1.161 1998/08/29 13:13:10 bde Exp $
  */
 
 /*
@@ -119,6 +119,7 @@ struct mntlist mountlist;	/* mounted filesystem list */
 struct simplelock mountlist_slock;
 static struct simplelock mntid_slock;
 struct simplelock mntvnode_slock;
+int	nfs_mount_type = -1;
 static struct simplelock vnode_free_list_slock;
 static struct simplelock spechash_slock;
 struct nfs_public nfs_pub;	/* publicly exported FS */
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index 0ccac22..d4d9280 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.62 1998/06/14 15:52:00 bde Exp $
+ * $Id: nfs_subs.c,v 1.63 1998/06/21 12:50:12 bde Exp $
  */
 
 /*
@@ -98,7 +98,6 @@ enum vtype nv3tov_type[8]= {
 	VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO
 };
 
-int nfs_mount_type;
 int nfs_ticks;
 
 struct nfs_reqq nfs_reqq;
diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c
index 5d15e0e..a9464dc 100644
--- a/sys/nfs/nfs_nqlease.c
+++ b/sys/nfs/nfs_nqlease.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_nqlease.c	8.9 (Berkeley) 5/20/95
- * $Id: nfs_nqlease.c,v 1.36 1998/05/31 17:27:46 peter Exp $
+ * $Id: nfs_nqlease.c,v 1.37 1998/05/31 20:08:52 peter Exp $
  */
 
 
@@ -137,7 +137,6 @@ extern nfstype nfsv3_type[9];
 extern struct nfssvc_sock *nfs_udpsock, *nfs_cltpsock;
 extern int nfsd_waiting;
 extern struct nfsstats nfsstats;
-extern int nfs_mount_type;
 
 #define TRUE	1
 #define	FALSE	0
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 0ccac22..d4d9280 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.62 1998/06/14 15:52:00 bde Exp $
+ * $Id: nfs_subs.c,v 1.63 1998/06/21 12:50:12 bde Exp $
  */
 
 /*
@@ -98,7 +98,6 @@ enum vtype nv3tov_type[8]= {
 	VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO
 };
 
-int nfs_mount_type;
 int nfs_ticks;
 
 struct nfs_reqq nfs_reqq;
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 0ccac22..d4d9280 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.62 1998/06/14 15:52:00 bde Exp $
+ * $Id: nfs_subs.c,v 1.63 1998/06/21 12:50:12 bde Exp $
  */
 
 /*
@@ -98,7 +98,6 @@ enum vtype nv3tov_type[8]= {
 	VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO
 };
 
-int nfs_mount_type;
 int nfs_ticks;
 
 struct nfs_reqq nfs_reqq;
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index 0ccac22..d4d9280 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.62 1998/06/14 15:52:00 bde Exp $
+ * $Id: nfs_subs.c,v 1.63 1998/06/21 12:50:12 bde Exp $
  */
 
 /*
@@ -98,7 +98,6 @@ enum vtype nv3tov_type[8]= {
 	VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO
 };
 
-int nfs_mount_type;
 int nfs_ticks;
 
 struct nfs_reqq nfs_reqq;
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index b63258e..d004be2 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mount.h	8.21 (Berkeley) 5/20/95
- *	$Id: mount.h,v 1.64 1998/09/02 17:03:49 bde Exp $
+ *	$Id: mount.h,v 1.65 1998/09/02 17:25:51 bde Exp $
  */
 
 #ifndef _SYS_MOUNT_H_
@@ -326,6 +326,7 @@ struct ovfsconf {
 MALLOC_DECLARE(M_MOUNT);
 #endif
 extern int maxvfsconf;		/* highest defined filesystem type */
+extern int nfs_mount_type;	/* vfc_typenum for nfs, or -1 */
 extern struct vfsconf *vfsconf;	/* head of list of filesystem types */
 
 /*
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index ec6f9a8..f795de2 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vnode_pager.c	7.5 (Berkeley) 4/20/91
- *	$Id: vnode_pager.c,v 1.96 1998/08/25 13:47:37 luoqi Exp $
+ *	$Id: vnode_pager.c,v 1.97 1998/09/04 08:06:57 dfr Exp $
  */
 
 /*
@@ -603,8 +603,7 @@ vnode_pager_generic_getpages(vp, m, bytecount, reqpage)
 		 * blocksize, but it can handle large reads itself.
 		 */
 	} else if ((PAGE_SIZE / bsize) > 1 &&
-	    (vp->v_mount->mnt_stat.f_type != MOUNT_NFS)) {
-
+	    (vp->v_mount->mnt_stat.f_type != nfs_mount_type)) {
 		for (i = 0; i < count; i++) {
 			if (i != reqpage) {
 				vnode_pager_freepage(m[i]);