diff options
| -rw-r--r-- | debugfs/ChangeLog | 4 | ||||
| -rw-r--r-- | debugfs/Makefile.in | 26 | ||||
| -rw-r--r-- | debugfs/debugfs.h | 2 | ||||
| -rw-r--r-- | e2fsck/ChangeLog | 3 | ||||
| -rw-r--r-- | e2fsck/Makefile.in | 36 | ||||
| -rw-r--r-- | e2fsck/e2fsck.h | 2 | ||||
| -rw-r--r-- | e2fsck/scantest.c | 3 | ||||
| -rw-r--r-- | lib/e2p/ChangeLog | 4 | ||||
| -rw-r--r-- | lib/e2p/Makefile.in | 31 | ||||
| -rw-r--r-- | lib/e2p/e2p.h | 2 | ||||
| -rw-r--r-- | lib/uuid/ChangeLog | 4 | ||||
| -rw-r--r-- | lib/uuid/Makefile.in | 3 | ||||
| -rw-r--r-- | lib/uuid/tst_uuid.c | 1 | ||||
| -rw-r--r-- | lib/uuid/uuid_time.c | 1 | ||||
| -rw-r--r-- | misc/ChangeLog | 4 | ||||
| -rw-r--r-- | misc/Makefile.in | 33 | ||||
| -rw-r--r-- | misc/badblocks.c | 2 | ||||
| -rw-r--r-- | misc/chattr.c | 2 | ||||
| -rw-r--r-- | misc/dumpe2fs.c | 2 | ||||
| -rw-r--r-- | misc/e2image.c | 3 | ||||
| -rw-r--r-- | misc/findsuper.c | 2 | ||||
| -rw-r--r-- | misc/lsattr.c | 2 | ||||
| -rw-r--r-- | misc/mke2fs.c | 3 | ||||
| -rw-r--r-- | misc/mklost+found.c | 3 | ||||
| -rw-r--r-- | misc/tune2fs.c | 3 | ||||
| -rw-r--r-- | misc/util.c | 2 | ||||
| -rw-r--r-- | resize/ChangeLog | 4 | ||||
| -rw-r--r-- | resize/Makefile.in | 10 | ||||
| -rw-r--r-- | resize/resize2fs.h | 2 | ||||
| -rw-r--r-- | tests/progs/ChangeLog | 5 | ||||
| -rw-r--r-- | tests/progs/Makefile.in | 6 | ||||
| -rw-r--r-- | tests/progs/test_icount.c | 2 | ||||
| -rw-r--r-- | tests/progs/test_rel.c | 3 |
33 files changed, 116 insertions, 99 deletions
diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog index e10f40e3..bce9152a 100644 --- a/debugfs/ChangeLog +++ b/debugfs/ChangeLog @@ -1,3 +1,7 @@ +2001-05-14 Theodore Tso <tytso@valinux.com> + + * debugfs.h: Change location of ext2_fs.h to be ext2fs/ext2_fs.h + 2001-05-12 Theodore Tso <tytso@valinux.com> * debugfs.c (print_features): Use fputs instead of printf to diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in index 60c00761..93b1cc41 100644 --- a/debugfs/Makefile.in +++ b/debugfs/Makefile.in @@ -78,41 +78,41 @@ debug_cmds.o: debug_cmds.c $(top_srcdir)/lib/ss/ss.h \ $(top_builddir)/lib/ss/ss_err.h debugfs.o: $(srcdir)/debugfs.c $(top_srcdir)/lib/et/com_err.h \ $(top_srcdir)/lib/ss/ss.h $(top_builddir)/lib/ss/ss_err.h \ - $(srcdir)/debugfs.h $(top_srcdir)/include/linux/ext2_fs.h \ + $(srcdir)/debugfs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(top_srcdir)/lib/uuid/uuid.h $(top_srcdir)/lib/e2p/e2p.h \ - $(srcdir)/../version.h + $(top_srcdir)/version.h util.o: $(srcdir)/util.c $(srcdir)/debugfs.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ - $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ - $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h -ls.o: $(srcdir)/ls.c $(srcdir)/debugfs.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h +ls.o: $(srcdir)/ls.c $(srcdir)/debugfs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ + $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \ + $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ + $(top_srcdir)/lib/ext2fs/bitops.h ncheck.o: $(srcdir)/ncheck.c $(srcdir)/debugfs.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h icheck.o: $(srcdir)/icheck.c $(srcdir)/debugfs.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h lsdel.o: $(srcdir)/lsdel.c $(srcdir)/debugfs.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h dump.o: $(srcdir)/dump.c $(srcdir)/debugfs.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h setsuper.o: $(srcdir)/setsuper.c $(srcdir)/debugfs.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h logdump.o: $(srcdir)/logdump.c $(srcdir)/debugfs.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(srcdir)/jfs_user.h $(top_srcdir)/include/linux/jfs.h \ diff --git a/debugfs/debugfs.h b/debugfs/debugfs.h index be0ad3a0..ed56a295 100644 --- a/debugfs/debugfs.h +++ b/debugfs/debugfs.h @@ -2,7 +2,7 @@ * debugfs.h --- header file for the debugfs program */ -#include <linux/ext2_fs.h> +#include "ext2fs/ext2_fs.h" #include "ext2fs/ext2fs.h" #ifdef __STDC__ diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog index 1fd3e1aa..bcc6405d 100644 --- a/e2fsck/ChangeLog +++ b/e2fsck/ChangeLog @@ -1,5 +1,8 @@ 2001-05-14 Theodore Tso <tytso@valinux.com> + * e2fsck.h, scantest.c: Change location of ext2_fs.h to be + ext2fs/ext2_fs.h + * super.c (check_super_block): Be more strict on checking s_r_blocks_count superblock field. diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in index 5fcc7fc4..96a82e33 100644 --- a/e2fsck/Makefile.in +++ b/e2fsck/Makefile.in @@ -161,86 +161,86 @@ distclean: clean # the Makefile.in file # e2fsck.o: $(srcdir)/e2fsck.c $(srcdir)/e2fsck.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(srcdir)/problem.h super.o: $(srcdir)/super.c $(top_srcdir)/lib/uuid/uuid.h $(srcdir)/e2fsck.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(srcdir)/problem.h pass1.o: $(srcdir)/pass1.c $(srcdir)/e2fsck.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(srcdir)/problem.h pass1b.o: $(srcdir)/pass1b.c $(top_srcdir)/lib/et/com_err.h \ - $(srcdir)/e2fsck.h $(top_srcdir)/include/linux/ext2_fs.h \ + $(srcdir)/e2fsck.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(srcdir)/problem.h pass2.o: $(srcdir)/pass2.c $(srcdir)/e2fsck.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(srcdir)/problem.h pass3.o: $(srcdir)/pass3.c $(srcdir)/e2fsck.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(srcdir)/problem.h pass4.o: $(srcdir)/pass4.c $(srcdir)/e2fsck.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(srcdir)/problem.h pass5.o: $(srcdir)/pass5.c $(srcdir)/e2fsck.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(srcdir)/problem.h journal.o: $(srcdir)/journal.c $(srcdir)/jfs_user.h $(srcdir)/e2fsck.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(top_srcdir)/include/linux/jfs.h $(top_srcdir)/include/linux/jfs_compat.h \ $(top_srcdir)/include/linux/list.h $(srcdir)/problem.h \ $(top_srcdir)/lib/uuid/uuid.h recovery.o: $(srcdir)/recovery.c $(srcdir)/jfs_user.h $(srcdir)/e2fsck.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(top_srcdir)/include/linux/jfs.h $(top_srcdir)/include/linux/jfs_compat.h \ $(top_srcdir)/include/linux/list.h revoke.o: $(srcdir)/revoke.c $(srcdir)/jfs_user.h $(srcdir)/e2fsck.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(top_srcdir)/include/linux/jfs.h $(top_srcdir)/include/linux/jfs_compat.h \ $(top_srcdir)/include/linux/list.h badblocks.o: $(srcdir)/badblocks.c $(top_srcdir)/lib/et/com_err.h \ - $(srcdir)/e2fsck.h $(top_srcdir)/include/linux/ext2_fs.h \ + $(srcdir)/e2fsck.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h util.o: $(srcdir)/util.c $(srcdir)/e2fsck.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h unix.o: $(srcdir)/unix.c $(top_srcdir)/lib/et/com_err.h $(srcdir)/e2fsck.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ - $(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/problem.h $(srcdir)/../version.h + $(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/problem.h $(top_srcdir)/version.h dirinfo.o: $(srcdir)/dirinfo.c $(srcdir)/e2fsck.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h ehandler.o: $(srcdir)/ehandler.c $(srcdir)/e2fsck.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h problem.o: $(srcdir)/problem.c $(srcdir)/e2fsck.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(srcdir)/problem.h $(srcdir)/problemP.h diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h index 1e42fd92..da41cca9 100644 --- a/e2fsck/e2fsck.h +++ b/e2fsck/e2fsck.h @@ -27,7 +27,7 @@ #include "ext2_fs.h" #include "ext2fs.h" #else -#include <linux/ext2_fs.h> +#include "ext2fs/ext2_fs.h" #include "ext2fs/ext2fs.h" #endif diff --git a/e2fsck/scantest.c b/e2fsck/scantest.c index 37094764..e8374d92 100644 --- a/e2fsck/scantest.c +++ b/e2fsck/scantest.c @@ -29,8 +29,7 @@ #include <sys/types.h> #include <sys/time.h> -#include <linux/ext2_fs.h> - +#include "ext2fs/ext2_fs.h" #include "ext2fs/ext2fs.h" diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog index 0b4b0c95..1a7f0c2e 100644 --- a/lib/e2p/ChangeLog +++ b/lib/e2p/ChangeLog @@ -1,3 +1,7 @@ +2001-05-14 Theodore Tso <tytso@valinux.com> + + * e2p.h: Change location of ext2_fs.h to be ext2fs/ext2_fs.h + 2001-05-11 Andreas Dilger <adilger@turbolinux.com> * feature.c: Add COMPAT_DIR_INDEX and RESIZE_INODE known features diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in index b8514375..ba523267 100644 --- a/lib/e2p/Makefile.in +++ b/lib/e2p/Makefile.in @@ -100,27 +100,26 @@ distclean:: clean # the Makefile.in file # feature.o: $(srcdir)/feature.c $(srcdir)/e2p.h \ - $(top_srcdir)/include/linux/ext2_fs.h + $(top_srcdir)/lib/ext2fs/ext2_fs.h fgetflags.o: $(srcdir)/fgetflags.c $(srcdir)/e2p.h \ - $(top_srcdir)/include/linux/ext2_fs.h + $(top_srcdir)/lib/ext2fs/ext2_fs.h fsetflags.o: $(srcdir)/fsetflags.c $(srcdir)/e2p.h \ - $(top_srcdir)/include/linux/ext2_fs.h + $(top_srcdir)/lib/ext2fs/ext2_fs.h fgetversion.o: $(srcdir)/fgetversion.c $(srcdir)/e2p.h \ - $(top_srcdir)/include/linux/ext2_fs.h + $(top_srcdir)/lib/ext2fs/ext2_fs.h fsetversion.o: $(srcdir)/fsetversion.c $(srcdir)/e2p.h \ - $(top_srcdir)/include/linux/ext2_fs.h + $(top_srcdir)/lib/ext2fs/ext2_fs.h getflags.o: $(srcdir)/getflags.c $(srcdir)/e2p.h \ - $(top_srcdir)/include/linux/ext2_fs.h + $(top_srcdir)/lib/ext2fs/ext2_fs.h getversion.o: $(srcdir)/getversion.c $(srcdir)/e2p.h \ - $(top_srcdir)/include/linux/ext2_fs.h -iod.o: $(srcdir)/iod.c $(srcdir)/e2p.h $(top_srcdir)/include/linux/ext2_fs.h -ls.o: $(srcdir)/ls.c $(srcdir)/e2p.h $(top_srcdir)/include/linux/ext2_fs.h -pe.o: $(srcdir)/pe.c $(srcdir)/e2p.h $(top_srcdir)/include/linux/ext2_fs.h -pf.o: $(srcdir)/pf.c $(srcdir)/e2p.h $(top_srcdir)/include/linux/ext2_fs.h -ps.o: $(srcdir)/ps.c $(srcdir)/e2p.h $(top_srcdir)/include/linux/ext2_fs.h + $(top_srcdir)/lib/ext2fs/ext2_fs.h +iod.o: $(srcdir)/iod.c $(srcdir)/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h +ls.o: $(srcdir)/ls.c $(srcdir)/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h +pe.o: $(srcdir)/pe.c $(srcdir)/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h +pf.o: $(srcdir)/pf.c $(srcdir)/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h +ps.o: $(srcdir)/ps.c $(srcdir)/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h setflags.o: $(srcdir)/setflags.c $(srcdir)/e2p.h \ - $(top_srcdir)/include/linux/ext2_fs.h + $(top_srcdir)/lib/ext2fs/ext2_fs.h setversion.o: $(srcdir)/setversion.c $(srcdir)/e2p.h \ - $(top_srcdir)/include/linux/ext2_fs.h -uuid.o: $(srcdir)/uuid.c $(srcdir)/e2p.h \ - $(top_srcdir)/include/linux/ext2_fs.h + $(top_srcdir)/lib/ext2fs/ext2_fs.h +uuid.o: $(srcdir)/uuid.c $(srcdir)/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h diff --git a/lib/e2p/e2p.h b/lib/e2p/e2p.h index 96cca7fc..3d27479e 100644 --- a/lib/e2p/e2p.h +++ b/lib/e2p/e2p.h @@ -2,7 +2,7 @@ #include <stdio.h> #include <dirent.h> -#include <linux/ext2_fs.h> +#include "ext2fs/ext2_fs.h" #define E2P_FEATURE_COMPAT 0 #define E2P_FEATURE_INCOMPAT 1 diff --git a/lib/uuid/ChangeLog b/lib/uuid/ChangeLog index 2a239b23..c6d38f3f 100644 --- a/lib/uuid/ChangeLog +++ b/lib/uuid/ChangeLog @@ -1,3 +1,7 @@ +2001-05-14 Theodore Tso <tytso@valinux.com> + + * tst_uuid.c, uuid_time.c: Remove unneeded #include of ext2_fs.h + 2001-05-12 Theodore Tso <tytso@valinux.com> * libuuid.3.in, uuid_clear.3.in, uuid_compare.3.in, uuid_copy.3.in, diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in index b5848594..cbf733dc 100644 --- a/lib/uuid/Makefile.in +++ b/lib/uuid/Makefile.in @@ -172,5 +172,4 @@ pack.o: $(srcdir)/pack.c $(srcdir)/uuidP.h $(srcdir)/uuid.h parse.o: $(srcdir)/parse.c $(srcdir)/uuidP.h $(srcdir)/uuid.h unpack.o: $(srcdir)/unpack.c $(srcdir)/uuidP.h $(srcdir)/uuid.h unparse.o: $(srcdir)/unparse.c $(srcdir)/uuidP.h $(srcdir)/uuid.h -uuid_time.o: $(srcdir)/uuid_time.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/uuidP.h $(srcdir)/uuid.h +uuid_time.o: $(srcdir)/uuid_time.c $(srcdir)/uuidP.h $(srcdir)/uuid.h diff --git a/lib/uuid/tst_uuid.c b/lib/uuid/tst_uuid.c index dac52b5b..1785c88f 100644 --- a/lib/uuid/tst_uuid.c +++ b/lib/uuid/tst_uuid.c @@ -10,7 +10,6 @@ */ #include <stdio.h> -#include <linux/ext2_fs.h> #include "uuid.h" diff --git a/lib/uuid/uuid_time.c b/lib/uuid/uuid_time.c index ee9ce264..36662053 100644 --- a/lib/uuid/uuid_time.c +++ b/lib/uuid/uuid_time.c @@ -17,7 +17,6 @@ #include <sys/types.h> #include <sys/time.h> #include <time.h> -#include <linux/ext2_fs.h> #include "uuidP.h" diff --git a/misc/ChangeLog b/misc/ChangeLog index c42ef279..9e2905d5 100644 --- a/misc/ChangeLog +++ b/misc/ChangeLog @@ -1,5 +1,9 @@ 2001-05-14 Theodore Tso <tytso@valinux.com> + * badblocks.c, chattr.c, dumpe2fs.c, e2image.c, findsuper.c, + lsattr.c, mke2fs.c, mklost+found.c, tune2fs.c, util.c: + Change location of ext2_fs.h to be ext2fs/ext2_fs.h + * tune2fs.8.in: Fix typo's and make other clarifications suggested by Andreas Dilger. diff --git a/misc/Makefile.in b/misc/Makefile.in index 2d5a587a..4f613b25 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -190,44 +190,43 @@ distclean: clean # Makefile dependencies follow. This must be the last section in # the Makefile.in file # -tune2fs.o: $(srcdir)/tune2fs.c $(top_srcdir)/include/linux/ext2_fs.h \ +tune2fs.o: $(srcdir)/tune2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/bitops.h $(top_srcdir)/lib/uuid/uuid.h \ $(top_srcdir)/lib/e2p/e2p.h $(srcdir)/jfs_user.h \ $(top_srcdir)/include/linux/jfs.h $(top_srcdir)/include/linux/jfs_compat.h \ - $(top_srcdir)/include/linux/list.h $(srcdir)/util.h $(srcdir)/../version.h \ + $(top_srcdir)/include/linux/list.h $(srcdir)/util.h $(top_srcdir)/version.h \ $(srcdir)/nls-enable.h -mklost+found.o: $(srcdir)/mklost+found.c \ - $(top_srcdir)/include/linux/ext2_fs.h $(srcdir)/../version.h \ - $(srcdir)/nls-enable.h -mke2fs.o: $(srcdir)/mke2fs.c $(top_srcdir)/include/linux/ext2_fs.h \ +mklost+found.o: $(srcdir)/mklost+found.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ + $(top_srcdir)/version.h $(srcdir)/nls-enable.h +mke2fs.o: $(srcdir)/mke2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/uuid/uuid.h \ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ - $(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/util.h $(srcdir)/../version.h \ + $(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/util.h $(top_srcdir)/version.h \ $(srcdir)/nls-enable.h -chattr.o: $(srcdir)/chattr.c $(top_srcdir)/include/linux/ext2_fs.h \ +chattr.o: $(srcdir)/chattr.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/e2p/e2p.h \ - $(srcdir)/../version.h $(srcdir)/nls-enable.h -lsattr.o: $(srcdir)/lsattr.c $(top_srcdir)/include/linux/ext2_fs.h \ + $(top_srcdir)/version.h $(srcdir)/nls-enable.h +lsattr.o: $(srcdir)/lsattr.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/e2p/e2p.h \ - $(srcdir)/../version.h $(srcdir)/nls-enable.h -dumpe2fs.o: $(srcdir)/dumpe2fs.c $(top_srcdir)/include/linux/ext2_fs.h \ + $(top_srcdir)/version.h $(srcdir)/nls-enable.h +dumpe2fs.o: $(srcdir)/dumpe2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/bitops.h $(top_srcdir)/lib/e2p/e2p.h \ $(srcdir)/jfs_user.h $(top_srcdir)/include/linux/jfs.h \ $(top_srcdir)/include/linux/jfs_compat.h $(top_srcdir)/include/linux/list.h \ - $(srcdir)/../version.h $(srcdir)/nls-enable.h + $(top_srcdir)/version.h $(srcdir)/nls-enable.h badblocks.o: $(srcdir)/badblocks.c $(top_srcdir)/lib/et/com_err.h \ - $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_srcdir)/include/linux/ext2_fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/nls-enable.h -fsck.o: $(srcdir)/fsck.c $(srcdir)/../version.h $(srcdir)/nls-enable.h \ +fsck.o: $(srcdir)/fsck.c $(top_srcdir)/version.h $(srcdir)/nls-enable.h \ $(srcdir)/fsck.h $(srcdir)/get_device_by_label.h -util.o: $(srcdir)/util.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/e2p/e2p.h \ +util.o: $(srcdir)/util.c $(top_srcdir)/lib/et/com_err.h \ + $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(srcdir)/nls-enable.h $(srcdir)/util.h diff --git a/misc/badblocks.c b/misc/badblocks.c index 749c86e0..8de08f74 100644 --- a/misc/badblocks.c +++ b/misc/badblocks.c @@ -49,7 +49,7 @@ extern int optind; #include "et/com_err.h" #include "ext2fs/ext2_io.h" -#include <linux/ext2_fs.h> +#include "ext2fs/ext2_fs.h" #include "ext2fs/ext2fs.h" #include "nls-enable.h" diff --git a/misc/chattr.c b/misc/chattr.c index d5449f35..794e6807 100644 --- a/misc/chattr.c +++ b/misc/chattr.c @@ -33,7 +33,7 @@ #endif #include <sys/param.h> #include <sys/stat.h> -#include <linux/ext2_fs.h> +#include "ext2fs/ext2_fs.h" #ifndef S_ISLNK /* So we can compile even with gcc-warn */ # ifdef __S_IFLNK diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c index f9b2ad41..de68d098 100644 --- a/misc/dumpe2fs.c +++ b/misc/dumpe2fs.c @@ -32,7 +32,7 @@ extern int optind; #include <string.h> #include <unistd.h> -#include <linux/ext2_fs.h> +#include "ext2fs/ext2_fs.h" #include "ext2fs/ext2fs.h" #include "e2p/e2p.h" diff --git a/misc/e2image.c b/misc/e2image.c index 976ae55b..fb3f943b 100644 --- a/misc/e2image.c +++ b/misc/e2image.c @@ -29,8 +29,7 @@ extern int optind; #include <sys/stat.h> #include <sys/types.h> -#include <linux/ext2_fs.h> - +#include "ext2fs/ext2_fs.h" #include "ext2fs/ext2fs.h" #include "et/com_err.h" #include "uuid/uuid.h" diff --git a/misc/findsuper.c b/misc/findsuper.c index 806b12d4..35bf9b96 100644 --- a/misc/findsuper.c +++ b/misc/findsuper.c @@ -90,7 +90,7 @@ #include <stdlib.h> #include <time.h> -#include <linux/ext2_fs.h> +#include "ext2fs/ext2_fs.h" #include "nls-enable.h" diff --git a/misc/lsattr.c b/misc/lsattr.c index 3fadeb2b..6b5a8eba 100644 --- a/misc/lsattr.c +++ b/misc/lsattr.c @@ -38,8 +38,8 @@ extern char *optarg; #include <string.h> #include <sys/param.h> #include <sys/stat.h> -#include <linux/ext2_fs.h> +#include "ext2fs/ext2_fs.h" #include "et/com_err.h" #include "e2p/e2p.h" diff --git a/misc/mke2fs.c b/misc/mke2fs.c index ba1545fe..a801ad05 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -44,8 +44,7 @@ extern int optind; #include <sys/ioctl.h> #include <sys/types.h> -#include <linux/ext2_fs.h> - +#include "ext2fs/ext2_fs.h" #include "et/com_err.h" #include "uuid/uuid.h" #include "e2p/e2p.h" diff --git a/misc/mklost+found.c b/misc/mklost+found.c index 37b7a7b1..7d5d7c02 100644 --- a/misc/mklost+found.c +++ b/misc/mklost+found.c @@ -22,8 +22,7 @@ #include <sys/param.h> #include <sys/stat.h> -#include <linux/ext2_fs.h> - +#include "ext2fs/ext2_fs.h" #include "../version.h" #include "nls-enable.h" diff --git a/misc/tune2fs.c b/misc/tune2fs.c index 7e2be5b8..5885a19b 100644 --- a/misc/tune2fs.c +++ b/misc/tune2fs.c @@ -41,8 +41,7 @@ extern int optind; #include <unistd.h> #include <sys/types.h> -#include <linux/ext2_fs.h> - +#include "ext2fs/ext2_fs.h" #include "ext2fs/ext2fs.h" #include "et/com_err.h" #include "uuid/uuid.h" diff --git a/misc/util.c b/misc/util.c index 851c0a47..717e9dff 100644 --- a/misc/util.c +++ b/misc/util.c @@ -14,7 +14,6 @@ #ifdef HAVE_ERRNO_H #include <errno.h> #endif -#include <linux/ext2_fs.h> #ifdef HAVE_LINUX_MAJOR_H #include <linux/major.h> #endif @@ -24,6 +23,7 @@ #include "et/com_err.h" #include "e2p/e2p.h" +#include "ext2fs/ext2_fs.h" #include "ext2fs/ext2fs.h" #include "nls-enable.h" #include "util.h" diff --git a/resize/ChangeLog b/resize/ChangeLog index 7df86a61..094be8f0 100644 --- a/resize/ChangeLog +++ b/resize/ChangeLog @@ -1,3 +1,7 @@ +2001-05-14 Theodore Tso <tytso@valinux.com> + + * resize2fs.h: Change location of ext2_fs.h to be ext2fs/ext2_fs.h + 2001-01-11 <tytso@snap.thunk.org> * main.c (main): Use ext2fs_sync_device() instead of calling the diff --git a/resize/Makefile.in b/resize/Makefile.in index 319abfb4..9ace9dc6 100644 --- a/resize/Makefile.in +++ b/resize/Makefile.in @@ -126,19 +126,19 @@ source_tar_file: $(top_srcdir)/.exclude-file # the Makefile.in file # extent.o: $(srcdir)/extent.c $(srcdir)/resize2fs.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h resize2fs.o: $(srcdir)/resize2fs.c $(srcdir)/resize2fs.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h main.o: $(srcdir)/main.c $(srcdir)/resize2fs.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/../version.h + $(top_srcdir)/version.h sim_progress.o: $(srcdir)/sim_progress.c $(srcdir)/resize2fs.h \ - $(top_srcdir)/include/linux/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h diff --git a/resize/resize2fs.h b/resize/resize2fs.h index 28d88c1b..61d4fe80 100644 --- a/resize/resize2fs.h +++ b/resize/resize2fs.h @@ -32,7 +32,7 @@ #include "ext2_fs.h" #include "ext2fs.h" #else -#include <linux/ext2_fs.h> +#include "ext2fs/ext2_fs.h" #include "ext2fs/ext2fs.h" #endif diff --git a/tests/progs/ChangeLog b/tests/progs/ChangeLog index 1247592f..bbae9c37 100644 --- a/tests/progs/ChangeLog +++ b/tests/progs/ChangeLog @@ -1,3 +1,8 @@ +2001-05-14 Theodore Tso <tytso@valinux.com> + + * test_icount.c, test_rel.c: Change location of ext2_fs.h to be + ext2fs/ext2_fs.h + 2001-05-10 Theodore Tso <tytso@valinux.com> * random_exercise.c: Also do some random truncating as well. diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in index b2c281c8..56cadc54 100644 --- a/tests/progs/Makefile.in +++ b/tests/progs/Makefile.in @@ -58,9 +58,9 @@ distclean: clean # Makefile dependencies follow. This must be the last section in # the Makefile.in file # -test_rel.o: $(srcdir)/test_rel.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ss/ss.h \ - $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ +test_rel.o: $(srcdir)/test_rel.c $(top_srcdir)/lib/et/com_err.h \ + $(top_srcdir)/lib/ss/ss.h $(top_builddir)/lib/ss/ss_err.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/bitops.h $(top_srcdir)/lib/ext2fs/irel.h \ $(top_srcdir)/lib/ext2fs/brel.h $(srcdir)/test_rel.h diff --git a/tests/progs/test_icount.c b/tests/progs/test_icount.c index 0494ba7b..7a364fcc 100644 --- a/tests/progs/test_icount.c +++ b/tests/progs/test_icount.c @@ -18,7 +18,7 @@ #endif #include <fcntl.h> -#include <linux/ext2_fs.h> +#include <ext2fs/ext2_fs.h> #include <et/com_err.h> #include <ss/ss.h> diff --git a/tests/progs/test_rel.c b/tests/progs/test_rel.c index f5c3c831..351c662e 100644 --- a/tests/progs/test_rel.c +++ b/tests/progs/test_rel.c @@ -18,10 +18,9 @@ #endif #include <fcntl.h> -#include <linux/ext2_fs.h> - #include <et/com_err.h> #include <ss/ss.h> +#include <ext2fs/ext2_fs.h> #include <ext2fs/ext2fs.h> #include <ext2fs/irel.h> #include <ext2fs/brel.h> |