From: Theodore Ts'o Date: Mon, 24 Dec 2001 00:33:51 +0000 (-0500) Subject: Move linux/jbd.h to ext2fs/kernel-jbd.h, to avoid using the X-Git-Tag: E2FSPROGS-1_26-WIP-1224~11 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=19007e51a548d1e0eff01025dde9f147a0beb26d;p=tools%2Fe2fsprogs.git Move linux/jbd.h to ext2fs/kernel-jbd.h, to avoid using the system header file version of hbd.h when using diet glibc (since it forcibly adds /usr/include to the beginning of include search path.) --- diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog index d4228ce..8cdee82 100644 --- a/debugfs/ChangeLog +++ b/debugfs/ChangeLog @@ -1,3 +1,11 @@ +2001-12-23 Theodore Tso + + * Makefile.in, jfs_user.h: Move linux/jbd.h to + ext2fs/kernel-jbd.h, to avoid using the system header + file version of hbd.h when using diet glibc (since it + forcibly adds /usr/include to the beginning of the + include search path.) + 2001-12-22 Theodore Tso * debugfs.c (kill_file_by_inode, release_blocks_proc): Update the diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in index f06de64..e43d6c0 100644 --- a/debugfs/Makefile.in +++ b/debugfs/Makefile.in @@ -74,8 +74,6 @@ distclean: clean # Makefile dependencies follow. This must be the last section in # the Makefile.in file # -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)/lib/ext2fs/ext2_fs.h \ @@ -117,10 +115,3 @@ setsuper.o: $(srcdir)/setsuper.c $(srcdir)/debugfs.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)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.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/jbd.h $(top_srcdir)/include/linux/jfs_compat.h \ - $(top_srcdir)/include/linux/linked_list.h diff --git a/debugfs/jfs_user.h b/debugfs/jfs_user.h index 1583168..3070cd5 100644 --- a/debugfs/jfs_user.h +++ b/debugfs/jfs_user.h @@ -3,7 +3,6 @@ typedef unsigned short kdev_t; -#include - +#include #endif /* _JFS_USER_H */ diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog index 9ae5f1e..9c0bc45 100644 --- a/e2fsck/ChangeLog +++ b/e2fsck/ChangeLog @@ -1,3 +1,11 @@ +2001-12-23 Theodore Tso + + * Makefile.in, jfs_user.h: Move linux/jbd.h to + ext2fs/kernel-jbd.h, to avoid using the system header + file version of hbd.h when using diet glibc (since it + forcibly adds /usr/include to the beginning of the + include search path.) + 2001-12-21 Theodore Tso * problem.c (fix_problem): Use ctx->filesystem_name if the diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in index a4e894f..459be30 100644 --- a/e2fsck/Makefile.in +++ b/e2fsck/Makefile.in @@ -214,28 +214,6 @@ pass5.o: $(srcdir)/pass5.c $(srcdir)/e2fsck.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)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.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/jbd.h \ - $(top_srcdir)/include/linux/jfs_compat.h \ - $(top_srcdir)/include/linux/linked_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)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.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/jbd.h \ - $(top_srcdir)/include/linux/jfs_compat.h \ - $(top_srcdir)/include/linux/linked_list.h -revoke.o: $(srcdir)/revoke.c $(srcdir)/jfs_user.h $(srcdir)/e2fsck.h \ - $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.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/jbd.h \ - $(top_srcdir)/include/linux/jfs_compat.h \ - $(top_srcdir)/include/linux/linked_list.h badblocks.o: $(srcdir)/badblocks.c $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/e2fsck.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ diff --git a/e2fsck/jfs_user.h b/e2fsck/jfs_user.h index f02923b..d8da030 100644 --- a/e2fsck/jfs_user.h +++ b/e2fsck/jfs_user.h @@ -97,7 +97,7 @@ _INLINE_ void do_cache_destroy(kmem_cache_t *cache) /* * Now pull in the real linux/jfs.h definitions. */ -#include +#include /* * Kernel compatibility functions are defined in journal.c diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog index a8a4274..28a3a15 100644 --- a/lib/ext2fs/ChangeLog +++ b/lib/ext2fs/ChangeLog @@ -1,3 +1,14 @@ +2001-12-23 Theodore Tso + + * Makefile.in, jfs_user.h: Move linux/jbd.h to + ext2fs/kernel-jbd.h, to avoid using the system header + file version of hbd.h when using diet glibc (since it + forcibly adds /usr/include to the beginning of the + include search path.) + + * kernel-jbd.h, kernel-list.h, jfs_compat.h: Move files from + include/linux directory. + 2001-12-16 Theodore Tso * bitops.h (ext2fs_mark_generic_bitmap, ext2fs_unmark_generic_bitmap), diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in index 4e8878e..dbdc756 100644 --- a/lib/ext2fs/Makefile.in +++ b/lib/ext2fs/Makefile.in @@ -346,9 +346,10 @@ get_pathname.o: $(srcdir)/get_pathname.c $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h -getsize.o: $(srcdir)/getsize.c $(srcdir)/ext2_fs.h \ - $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ - $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +getsize.o: $(srcdir)/getsize.c /usr/src/linux/include/linux/fd.h \ + /usr/src/linux/include/linux/ioctl.h /usr/src/linux/include/asm/ioctl.h \ + $(srcdir)/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ + $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h icount.o: $(srcdir)/icount.c $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ @@ -370,9 +371,10 @@ inode.o: $(srcdir)/inode.c $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \ $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h $(srcdir)/e2image.h -ismounted.o: $(srcdir)/ismounted.c $(srcdir)/ext2_fs.h \ - $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ - $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +ismounted.o: $(srcdir)/ismounted.c /usr/src/linux/include/linux/fd.h \ + /usr/src/linux/include/linux/ioctl.h /usr/src/linux/include/asm/ioctl.h \ + $(srcdir)/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ + $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h link.o: $(srcdir)/link.c $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ @@ -388,13 +390,6 @@ mkdir.o: $(srcdir)/mkdir.c $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h -mkjournal.o: $(srcdir)/mkjournal.c $(srcdir)/ext2_fs.h \ - $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/e2p/e2p.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ - $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h \ - $(srcdir)/jfs_user.h $(top_srcdir)/include/linux/jbd.h \ - $(top_srcdir)/include/linux/jfs_compat.h \ - $(top_srcdir)/include/linux/linked_list.h namei.o: $(srcdir)/namei.c $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ diff --git a/include/linux/jfs_compat.h b/lib/ext2fs/jfs_compat.h similarity index 98% rename from include/linux/jfs_compat.h rename to lib/ext2fs/jfs_compat.h index 8974243..c8dc5af 100644 --- a/include/linux/jfs_compat.h +++ b/lib/ext2fs/jfs_compat.h @@ -2,7 +2,7 @@ #ifndef _JFS_COMPAT_H #define _JFS_COMPAT_H -#include "linked_list.h" +#include "kernel-list.h" #include #ifdef HAVE_NETINET_IN_H #include diff --git a/lib/ext2fs/jfs_user.h b/lib/ext2fs/jfs_user.h index 1583168..3a52123 100644 --- a/lib/ext2fs/jfs_user.h +++ b/lib/ext2fs/jfs_user.h @@ -3,7 +3,6 @@ typedef unsigned short kdev_t; -#include - +#include "kernel-jbd.h" #endif /* _JFS_USER_H */ diff --git a/include/linux/jbd.h b/lib/ext2fs/kernel-jbd.h similarity index 100% rename from include/linux/jbd.h rename to lib/ext2fs/kernel-jbd.h diff --git a/include/linux/linked_list.h b/lib/ext2fs/kernel-list.h similarity index 100% rename from include/linux/linked_list.h rename to lib/ext2fs/kernel-list.h diff --git a/misc/ChangeLog b/misc/ChangeLog index 3089f82..f693d61 100644 --- a/misc/ChangeLog +++ b/misc/ChangeLog @@ -1,3 +1,11 @@ +2001-12-23 Theodore Tso + + * Makefile.in, jfs_user.h: Move linux/jbd.h to + ext2fs/kernel-jbd.h, to avoid using the system header + file version of hbd.h when using diet glibc (since it + forcibly adds /usr/include to the beginning of the + include search path.) + 2001-12-22 Theodore Tso * get_device_by_label.c (init_lvm): Add support to read out diff --git a/misc/Makefile.in b/misc/Makefile.in index a440bc0..5e14330 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -193,16 +193,6 @@ distclean: clean # Makefile dependencies follow. This must be the last section in # the Makefile.in file # -tune2fs.o: $(srcdir)/tune2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ - $(top_builddir)/lib/ext2fs/ext2_types.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/jbd.h \ - $(top_srcdir)/include/linux/jfs_compat.h \ - $(top_srcdir)/include/linux/linked_list.h $(srcdir)/util.h \ - $(srcdir)/get_device_by_label.h $(top_srcdir)/version.h \ - $(srcdir)/nls-enable.h mklost+found.o: $(srcdir)/mklost+found.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/version.h \ $(srcdir)/nls-enable.h @@ -218,14 +208,6 @@ chattr.o: $(srcdir)/chattr.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ lsattr.o: $(srcdir)/lsattr.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/et/com_err.h \ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/version.h $(srcdir)/nls-enable.h -dumpe2fs.o: $(srcdir)/dumpe2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ - $(top_builddir)/lib/ext2fs/ext2_types.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/jbd.h $(top_srcdir)/include/linux/jfs_compat.h \ - $(top_srcdir)/include/linux/linked_list.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)/lib/ext2fs/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ @@ -233,12 +215,12 @@ badblocks.o: $(srcdir)/badblocks.c $(top_srcdir)/lib/et/com_err.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)/lib/et/com_err.h \ - $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ - $(top_builddir)/lib/ext2fs/ext2_types.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)/get_device_by_label.h $(srcdir)/util.h +util.o: $(srcdir)/util.c /usr/src/linux/include/linux/major.h \ + $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/e2p/e2p.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.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)/get_device_by_label.h $(srcdir)/util.h uuidgen.o: $(srcdir)/uuidgen.c $(top_srcdir)/lib/uuid/uuid.h \ $(srcdir)/nls-enable.h -fstype.o: $(srcdir)/fstype.c +fstype.o: $(srcdir)/fstype.c $(srcdir)/fsck.h diff --git a/misc/jfs_user.h b/misc/jfs_user.h index 1583168..3070cd5 100644 --- a/misc/jfs_user.h +++ b/misc/jfs_user.h @@ -3,7 +3,6 @@ typedef unsigned short kdev_t; -#include - +#include #endif /* _JFS_USER_H */