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/fstypes.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/sys/fstypes.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -p -r1.2.2.5 -r1.2.2.6
--- src/sys/sys/fstypes.h	2004/09/21 13:38:46	1.2.2.5
+++ src/sys/sys/fstypes.h	2005/11/10 14:12:12	1.2.2.6
@@ -1,4 +1,4 @@
-/*	$NetBSD: fstypes.h,v 1.2.2.5 2004/09/21 13:38:46 skrll Exp $	*/
+/*	$NetBSD: fstypes.h,v 1.2.2.6 2005/11/10 14:12:12 skrll Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993
@@ -70,7 +70,7 @@ typedef struct fhandle	fhandle_t;
  * one of the __MNT_UNUSED flags.
  */
 
-#define	__MNT_UNUSED3	0x00800000
+#define	__MNT_UNUSED3	0x00020000
 #define	__MNT_UNUSED4	0x00200000
 #define	__MNT_UNUSED5	0x01000000
 #define	__MNT_UNUSED6	0x02000000
@@ -84,6 +84,7 @@ typedef struct fhandle	fhandle_t;
 #define	MNT_ASYNC	0x00000040	/* file system written asynchronously */
 #define	MNT_NOCOREDUMP	0x00008000	/* don't write core dumps to this FS */
 #define MNT_IGNORE	0x00100000	/* don't show entry in df */
+#define	MNT_MAGICLINKS	0x00800000	/* interpret symlinks for magic names */
 #define MNT_NOATIME	0x04000000	/* Never update access times in fs */
 #define MNT_SYMPERM	0x20000000	/* recognize symlink permission */
 #define MNT_NODEVMTIME	0x40000000	/* Never update mod times for devs */
@@ -102,6 +103,7 @@ typedef struct fhandle	fhandle_t;
 	{ MNT_NOATIME,		0,	"noatime" }, \
 	{ MNT_SYMPERM,		0,	"symperm" }, \
 	{ MNT_NODEVMTIME,	0,	"nodevmtime" }, \
+	{ MNT_MAGICLINKS,	0,	"magiclinks" }, \
 	{ MNT_SOFTDEP,		0,	"soft dependencies" },
 
 /*
@@ -139,27 +141,42 @@ typedef struct fhandle	fhandle_t;
 /*
  * Mask of flags that are visible to statvfs()
  */
-#define	MNT_VISFLAGMASK	\
-    (MNT_SOFTDEP | MNT_NODEVMTIME | MNT_SYMPERM | MNT_EXPUBLIC | \
-     MNT_EXNORESPORT | MNT_NOATIME | \
+#define	MNT_VISFLAGMASK	( \
+     MNT_RDONLY | \
+     MNT_SYNCHRONOUS | \
+     MNT_NOEXEC | \
+     MNT_NOSUID | \
+     MNT_NODEV | \
+     MNT_UNION | \
+     MNT_ASYNC | \
+     MNT_NOCOREDUMP | \
      MNT_IGNORE | \
-     MNT_NOCOREDUMP | MNT_ROOTFS | MNT_QUOTA | MNT_LOCAL | \
-     MNT_EXKERB | MNT_EXPORTANON | MNT_DEFEXPORTED | MNT_EXPORTED | \
-     MNT_EXRDONLY | MNT_ASYNC | MNT_UNION | MNT_NODEV | \
-     MNT_NOSUID | MNT_NOEXEC | MNT_SYNCHRONOUS | MNT_RDONLY)
+     MNT_MAGICLINKS | \
+     MNT_NOATIME | \
+     MNT_SYMPERM | \
+     MNT_NODEVMTIME | \
+     MNT_SOFTDEP | \
+     MNT_EXRDONLY | \
+     MNT_EXPORTED | \
+     MNT_DEFEXPORTED | \
+     MNT_EXPORTANON | \
+     MNT_EXKERB | \
+     MNT_EXNORESPORT | \
+     MNT_EXPUBLIC | \
+     MNT_LOCAL | \
+     MNT_QUOTA | \
+     MNT_ROOTFS)
 
 /*
  * External filesystem control flags.
  */
 #define	MNT_UPDATE	0x00010000	/* not a real mount, just an update */
-#define	MNT_DELEXPORT	0x00020000	/* delete export host lists */
 #define	MNT_RELOAD	0x00040000	/* reload filesystem data */
 #define	MNT_FORCE	0x00080000	/* force unmount or readonly change */
 #define	MNT_GETARGS	0x00400000	/* retrieve file system specific args */
 
 #define __MNT_EXTERNAL_FLAGS \
 	{ MNT_UPDATE,		1,	"being updated" }, \
-	{ MNT_DELEXPORT,	1,	"delete export list" }, \
 	{ MNT_RELOAD,		1,	"reload filesystem data" }, \
 	{ MNT_FORCE,		1,	"force unmount or readonly change" }, \
 	{ MNT_GETARGS,		1,	"retrieve mount arguments" },
@@ -196,7 +213,7 @@ typedef struct fhandle	fhandle_t;
 	"\33MNT_NOATIME" \
 	"\32MNT_UNUSED6" \
 	"\31MNT_UNUSED5" \
-	"\30MNT_UNUSED3" \
+	"\30MNT_MAGICLINKS" \
 	"\27MNT_GETARGS" \
 	"\26MNT_UNUSED4" \
 	"\25MNT_IGNORE" \