summaryrefslogtreecommitdiffstats
path: root/sys/fs
diff options
context:
space:
mode:
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/cd9660/cd9660_vnops.c2
-rw-r--r--sys/fs/fdescfs/fdesc_vfsops.c2
-rw-r--r--sys/fs/fdescfs/fdesc_vnops.c2
-rw-r--r--sys/fs/fifofs/fifo_vnops.c2
-rw-r--r--sys/fs/nullfs/null_subr.c2
-rw-r--r--sys/fs/nullfs/null_vfsops.c2
-rw-r--r--sys/fs/nullfs/null_vnops.c2
-rw-r--r--sys/fs/portalfs/portal_vfsops.c2
-rw-r--r--sys/fs/portalfs/portal_vnops.c2
-rw-r--r--sys/fs/procfs/procfs_ctl.c2
-rw-r--r--sys/fs/procfs/procfs_dbregs.c2
-rw-r--r--sys/fs/procfs/procfs_fpregs.c2
-rw-r--r--sys/fs/procfs/procfs_map.c2
-rw-r--r--sys/fs/procfs/procfs_mem.c2
-rw-r--r--sys/fs/procfs/procfs_note.c2
-rw-r--r--sys/fs/procfs/procfs_regs.c2
-rw-r--r--sys/fs/procfs/procfs_rlimit.c2
-rw-r--r--sys/fs/procfs/procfs_status.c2
-rw-r--r--sys/fs/procfs/procfs_subr.c2
-rw-r--r--sys/fs/procfs/procfs_type.c2
-rw-r--r--sys/fs/procfs/procfs_vfsops.c2
-rw-r--r--sys/fs/procfs/procfs_vnops.c2
-rw-r--r--sys/fs/umapfs/umap_subr.c2
-rw-r--r--sys/fs/umapfs/umap_vfsops.c2
-rw-r--r--sys/fs/umapfs/umap_vnops.c4
-rw-r--r--sys/fs/unionfs/union_subr.c2
-rw-r--r--sys/fs/unionfs/union_vfsops.c2
-rw-r--r--sys/fs/unionfs/union_vnops.c2
28 files changed, 29 insertions, 29 deletions
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index e8eb934..702823e 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -48,7 +48,7 @@
#include <sys/buf.h>
#include <sys/mount.h>
#include <sys/vnode.h>
-#include <miscfs/fifofs/fifo.h>
+#include <fs/fifofs/fifo.h>
#include <sys/malloc.h>
#include <sys/dirent.h>
#include <sys/unistd.h>
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c
index a758bb8..1bb1f71 100644
--- a/sys/fs/fdescfs/fdesc_vfsops.c
+++ b/sys/fs/fdescfs/fdesc_vfsops.c
@@ -54,7 +54,7 @@
#include <sys/socket.h>
#include <sys/vnode.h>
-#include <miscfs/fdesc/fdesc.h>
+#include <fs/fdescfs/fdesc.h>
static MALLOC_DEFINE(M_FDESCMNT, "FDESC mount", "FDESC mount structure");
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index 065e0a8..cb90212 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -58,7 +58,7 @@
#include <sys/stat.h>
#include <sys/vnode.h>
-#include <miscfs/fdesc/fdesc.h>
+#include <fs/fdescfs/fdesc.h>
#define FDL_WANT 0x01
#define FDL_LOCKED 0x02
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index 3cd5425..2a3078f 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -49,7 +49,7 @@
#include <sys/event.h>
#include <sys/poll.h>
#include <sys/un.h>
-#include <miscfs/fifofs/fifo.h>
+#include <fs/fifofs/fifo.h>
/*
* This structure is associated with the FIFO vnode and stores
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c
index 88f1584..97aa492 100644
--- a/sys/fs/nullfs/null_subr.c
+++ b/sys/fs/nullfs/null_subr.c
@@ -47,7 +47,7 @@
#include <sys/proc.h>
#include <sys/vnode.h>
-#include <miscfs/nullfs/null.h>
+#include <fs/nullfs/null.h>
#define LOG2_SIZEVNODE 7 /* log2(sizeof struct vnode) */
#define NNULLNODECACHE 16
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 8573398..e2287ef 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -54,7 +54,7 @@
#include <sys/proc.h>
#include <sys/vnode.h>
-#include <miscfs/nullfs/null.h>
+#include <fs/nullfs/null.h>
static MALLOC_DEFINE(M_NULLFSMNT, "NULLFS mount", "NULLFS mount structure");
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index d37ef73..32b9665 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -185,7 +185,7 @@
#include <sys/sysctl.h>
#include <sys/vnode.h>
-#include <miscfs/nullfs/null.h>
+#include <fs/nullfs/null.h>
#include <vm/vm.h>
#include <vm/vm_extern.h>
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c
index 423cd38..7178599 100644
--- a/sys/fs/portalfs/portal_vfsops.c
+++ b/sys/fs/portalfs/portal_vfsops.c
@@ -57,7 +57,7 @@
#include <sys/socketvar.h>
#include <sys/vnode.h>
-#include <miscfs/portal/portal.h>
+#include <fs/portalfs/portal.h>
static MALLOC_DEFINE(M_PORTALFSMNT, "PORTAL mount", "PORTAL mount structure");
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index b53c4ca..726873e 100644
--- a/sys/fs/portalfs/portal_vnops.c
+++ b/sys/fs/portalfs/portal_vnops.c
@@ -61,7 +61,7 @@
#include <sys/socketvar.h>
#include <sys/un.h>
#include <sys/unpcb.h>
-#include <miscfs/portal/portal.h>
+#include <fs/portalfs/portal.h>
static int portal_fileid = PORTAL_ROOTFILEID+1;
diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c
index 5818758..a507349 100644
--- a/sys/fs/procfs/procfs_ctl.c
+++ b/sys/fs/procfs/procfs_ctl.c
@@ -48,7 +48,7 @@
#include <sys/sx.h>
#include <sys/vnode.h>
-#include <miscfs/procfs/procfs.h>
+#include <fs/procfs/procfs.h>
#include <vm/vm.h>
diff --git a/sys/fs/procfs/procfs_dbregs.c b/sys/fs/procfs/procfs_dbregs.c
index d80e28c..cd64a34 100644
--- a/sys/fs/procfs/procfs_dbregs.c
+++ b/sys/fs/procfs/procfs_dbregs.c
@@ -52,7 +52,7 @@
#include <machine/reg.h>
-#include <miscfs/procfs/procfs.h>
+#include <fs/procfs/procfs.h>
#include <vm/vm.h>
diff --git a/sys/fs/procfs/procfs_fpregs.c b/sys/fs/procfs/procfs_fpregs.c
index 7e2ff52..c71e444 100644
--- a/sys/fs/procfs/procfs_fpregs.c
+++ b/sys/fs/procfs/procfs_fpregs.c
@@ -49,7 +49,7 @@
#include <machine/reg.h>
-#include <miscfs/procfs/procfs.h>
+#include <fs/procfs/procfs.h>
#include <vm/vm.h>
diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c
index 5c21993..e974b04 100644
--- a/sys/fs/procfs/procfs_map.c
+++ b/sys/fs/procfs/procfs_map.c
@@ -46,7 +46,7 @@
#include <sys/proc.h>
#include <sys/vnode.h>
-#include <miscfs/procfs/procfs.h>
+#include <fs/procfs/procfs.h>
#include <vm/vm.h>
#include <vm/pmap.h>
diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c
index 1e28870..b8c60d6 100644
--- a/sys/fs/procfs/procfs_mem.c
+++ b/sys/fs/procfs/procfs_mem.c
@@ -54,7 +54,7 @@
#include <sys/user.h>
#include <sys/vnode.h>
-#include <miscfs/procfs/procfs.h>
+#include <fs/procfs/procfs.h>
#include <vm/vm.h>
#include <vm/vm_param.h>
diff --git a/sys/fs/procfs/procfs_note.c b/sys/fs/procfs/procfs_note.c
index 273010b..c669654 100644
--- a/sys/fs/procfs/procfs_note.c
+++ b/sys/fs/procfs/procfs_note.c
@@ -41,7 +41,7 @@
#include <sys/param.h>
#include <sys/vnode.h>
-#include <miscfs/procfs/procfs.h>
+#include <fs/procfs/procfs.h>
int
procfs_donote(curp, p, pfs, uio)
diff --git a/sys/fs/procfs/procfs_regs.c b/sys/fs/procfs/procfs_regs.c
index ba58517..c7eeb1c 100644
--- a/sys/fs/procfs/procfs_regs.c
+++ b/sys/fs/procfs/procfs_regs.c
@@ -52,7 +52,7 @@
#include <vm/vm.h>
#include <vm/vm_extern.h>
-#include <miscfs/procfs/procfs.h>
+#include <fs/procfs/procfs.h>
int
procfs_doregs(curp, p, pfs, uio)
diff --git a/sys/fs/procfs/procfs_rlimit.c b/sys/fs/procfs/procfs_rlimit.c
index 361f6f6..f74874d 100644
--- a/sys/fs/procfs/procfs_rlimit.c
+++ b/sys/fs/procfs/procfs_rlimit.c
@@ -52,7 +52,7 @@
#include <sys/resourcevar.h>
#include <sys/resource.h>
#include <sys/types.h>
-#include <miscfs/procfs/procfs.h>
+#include <fs/procfs/procfs.h>
int
diff --git a/sys/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c
index b29b4a9..9620be5 100644
--- a/sys/fs/procfs/procfs_status.c
+++ b/sys/fs/procfs/procfs_status.c
@@ -56,7 +56,7 @@
#include <vm/pmap.h>
#include <vm/vm_param.h>
-#include <miscfs/procfs/procfs.h>
+#include <fs/procfs/procfs.h>
#define DOCHECK() do { if (ps >= psbuf+sizeof(psbuf)) goto bailout; } while (0)
int
diff --git a/sys/fs/procfs/procfs_subr.c b/sys/fs/procfs/procfs_subr.c
index 64adecb..36d366f 100644
--- a/sys/fs/procfs/procfs_subr.c
+++ b/sys/fs/procfs/procfs_subr.c
@@ -50,7 +50,7 @@
#include <sys/sysctl.h>
#include <sys/vnode.h>
-#include <miscfs/procfs/procfs.h>
+#include <fs/procfs/procfs.h>
static struct pfsnode *pfshead;
static int pfsvplock;
diff --git a/sys/fs/procfs/procfs_type.c b/sys/fs/procfs/procfs_type.c
index cb2a45f..3919c88 100644
--- a/sys/fs/procfs/procfs_type.c
+++ b/sys/fs/procfs/procfs_type.c
@@ -42,7 +42,7 @@
#include <sys/proc.h>
#include <sys/sysent.h>
#include <sys/vnode.h>
-#include <miscfs/procfs/procfs.h>
+#include <fs/procfs/procfs.h>
int
procfs_dotype(curp, p, pfs, uio)
diff --git a/sys/fs/procfs/procfs_vfsops.c b/sys/fs/procfs/procfs_vfsops.c
index 91daf9d..c0d7add 100644
--- a/sys/fs/procfs/procfs_vfsops.c
+++ b/sys/fs/procfs/procfs_vfsops.c
@@ -49,7 +49,7 @@
#include <sys/proc.h>
#include <sys/mount.h>
#include <sys/vnode.h>
-#include <miscfs/procfs/procfs.h>
+#include <fs/procfs/procfs.h>
static int procfs_mount __P((struct mount *mp, char *path, caddr_t data,
struct nameidata *ndp, struct proc *p));
diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c
index dbdafc8..a054eb9 100644
--- a/sys/fs/procfs/procfs_vnops.c
+++ b/sys/fs/procfs/procfs_vnops.c
@@ -66,7 +66,7 @@
#include <vm/vm_zone.h>
-#include <miscfs/procfs/procfs.h>
+#include <fs/procfs/procfs.h>
static int procfs_access __P((struct vop_access_args *));
static int procfs_badop __P((void));
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,
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index ce38e2d..52a5483 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -58,7 +58,7 @@
#include <vm/vm_zone.h>
#include <vm/vm_object.h> /* for vm cache coherency */
-#include <miscfs/union/union.h>
+#include <fs/unionfs/union.h>
#include <sys/proc.h>
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index d38f31e..5a5af5d 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -51,7 +51,7 @@
#include <sys/namei.h>
#include <sys/malloc.h>
#include <sys/filedesc.h>
-#include <miscfs/union/union.h>
+#include <fs/unionfs/union.h>
static MALLOC_DEFINE(M_UNIONFSMNT, "UNION mount", "UNION mount structure");
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 3402825..b5abfa7 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -51,7 +51,7 @@
#include <sys/buf.h>
#include <sys/lock.h>
#include <sys/sysctl.h>
-#include <miscfs/union/union.h>
+#include <fs/unionfs/union.h>
#include <vm/vm.h>
#include <vm/vnode_pager.h>
OpenPOWER on IntegriCloud