Move ext2fs from src/gnu to src/gnu/fs.

Discussed on arch@.

Reviewed by:	kan
Approved by:	re (blanket), kan

14 files changed, 78 insertions, 78 deletions

diff --git a/sys/conf/files b/sys/conf/files
index 0ac514c..f6604ea 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1056,18 +1056,18 @@ geom/raid3/g_raid3_ctl.c	optional geom_raid3
 geom/shsec/g_shsec.c		optional geom_shsec
 geom/stripe/g_stripe.c		optional geom_stripe
 geom/uzip/g_uzip.c		optional geom_uzip
-gnu/ext2fs/ext2_alloc.c		optional ext2fs \
+gnu/fs/ext2fs/ext2_alloc.c		optional ext2fs \
 	warning "kernel contains GPL contaminated ext2fs filesystem"
-gnu/ext2fs/ext2_balloc.c	optional ext2fs
-gnu/ext2fs/ext2_bmap.c		optional ext2fs
-gnu/ext2fs/ext2_inode.c		optional ext2fs
-gnu/ext2fs/ext2_inode_cnv.c	optional ext2fs
-gnu/ext2fs/ext2_linux_balloc.c	optional ext2fs
-gnu/ext2fs/ext2_linux_ialloc.c	optional ext2fs
-gnu/ext2fs/ext2_lookup.c	optional ext2fs
-gnu/ext2fs/ext2_subr.c		optional ext2fs
-gnu/ext2fs/ext2_vfsops.c	optional ext2fs
-gnu/ext2fs/ext2_vnops.c		optional ext2fs
+gnu/fs/ext2fs/ext2_balloc.c	optional ext2fs
+gnu/fs/ext2fs/ext2_bmap.c		optional ext2fs
+gnu/fs/ext2fs/ext2_inode.c		optional ext2fs
+gnu/fs/ext2fs/ext2_inode_cnv.c	optional ext2fs
+gnu/fs/ext2fs/ext2_linux_balloc.c	optional ext2fs
+gnu/fs/ext2fs/ext2_linux_ialloc.c	optional ext2fs
+gnu/fs/ext2fs/ext2_lookup.c	optional ext2fs
+gnu/fs/ext2fs/ext2_subr.c		optional ext2fs
+gnu/fs/ext2fs/ext2_vfsops.c	optional ext2fs
+gnu/fs/ext2fs/ext2_vnops.c		optional ext2fs
 #
 # Support for hardware performance monitoring counters
 #
diff --git a/sys/gnu/fs/ext2fs/ext2_alloc.c b/sys/gnu/fs/ext2fs/ext2_alloc.c
index 1644861..8acfda8 100644
--- a/sys/gnu/fs/ext2fs/ext2_alloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_alloc.c
@@ -44,12 +44,12 @@
 #include <sys/mount.h>
 #include <sys/syslog.h>
 
-#include <gnu/ext2fs/inode.h>
-#include <gnu/ext2fs/ext2_mount.h>
-#include <gnu/ext2fs/ext2_fs.h>
-#include <gnu/ext2fs/ext2_fs_sb.h>
-#include <gnu/ext2fs/fs.h>
-#include <gnu/ext2fs/ext2_extern.h>
+#include <gnu/fs/ext2fs/inode.h>
+#include <gnu/fs/ext2fs/ext2_mount.h>
+#include <gnu/fs/ext2fs/ext2_fs.h>
+#include <gnu/fs/ext2fs/ext2_fs_sb.h>
+#include <gnu/fs/ext2fs/fs.h>
+#include <gnu/fs/ext2fs/ext2_extern.h>
 
 static void	ext2_fserr(struct ext2_sb_info *, u_int, char *);
 
diff --git a/sys/gnu/fs/ext2fs/ext2_balloc.c b/sys/gnu/fs/ext2fs/ext2_balloc.c
index a12ed35..f15a960 100644
--- a/sys/gnu/fs/ext2fs/ext2_balloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_balloc.c
@@ -44,11 +44,11 @@
 #include <sys/ucred.h>
 #include <sys/vnode.h>
 
-#include <gnu/ext2fs/inode.h>
-#include <gnu/ext2fs/ext2_fs.h>
-#include <gnu/ext2fs/ext2_fs_sb.h>
-#include <gnu/ext2fs/fs.h>
-#include <gnu/ext2fs/ext2_extern.h>
+#include <gnu/fs/ext2fs/inode.h>
+#include <gnu/fs/ext2fs/ext2_fs.h>
+#include <gnu/fs/ext2fs/ext2_fs_sb.h>
+#include <gnu/fs/ext2fs/fs.h>
+#include <gnu/fs/ext2fs/ext2_extern.h>
 
 /*
  * Balloc defines the structure of file system storage
diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c
index 54fe8b3..9d5e37b 100644
--- a/sys/gnu/fs/ext2fs/ext2_bmap.c
+++ b/sys/gnu/fs/ext2fs/ext2_bmap.c
@@ -45,11 +45,11 @@
 #include <sys/resourcevar.h>
 #include <sys/stat.h>
 
-#include <gnu/ext2fs/inode.h>
-#include <gnu/ext2fs/ext2_fs.h>
-#include <gnu/ext2fs/ext2_fs_sb.h>
-#include <gnu/ext2fs/ext2_mount.h>
-#include <gnu/ext2fs/ext2_extern.h>
+#include <gnu/fs/ext2fs/inode.h>
+#include <gnu/fs/ext2fs/ext2_fs.h>
+#include <gnu/fs/ext2fs/ext2_fs_sb.h>
+#include <gnu/fs/ext2fs/ext2_mount.h>
+#include <gnu/fs/ext2fs/ext2_extern.h>
 
 /*
  * Bmap converts a the logical block number of a file to its physical block
diff --git a/sys/gnu/fs/ext2fs/ext2_inode.c b/sys/gnu/fs/ext2fs/ext2_inode.c
index 46ba9d1..8f1b21e 100644
--- a/sys/gnu/fs/ext2fs/ext2_inode.c
+++ b/sys/gnu/fs/ext2fs/ext2_inode.c
@@ -47,12 +47,12 @@
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 
-#include <gnu/ext2fs/inode.h>
-#include <gnu/ext2fs/ext2_mount.h>
-#include <gnu/ext2fs/ext2_fs.h>
-#include <gnu/ext2fs/ext2_fs_sb.h>
-#include <gnu/ext2fs/fs.h>
-#include <gnu/ext2fs/ext2_extern.h>
+#include <gnu/fs/ext2fs/inode.h>
+#include <gnu/fs/ext2fs/ext2_mount.h>
+#include <gnu/fs/ext2fs/ext2_fs.h>
+#include <gnu/fs/ext2fs/ext2_fs_sb.h>
+#include <gnu/fs/ext2fs/fs.h>
+#include <gnu/fs/ext2fs/ext2_extern.h>
 
 static int ext2_indirtrunc(struct inode *, int32_t, int32_t, int32_t, int,
 	    long *);
diff --git a/sys/gnu/fs/ext2fs/ext2_inode_cnv.c b/sys/gnu/fs/ext2fs/ext2_inode_cnv.c
index 31deb77..de30739 100644
--- a/sys/gnu/fs/ext2fs/ext2_inode_cnv.c
+++ b/sys/gnu/fs/ext2fs/ext2_inode_cnv.c
@@ -31,9 +31,9 @@
 #include <sys/stat.h>
 #include <sys/vnode.h>
 
-#include <gnu/ext2fs/inode.h>
-#include <gnu/ext2fs/ext2_fs.h>
-#include <gnu/ext2fs/ext2_extern.h>
+#include <gnu/fs/ext2fs/inode.h>
+#include <gnu/fs/ext2fs/ext2_fs.h>
+#include <gnu/fs/ext2fs/ext2_extern.h>
 
 void
 ext2_print_inode( in )
diff --git a/sys/gnu/fs/ext2fs/ext2_linux_balloc.c b/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
index 23524ca..86bc8c3 100644
--- a/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
@@ -35,17 +35,17 @@
 #include <sys/mount.h>
 #include <sys/vnode.h>
 
-#include <gnu/ext2fs/inode.h>
-#include <gnu/ext2fs/ext2_mount.h>
-#include <gnu/ext2fs/ext2_extern.h>
-#include <gnu/ext2fs/ext2_fs.h>
-#include <gnu/ext2fs/ext2_fs_sb.h>
-#include <gnu/ext2fs/fs.h>
+#include <gnu/fs/ext2fs/inode.h>
+#include <gnu/fs/ext2fs/ext2_mount.h>
+#include <gnu/fs/ext2fs/ext2_extern.h>
+#include <gnu/fs/ext2fs/ext2_fs.h>
+#include <gnu/fs/ext2fs/ext2_fs_sb.h>
+#include <gnu/fs/ext2fs/fs.h>
 
 #ifdef __i386__
-#include <gnu/ext2fs/i386-bitops.h>
+#include <gnu/fs/ext2fs/i386-bitops.h>
 #else
-#include <gnu/ext2fs/ext2_bitops.h>
+#include <gnu/fs/ext2fs/ext2_bitops.h>
 #endif
 
 #define in_range(b, first, len)		((b) >= (first) && (b) <= (first) + (len) - 1)
diff --git a/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c b/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c
index 0b656e7..b48d625 100644
--- a/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c
@@ -36,18 +36,18 @@
 #include <sys/mount.h>
 #include <sys/vnode.h>
 
-#include <gnu/ext2fs/inode.h>
-#include <gnu/ext2fs/ext2_mount.h>
-#include <gnu/ext2fs/ext2_extern.h>
-#include <gnu/ext2fs/ext2_fs.h>
-#include <gnu/ext2fs/ext2_fs_sb.h>
-#include <gnu/ext2fs/fs.h>
+#include <gnu/fs/ext2fs/inode.h>
+#include <gnu/fs/ext2fs/ext2_mount.h>
+#include <gnu/fs/ext2fs/ext2_extern.h>
+#include <gnu/fs/ext2fs/ext2_fs.h>
+#include <gnu/fs/ext2fs/ext2_fs_sb.h>
+#include <gnu/fs/ext2fs/fs.h>
 #include <sys/stat.h>
 
 #ifdef __i386__
-#include <gnu/ext2fs/i386-bitops.h>
+#include <gnu/fs/ext2fs/i386-bitops.h>
 #else
-#include <gnu/ext2fs/ext2_bitops.h>
+#include <gnu/fs/ext2fs/ext2_bitops.h>
 #endif
 
 /* this is supposed to mark a buffer dirty on ready for delayed writing
diff --git a/sys/gnu/fs/ext2fs/ext2_lookup.c b/sys/gnu/fs/ext2fs/ext2_lookup.c
index 0179f97..a238878 100644
--- a/sys/gnu/fs/ext2fs/ext2_lookup.c
+++ b/sys/gnu/fs/ext2fs/ext2_lookup.c
@@ -54,11 +54,11 @@
 
 #include <ufs/ufs/dir.h>
 
-#include <gnu/ext2fs/inode.h>
-#include <gnu/ext2fs/ext2_mount.h>
-#include <gnu/ext2fs/ext2_extern.h>
-#include <gnu/ext2fs/ext2_fs.h>
-#include <gnu/ext2fs/ext2_fs_sb.h>
+#include <gnu/fs/ext2fs/inode.h>
+#include <gnu/fs/ext2fs/ext2_mount.h>
+#include <gnu/fs/ext2fs/ext2_extern.h>
+#include <gnu/fs/ext2fs/ext2_fs.h>
+#include <gnu/fs/ext2fs/ext2_fs_sb.h>
 
 #ifdef DIAGNOSTIC
 static int dirchk = 1;
diff --git a/sys/gnu/fs/ext2fs/ext2_subr.c b/sys/gnu/fs/ext2fs/ext2_subr.c
index 166e147..5617842 100644
--- a/sys/gnu/fs/ext2fs/ext2_subr.c
+++ b/sys/gnu/fs/ext2fs/ext2_subr.c
@@ -46,10 +46,10 @@
 #include <sys/ucred.h>
 #include <sys/vnode.h>
 
-#include <gnu/ext2fs/inode.h>
-#include <gnu/ext2fs/ext2_extern.h>
-#include <gnu/ext2fs/ext2_fs_sb.h>
-#include <gnu/ext2fs/fs.h>
+#include <gnu/fs/ext2fs/inode.h>
+#include <gnu/fs/ext2fs/ext2_extern.h>
+#include <gnu/fs/ext2fs/ext2_fs_sb.h>
+#include <gnu/fs/ext2fs/fs.h>
 
 #ifdef KDB
 void	ext2_checkoverlap(struct buf *, struct inode *);
diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c
index 1c77ef5..400c9afc 100644
--- a/sys/gnu/fs/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c
@@ -54,13 +54,13 @@
 #include <geom/geom.h>
 #include <geom/geom_vfs.h>
 
-#include <gnu/ext2fs/ext2_mount.h>
-#include <gnu/ext2fs/inode.h>
+#include <gnu/fs/ext2fs/ext2_mount.h>
+#include <gnu/fs/ext2fs/inode.h>
 
-#include <gnu/ext2fs/fs.h>
-#include <gnu/ext2fs/ext2_extern.h>
-#include <gnu/ext2fs/ext2_fs.h>
-#include <gnu/ext2fs/ext2_fs_sb.h>
+#include <gnu/fs/ext2fs/fs.h>
+#include <gnu/fs/ext2fs/ext2_extern.h>
+#include <gnu/fs/ext2fs/ext2_fs.h>
+#include <gnu/fs/ext2fs/ext2_fs_sb.h>
 
 static int ext2_flushfiles(struct mount *mp, int flags, struct thread *td);
 static int ext2_mountfs(struct vnode *, struct mount *, struct thread *);
diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c
index 56ead88..b97be20 100644
--- a/sys/gnu/fs/ext2fs/ext2_vnops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vnops.c
@@ -72,12 +72,12 @@
 #include <sys/signalvar.h>
 #include <ufs/ufs/dir.h>
 
-#include <gnu/ext2fs/inode.h>
-#include <gnu/ext2fs/ext2_mount.h>
-#include <gnu/ext2fs/ext2_fs_sb.h>
-#include <gnu/ext2fs/fs.h>
-#include <gnu/ext2fs/ext2_extern.h>
-#include <gnu/ext2fs/ext2_fs.h>
+#include <gnu/fs/ext2fs/inode.h>
+#include <gnu/fs/ext2fs/ext2_mount.h>
+#include <gnu/fs/ext2fs/ext2_fs_sb.h>
+#include <gnu/fs/ext2fs/fs.h>
+#include <gnu/fs/ext2fs/ext2_extern.h>
+#include <gnu/fs/ext2fs/ext2_fs.h>
 
 static int ext2_makeinode(int mode, struct vnode *, struct vnode **, struct componentname *);
 
@@ -163,7 +163,7 @@ struct vop_vector ext2_fifoops = {
 	.vop_write =		VOP_PANIC,
 };
 
-#include <gnu/ext2fs/ext2_readwrite.c>
+#include <gnu/fs/ext2fs/ext2_readwrite.c>
 
 /*
  * A virgin directory (no blushing please).
diff --git a/sys/gnu/reiserfs/reiserfs_fs.h b/sys/gnu/reiserfs/reiserfs_fs.h
index e33c04e..5f88f0b 100644
--- a/sys/gnu/reiserfs/reiserfs_fs.h
+++ b/sys/gnu/reiserfs/reiserfs_fs.h
@@ -40,9 +40,9 @@
 #include <geom/geom_vfs.h>
 
 #ifdef __i386__
-# include <gnu/ext2fs/i386-bitops.h>
+# include <gnu/fs/ext2fs/i386-bitops.h>
 #else
-# include <gnu/ext2fs/ext2_bitops.h>
+# include <gnu/fs/ext2fs/ext2_bitops.h>
 #endif
 
 #include <gnu/reiserfs/reiserfs_mount.h>
@@ -733,7 +733,7 @@ struct stat_data_v1 {
  * We want common flags to have the same values as in ext2,
  * so chattr(1) will work without problems
  */
-#include <gnu/ext2fs/ext2_fs.h>
+#include <gnu/fs/ext2fs/ext2_fs.h>
 #define	REISERFS_IMMUTABLE_FL	EXT2_IMMUTABLE_FL
 #define	REISERFS_APPEND_FL	EXT2_APPEND_FL
 #define	REISERFS_SYNC_FL	EXT2_SYNC_FL
diff --git a/sys/modules/ext2fs/Makefile b/sys/modules/ext2fs/Makefile
index 2cd0b07..1ce8ab8 100644
--- a/sys/modules/ext2fs/Makefile
+++ b/sys/modules/ext2fs/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../gnu/ext2fs
+.PATH:	${.CURDIR}/../../gnu/fs/ext2fs
 KMOD=	ext2fs
 SRCS=	opt_ddb.h opt_quota.h opt_suiddir.h vnode_if.h \
 	ext2_alloc.c ext2_balloc.c ext2_bmap.c ext2_inode.c \