- sys/n[tw]fs moved to sys/fs/n[tw]fs

- /usr/include/n[tw]fs moved to /usr/include/fs/n[tw]fs

12 files changed, 41 insertions, 41 deletions

diff --git a/sys/fs/ntfs/ntfs_compr.c b/sys/fs/ntfs/ntfs_compr.c
index 1d22b54618f9..3ae675b35f50 100644
--- a/sys/fs/ntfs/ntfs_compr.c
+++ b/sys/fs/ntfs/ntfs_compr.c
@@ -39,8 +39,8 @@
 #include <miscfs/specfs/specdev.h>
 #endif
 
-#include <ntfs/ntfs.h>
-#include <ntfs/ntfs_compr.h>
+#include <fs/ntfs/ntfs.h>
+#include <fs/ntfs/ntfs_compr.h>
 
 #define GET_UINT16(addr)	(*((u_int16_t *)(addr)))
 
diff --git a/sys/fs/ntfs/ntfs_ihash.c b/sys/fs/ntfs/ntfs_ihash.c
index fea648c38747..889274106767 100644
--- a/sys/fs/ntfs/ntfs_ihash.c
+++ b/sys/fs/ntfs/ntfs_ihash.c
@@ -45,9 +45,9 @@
 #include <sys/mount.h>
 #include <sys/mutex.h>
 
-#include <ntfs/ntfs.h>
-#include <ntfs/ntfs_inode.h>
-#include <ntfs/ntfs_ihash.h>
+#include <fs/ntfs/ntfs.h>
+#include <fs/ntfs/ntfs_inode.h>
+#include <fs/ntfs/ntfs_ihash.h>
 
 MALLOC_DEFINE(M_NTFSNTHASH, "NTFS nthash", "NTFS ntnode hash tables");
 
diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c
index c55cd0a7ec4d..615840761a09 100644
--- a/sys/fs/ntfs/ntfs_subr.c
+++ b/sys/fs/ntfs/ntfs_subr.c
@@ -46,13 +46,13 @@
 #endif
 
 /* #define NTFS_DEBUG 1 */
-#include <ntfs/ntfs.h>
-#include <ntfs/ntfsmount.h>
-#include <ntfs/ntfs_inode.h>
-#include <ntfs/ntfs_vfsops.h>
-#include <ntfs/ntfs_subr.h>
-#include <ntfs/ntfs_compr.h>
-#include <ntfs/ntfs_ihash.h>
+#include <fs/ntfs/ntfs.h>
+#include <fs/ntfs/ntfsmount.h>
+#include <fs/ntfs/ntfs_inode.h>
+#include <fs/ntfs/ntfs_vfsops.h>
+#include <fs/ntfs/ntfs_subr.h>
+#include <fs/ntfs/ntfs_compr.h>
+#include <fs/ntfs/ntfs_ihash.h>
 
 #if defined(__FreeBSD__)
 MALLOC_DEFINE(M_NTFSNTVATTR, "NTFS vattr", "NTFS file attribute information");
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index 526decd0f00d..42a4fcbfa83c 100644
--- a/sys/fs/ntfs/ntfs_vfsops.c
+++ b/sys/fs/ntfs/ntfs_vfsops.c
@@ -60,12 +60,12 @@
 #endif
 
 /*#define NTFS_DEBUG 1*/
-#include <ntfs/ntfs.h>
-#include <ntfs/ntfs_inode.h>
-#include <ntfs/ntfs_subr.h>
-#include <ntfs/ntfs_vfsops.h>
-#include <ntfs/ntfs_ihash.h>
-#include <ntfs/ntfsmount.h>
+#include <fs/ntfs/ntfs.h>
+#include <fs/ntfs/ntfs_inode.h>
+#include <fs/ntfs/ntfs_subr.h>
+#include <fs/ntfs/ntfs_vfsops.h>
+#include <fs/ntfs/ntfs_ihash.h>
+#include <fs/ntfs/ntfsmount.h>
 
 #if defined(__FreeBSD__)
 MALLOC_DEFINE(M_NTFSMNT, "NTFS mount", "NTFS mount structure");
diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c
index 072a51254dc7..44abb50d9358 100644
--- a/sys/fs/ntfs/ntfs_vnops.c
+++ b/sys/fs/ntfs/ntfs_vnops.c
@@ -69,9 +69,9 @@
 #include <sys/sysctl.h>
 
 /*#define NTFS_DEBUG 1*/
-#include <ntfs/ntfs.h>
-#include <ntfs/ntfs_inode.h>
-#include <ntfs/ntfs_subr.h>
+#include <fs/ntfs/ntfs.h>
+#include <fs/ntfs/ntfs_inode.h>
+#include <fs/ntfs/ntfs_subr.h>
 #if defined(__NetBSD__)
 #include <miscfs/specfs/specdev.h>
 #include <miscfs/genfs/genfs.h>
diff --git a/sys/fs/nwfs/nwfs.h b/sys/fs/nwfs/nwfs.h
index e5478692b13e..41b25ae8b66b 100644
--- a/sys/fs/nwfs/nwfs.h
+++ b/sys/fs/nwfs/nwfs.h
@@ -36,7 +36,7 @@
 #define _NWFS_H_
 
 #include <netncp/ncp.h>
-#include <nwfs/nwfs_mount.h>
+#include <fs/nwfs/nwfs_mount.h>
 
 #define NR_OPEN 0
 #define	NW_NSB_DOS	(1 << NW_NS_DOS)
diff --git a/sys/fs/nwfs/nwfs_io.c b/sys/fs/nwfs/nwfs_io.c
index 4b105c679f46..8e73cf09c635 100644
--- a/sys/fs/nwfs/nwfs_io.c
+++ b/sys/fs/nwfs/nwfs_io.c
@@ -58,9 +58,9 @@
 #include <netncp/ncp_subr.h>
 #include <netncp/ncp_ncp.h>
 
-#include <nwfs/nwfs.h>
-#include <nwfs/nwfs_node.h>
-#include <nwfs/nwfs_subr.h>
+#include <fs/nwfs/nwfs.h>
+#include <fs/nwfs/nwfs_node.h>
+#include <fs/nwfs/nwfs_subr.h>
 
 static int nwfs_fastlookup = 1;
 
diff --git a/sys/fs/nwfs/nwfs_ioctl.c b/sys/fs/nwfs/nwfs_ioctl.c
index eb58389d7827..41c956c81fed 100644
--- a/sys/fs/nwfs/nwfs_ioctl.c
+++ b/sys/fs/nwfs/nwfs_ioctl.c
@@ -41,9 +41,9 @@
 #include <netncp/ncp_conn.h>
 #include <netncp/ncp_subr.h>
 
-#include <nwfs/nwfs.h>
-#include <nwfs/nwfs_node.h>
-#include <nwfs/nwfs_subr.h>
+#include <fs/nwfs/nwfs.h>
+#include <fs/nwfs/nwfs_node.h>
+#include <fs/nwfs/nwfs_subr.h>
 
 int
 nwfs_ioctl(ap)
diff --git a/sys/fs/nwfs/nwfs_node.c b/sys/fs/nwfs/nwfs_node.c
index 9c1f086101ee..0700b76bb749 100644
--- a/sys/fs/nwfs/nwfs_node.c
+++ b/sys/fs/nwfs/nwfs_node.c
@@ -53,10 +53,10 @@
 #include <netncp/ncp_conn.h>
 #include <netncp/ncp_subr.h>
 
-#include <nwfs/nwfs.h>
-#include <nwfs/nwfs_mount.h>
-#include <nwfs/nwfs_node.h>
-#include <nwfs/nwfs_subr.h>
+#include <fs/nwfs/nwfs.h>
+#include <fs/nwfs/nwfs_mount.h>
+#include <fs/nwfs/nwfs_node.h>
+#include <fs/nwfs/nwfs_subr.h>
 
 #define	NWNOHASH(fhsum) (&nwhashtbl[(fhsum.f_id) & nwnodehash])
 
diff --git a/sys/fs/nwfs/nwfs_subr.c b/sys/fs/nwfs/nwfs_subr.c
index d3e212d139e6..b83e89b4b61f 100644
--- a/sys/fs/nwfs/nwfs_subr.c
+++ b/sys/fs/nwfs/nwfs_subr.c
@@ -45,9 +45,9 @@
 #include <netncp/ncp_rq.h>
 #include <netncp/nwerror.h>
 
-#include <nwfs/nwfs.h>
-#include <nwfs/nwfs_node.h>
-#include <nwfs/nwfs_subr.h>
+#include <fs/nwfs/nwfs.h>
+#include <fs/nwfs/nwfs_node.h>
+#include <fs/nwfs/nwfs_subr.h>
 
 #define NCP_INFOSZ	(sizeof(struct nw_entry_info) - 257)
 
diff --git a/sys/fs/nwfs/nwfs_vfsops.c b/sys/fs/nwfs/nwfs_vfsops.c
index c978722c6ab8..b37a856aaee6 100644
--- a/sys/fs/nwfs/nwfs_vfsops.c
+++ b/sys/fs/nwfs/nwfs_vfsops.c
@@ -54,9 +54,9 @@
 #include <netncp/ncp_ncp.h>
 #include <netncp/ncp_nls.h>
 
-#include <nwfs/nwfs.h>
-#include <nwfs/nwfs_node.h>
-#include <nwfs/nwfs_subr.h>
+#include <fs/nwfs/nwfs.h>
+#include <fs/nwfs/nwfs_node.h>
+#include <fs/nwfs/nwfs_subr.h>
 
 int nwfs_debuglevel = 0;
 
diff --git a/sys/fs/nwfs/nwfs_vnops.c b/sys/fs/nwfs/nwfs_vnops.c
index 1e5361f4e883..dc83b3d3c36c 100644
--- a/sys/fs/nwfs/nwfs_vnops.c
+++ b/sys/fs/nwfs/nwfs_vnops.c
@@ -53,9 +53,9 @@
 #include <netncp/nwerror.h>
 #include <netncp/ncp_nls.h>
 
-#include <nwfs/nwfs.h>
-#include <nwfs/nwfs_node.h>
-#include <nwfs/nwfs_subr.h>
+#include <fs/nwfs/nwfs.h>
+#include <fs/nwfs/nwfs_node.h>
+#include <fs/nwfs/nwfs_subr.h>
 
 /*
  * Prototypes for NWFS vnode operations