Move ext2fs from src/gnu to src/gnu/fs.
Discussed on arch@. Reviewed by: kan Approved by: re (blanket), kan
This commit is contained in:
parent
dd07f0a552
commit
d5a287bf04
@ -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
|
||||
#
|
||||
|
@ -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 *);
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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 *);
|
||||
|
@ -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 )
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
@ -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 *);
|
||||
|
@ -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 *);
|
||||
|
@ -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).
|
||||
|
@ -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
|
||||
|
@ -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 \
|
||||
|
Loading…
Reference in New Issue
Block a user