From b61403ff72cd78ad6c7529487bf2d87daededa00 Mon Sep 17 00:00:00 2001 From: Craig Rodrigues Date: Wed, 15 Jun 2005 02:36:11 +0000 Subject: Move ext2fs from src/gnu to src/gnu/fs. Discussed on arch@. Reviewed by: kan Approved by: re (blanket), kan --- sys/conf/files | 22 +++++++++++----------- sys/gnu/fs/ext2fs/ext2_alloc.c | 12 ++++++------ sys/gnu/fs/ext2fs/ext2_balloc.c | 10 +++++----- sys/gnu/fs/ext2fs/ext2_bmap.c | 10 +++++----- sys/gnu/fs/ext2fs/ext2_inode.c | 12 ++++++------ sys/gnu/fs/ext2fs/ext2_inode_cnv.c | 6 +++--- sys/gnu/fs/ext2fs/ext2_linux_balloc.c | 16 ++++++++-------- sys/gnu/fs/ext2fs/ext2_linux_ialloc.c | 16 ++++++++-------- sys/gnu/fs/ext2fs/ext2_lookup.c | 10 +++++----- sys/gnu/fs/ext2fs/ext2_subr.c | 8 ++++---- sys/gnu/fs/ext2fs/ext2_vfsops.c | 12 ++++++------ sys/gnu/fs/ext2fs/ext2_vnops.c | 14 +++++++------- sys/gnu/reiserfs/reiserfs_fs.h | 6 +++--- sys/modules/ext2fs/Makefile | 2 +- 14 files changed, 78 insertions(+), 78 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 0ac514c41abf6..f6604ea4905ae 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 1644861e45e59..8acfda8f15366 100644 --- a/sys/gnu/fs/ext2fs/ext2_alloc.c +++ b/sys/gnu/fs/ext2fs/ext2_alloc.c @@ -44,12 +44,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include 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 a12ed351d48b3..f15a9606ea689 100644 --- a/sys/gnu/fs/ext2fs/ext2_balloc.c +++ b/sys/gnu/fs/ext2fs/ext2_balloc.c @@ -44,11 +44,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* * 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 54fe8b3d68285..9d5e37bf39486 100644 --- a/sys/gnu/fs/ext2fs/ext2_bmap.c +++ b/sys/gnu/fs/ext2fs/ext2_bmap.c @@ -45,11 +45,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* * 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 46ba9d1e6b0cf..8f1b21e76de48 100644 --- a/sys/gnu/fs/ext2fs/ext2_inode.c +++ b/sys/gnu/fs/ext2fs/ext2_inode.c @@ -47,12 +47,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include 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 31deb77741a89..de30739fc51f3 100644 --- a/sys/gnu/fs/ext2fs/ext2_inode_cnv.c +++ b/sys/gnu/fs/ext2fs/ext2_inode_cnv.c @@ -31,9 +31,9 @@ #include #include -#include -#include -#include +#include +#include +#include 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 23524cac808e9..86bc8c3ca2afe 100644 --- a/sys/gnu/fs/ext2fs/ext2_linux_balloc.c +++ b/sys/gnu/fs/ext2fs/ext2_linux_balloc.c @@ -35,17 +35,17 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #ifdef __i386__ -#include +#include #else -#include +#include #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 0b656e775696b..b48d62534c7c9 100644 --- a/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c +++ b/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c @@ -36,18 +36,18 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #ifdef __i386__ -#include +#include #else -#include +#include #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 0179f9766b2fa..a23887860c9a3 100644 --- a/sys/gnu/fs/ext2fs/ext2_lookup.c +++ b/sys/gnu/fs/ext2fs/ext2_lookup.c @@ -54,11 +54,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #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 166e147ff16ba..561784294b7be 100644 --- a/sys/gnu/fs/ext2fs/ext2_subr.c +++ b/sys/gnu/fs/ext2fs/ext2_subr.c @@ -46,10 +46,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #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 1c77ef59e349f..400c9afcfcbd4 100644 --- a/sys/gnu/fs/ext2fs/ext2_vfsops.c +++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c @@ -54,13 +54,13 @@ #include #include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include 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 56ead88ad4723..b97be20f6b2b5 100644 --- a/sys/gnu/fs/ext2fs/ext2_vnops.c +++ b/sys/gnu/fs/ext2fs/ext2_vnops.c @@ -72,12 +72,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include 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 +#include /* * A virgin directory (no blushing please). diff --git a/sys/gnu/reiserfs/reiserfs_fs.h b/sys/gnu/reiserfs/reiserfs_fs.h index e33c04eda0b54..5f88f0b339db1 100644 --- a/sys/gnu/reiserfs/reiserfs_fs.h +++ b/sys/gnu/reiserfs/reiserfs_fs.h @@ -40,9 +40,9 @@ #include #ifdef __i386__ -# include +# include #else -# include +# include #endif #include @@ -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 +#include #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 2cd0b0709d8dd..1ce8ab87aa287 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 \ -- cgit v1.3