- FDESC, FIFO, NULL, PORTAL, PROC, UMAP and UNION file

  systems were repo-copied from sys/miscfs to sys/fs.

- Renamed the following file systems and their modules:
  fdesc -> fdescfs, portal -> portalfs, union -> unionfs.

- Renamed corresponding kernel options:
  FDESC -> FDESCFS, PORTAL -> PORTALFS, UNION -> UNIONFS.

- Install header files for the above file systems.

- Removed bogus -I${.CURDIR}/../../sys CFLAGS from userland
  Makefiles.

3 files changed, 4 insertions, 4 deletions

diff --git a/sys/fs/umapfs/umap_subr.c b/sys/fs/umapfs/umap_subr.c
index 1f94d50..afcaceb 100644
--- a/sys/fs/umapfs/umap_subr.c
+++ b/sys/fs/umapfs/umap_subr.c
@@ -45,7 +45,7 @@
 #include <sys/proc.h>
 #include <sys/vnode.h>
 
-#include <miscfs/umapfs/umap.h>
+#include <fs/umapfs/umap.h>
 
 #define LOG2_SIZEVNODE 7		/* log2(sizeof struct vnode) */
 #define	NUMAPNODECACHE 16
diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index 280ded9..b8dc4c9 100644
--- a/sys/fs/umapfs/umap_vfsops.c
+++ b/sys/fs/umapfs/umap_vfsops.c
@@ -53,7 +53,7 @@
 #include <sys/namei.h>
 #include <sys/vnode.h>
 
-#include <miscfs/umapfs/umap.h>
+#include <fs/umapfs/umap.h>
 
 static MALLOC_DEFINE(M_UMAPFSMNT, "UMAP mount", "UMAP mount structure");
 
diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c
index 5bf29c8..b73ff2c 100644
--- a/sys/fs/umapfs/umap_vnops.c
+++ b/sys/fs/umapfs/umap_vnops.c
@@ -51,8 +51,8 @@
 #include <sys/sysctl.h>
 #include <sys/vnode.h>
 
-#include <miscfs/umapfs/umap.h>
-#include <miscfs/nullfs/null.h>
+#include <fs/umapfs/umap.h>
+#include <fs/nullfs/null.h>
 
 static int umap_bug_bypass = 0;   /* for debugging: enables bypass printf'ing */
 SYSCTL_INT(_debug, OID_AUTO, umapfs_bug_bypass, CTLFLAG_RW,