Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/sys/mount.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/sys/mount.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.74.4.4
retrieving revision 1.75
diff -u -p -r1.74.4.4 -r1.75
--- src/sys/sys/mount.h	1999/08/02 22:55:59	1.74.4.4
+++ src/sys/sys/mount.h	1999/05/06 15:29:23	1.75
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount.h,v 1.74.4.4 1999/08/02 22:55:59 thorpej Exp $	*/
+/*	$NetBSD: mount.h,v 1.75 1999/05/06 15:29:23 christos Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993
@@ -40,9 +40,6 @@
 
 #ifndef _KERNEL
 #include <sys/ucred.h>
-#if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
-#include <sys/stat.h>
-#endif /* !_POSIX_C_SOURCE */
 #endif
 #include <sys/queue.h>
 #include <sys/lock.h>
@@ -126,11 +123,8 @@ struct mount {
 	struct lock	mnt_lock;		/* mount structure lock */
 	int		mnt_flag;		/* flags */
 	int		mnt_maxsymlinklen;	/* max size of short symlink */
-	int		mnt_fs_bshift;		/* offset shift for lblkno */
-	int		mnt_dev_bshift;		/* sector shift of device */
 	struct statfs	mnt_stat;		/* cache of filesystem stats */
 	qaddr_t		mnt_data;		/* private data */
-	int		mnt_wcnt;		/* count of vfs_busy waiters */
 };
 
 /*
@@ -203,7 +197,7 @@ struct mount {
  * past the mount point.  This keeps the subtree stable during mounts
  * and unmounts.
  */
-#define	MNT_GONE	0x00200000	/* filesystem is gone.. */
+#define	MNT_MWAIT	0x00200000	/* waiting for unmount to finish */
 #define MNT_UNMOUNT	0x01000000	/* unmount in progress */
 #define MNT_WANTRDWR	0x02000000	/* upgrade to read/write requested */
 
@@ -455,11 +449,6 @@ int	getmntinfo __P((struct statfs **, in
 int	mount __P((const char *, const char *, int, void *));
 int	statfs __P((const char *, struct statfs *));
 int	unmount __P((const char *, int));
-#if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
-int	fhopen __P((const fhandle_t *, int));
-int	fhstat __P((const fhandle_t *, struct stat *));
-int	fhstatfs __P((const fhandle_t *, struct statfs *));
-#endif /* !_POSIX_C_SOURCE */
 __END_DECLS
 
 #endif /* _KERNEL */