From 9f8046fc6dfc13eee2f5c363214e60b533872cac Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Mon, 14 May 2001 11:35:52 +0000 Subject: [PATCH] Many files: alloc.c, alloc_tables.c, badblocks.c, bb_compat.c, bb_inode.c, bitmaps.c, bitops.c, block.c, bmap.c, bmove.c, brel_ma.c, check_desc.c, closefs.c, cmp_bitmaps.c, dblist.c, dblist_dir.c, dir_iterate.c, dirblock.c, dupfs.c, expanddir.c, ext2_fs.h, fileio.c, finddev.c, flushb.c, freefs.c, get_pathname.c, getsize.c, icount.c, imager.c, initialize.c, inline.c, inode.c, irel_ma.c, ismounted.c, link.c, lookup.c, mkdir.c, mkjournal.c, namei.c, native.c, newdir.c, nt_io.c, openfs.c, read_bb.c, read_bb_file.c, rs_bitmap.c, rw_bitmaps.c, swapfs.c, test_io.c, tst_badblocks.c, tst_byteswap.c, tst_getsize.c, tst_iscan.c, unix_io.c, unlink.c, valid_blk.c, version.c, write_bb_file.c, ext2_fs.h: Moved file from include/linux. Adjust all files in this directroy to include this file. --- lib/ext2fs/ChangeLog | 15 ++ lib/ext2fs/Makefile.in | 194 +++++++------- lib/ext2fs/alloc.c | 5 - lib/ext2fs/alloc_tables.c | 5 - lib/ext2fs/badblocks.c | 5 - lib/ext2fs/bb_compat.c | 5 - lib/ext2fs/bb_inode.c | 5 - lib/ext2fs/bitmaps.c | 5 - lib/ext2fs/bitops.c | 5 - lib/ext2fs/block.c | 5 - lib/ext2fs/bmap.c | 5 - lib/ext2fs/bmove.c | 5 - lib/ext2fs/brel_ma.c | 5 - lib/ext2fs/check_desc.c | 5 - lib/ext2fs/closefs.c | 5 - lib/ext2fs/cmp_bitmaps.c | 5 - lib/ext2fs/dblist.c | 5 - lib/ext2fs/dblist_dir.c | 5 - lib/ext2fs/dir_iterate.c | 5 - lib/ext2fs/dirblock.c | 5 - lib/ext2fs/dupfs.c | 5 - lib/ext2fs/expanddir.c | 5 - lib/ext2fs/ext2_fs.h | 622 +++++++++++++++++++++++++++++++++++++++++++++ lib/ext2fs/fileio.c | 5 - lib/ext2fs/finddev.c | 5 - lib/ext2fs/flushb.c | 5 - lib/ext2fs/freefs.c | 5 - lib/ext2fs/get_pathname.c | 5 - lib/ext2fs/getsize.c | 5 - lib/ext2fs/icount.c | 5 - lib/ext2fs/imager.c | 5 - lib/ext2fs/initialize.c | 5 - lib/ext2fs/inline.c | 6 - lib/ext2fs/inode.c | 5 - lib/ext2fs/irel_ma.c | 5 - lib/ext2fs/ismounted.c | 5 - lib/ext2fs/link.c | 5 - lib/ext2fs/lookup.c | 5 - lib/ext2fs/mkdir.c | 5 - lib/ext2fs/mkjournal.c | 5 - lib/ext2fs/namei.c | 5 - lib/ext2fs/native.c | 5 - lib/ext2fs/newdir.c | 5 - lib/ext2fs/nt_io.c | 2 +- lib/ext2fs/openfs.c | 5 - lib/ext2fs/read_bb.c | 5 - lib/ext2fs/read_bb_file.c | 5 - lib/ext2fs/rs_bitmap.c | 5 - lib/ext2fs/rw_bitmaps.c | 5 - lib/ext2fs/swapfs.c | 5 - lib/ext2fs/test_io.c | 5 - lib/ext2fs/tst_badblocks.c | 5 - lib/ext2fs/tst_byteswap.c | 5 - lib/ext2fs/tst_getsize.c | 5 - lib/ext2fs/tst_iscan.c | 5 - lib/ext2fs/unix_io.c | 5 - lib/ext2fs/unlink.c | 5 - lib/ext2fs/valid_blk.c | 5 - lib/ext2fs/version.c | 5 - lib/ext2fs/write_bb_file.c | 5 - 60 files changed, 733 insertions(+), 381 deletions(-) create mode 100644 lib/ext2fs/ext2_fs.h diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog index cf3e9c9..4136b97 100644 --- a/lib/ext2fs/ChangeLog +++ b/lib/ext2fs/ChangeLog @@ -1,5 +1,20 @@ 2001-05-14 Theodore Tso + * alloc.c, alloc_tables.c, badblocks.c, bb_compat.c, bb_inode.c, + bitmaps.c, bitops.c, block.c, bmap.c, bmove.c, brel_ma.c, + check_desc.c, closefs.c, cmp_bitmaps.c, dblist.c, + dblist_dir.c, dir_iterate.c, dirblock.c, dupfs.c, + expanddir.c, ext2_fs.h, fileio.c, finddev.c, flushb.c, + freefs.c, get_pathname.c, getsize.c, icount.c, imager.c, + initialize.c, inline.c, inode.c, irel_ma.c, ismounted.c, + link.c, lookup.c, mkdir.c, mkjournal.c, namei.c, native.c, + newdir.c, nt_io.c, openfs.c, read_bb.c, read_bb_file.c, + rs_bitmap.c, rw_bitmaps.c, swapfs.c, test_io.c, + tst_badblocks.c, tst_byteswap.c, tst_getsize.c, + tst_iscan.c, unix_io.c, unlink.c, valid_blk.c, version.c, + write_bb_file.c, ext2_fs.h: Moved file from include/linux. + Adjust all files in this directroy to include this file. + * mkjournal.c (ext2fs_create_journal_superblock): Remove redundant code. diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in index 970f0b8..e646fe4 100644 --- a/lib/ext2fs/Makefile.in +++ b/lib/ext2fs/Makefile.in @@ -111,7 +111,7 @@ SRCS= ext2_err.c \ $(srcdir)/version.c \ $(srcdir)/write_bb_file.c -HFILES= bitops.h ext2fs.h ext2_io.h +HFILES= bitops.h ext2fs.h ext2_io.h ext2_fs.h LIBRARY= libext2fs LIBDIR= ext2fs @@ -213,6 +213,7 @@ uninstall:: clean:: $(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/* checker/* \ tst_badblocks tst_iscan ext2_err.et ext2_err.c ext2_err.h \ + tst_byteswap tst_ismounted mkjournal \ ../libext2fs.a ../libext2fs_p.a ../libext2fs_chk.a mostlyclean:: clean @@ -230,161 +231,156 @@ $(top_builddir)/lib/ext2fs/ext2_err.h: ext2_err.h # the Makefile.in file # ext2_err.o: ext2_err.c -alloc.o: $(srcdir)/alloc.c $(top_srcdir)/include/linux/ext2_fs.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 -alloc_tables.o: $(srcdir)/alloc_tables.c \ - $(top_srcdir)/include/linux/ext2_fs.h $(srcdir)/ext2fs.h \ +alloc.o: $(srcdir)/alloc.c $(srcdir)/ext2_fs.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 -badblocks.o: $(srcdir)/badblocks.c $(top_srcdir)/include/linux/ext2_fs.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 -bb_compat.o: $(srcdir)/bb_compat.c $(top_srcdir)/include/linux/ext2_fs.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 -bb_inode.o: $(srcdir)/bb_inode.c $(top_srcdir)/include/linux/ext2_fs.h \ +alloc_tables.o: $(srcdir)/alloc_tables.c $(srcdir)/ext2_fs.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 -bitmaps.o: $(srcdir)/bitmaps.c $(top_srcdir)/include/linux/ext2_fs.h \ +badblocks.o: $(srcdir)/badblocks.c $(srcdir)/ext2_fs.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 -bitops.o: $(srcdir)/bitops.c $(top_srcdir)/include/linux/ext2_fs.h \ +bb_compat.o: $(srcdir)/bb_compat.c $(srcdir)/ext2_fs.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 -block.o: $(srcdir)/block.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +bb_inode.o: $(srcdir)/bb_inode.c $(srcdir)/ext2_fs.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 -bmap.o: $(srcdir)/bmap.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +bitmaps.o: $(srcdir)/bitmaps.c $(srcdir)/ext2_fs.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 +bitops.o: $(srcdir)/bitops.c $(srcdir)/ext2_fs.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 +block.o: $(srcdir)/block.c $(srcdir)/ext2_fs.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 -check_desc.o: $(srcdir)/check_desc.c $(top_srcdir)/include/linux/ext2_fs.h \ +bmap.o: $(srcdir)/bmap.c $(srcdir)/ext2_fs.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 +check_desc.o: $(srcdir)/check_desc.c $(srcdir)/ext2_fs.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 +closefs.o: $(srcdir)/closefs.c $(srcdir)/ext2_fs.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 -closefs.o: $(srcdir)/closefs.c $(top_srcdir)/include/linux/ext2_fs.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 -cmp_bitmaps.o: $(srcdir)/cmp_bitmaps.c $(top_srcdir)/include/linux/ext2_fs.h \ +cmp_bitmaps.o: $(srcdir)/cmp_bitmaps.c $(srcdir)/ext2_fs.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 +dblist.o: $(srcdir)/dblist.c $(srcdir)/ext2_fs.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 -dblist.o: $(srcdir)/dblist.c $(top_srcdir)/include/linux/ext2_fs.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 -dblist_dir.o: $(srcdir)/dblist_dir.c $(top_srcdir)/include/linux/ext2_fs.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 -dirblock.o: $(srcdir)/dirblock.c $(top_srcdir)/include/linux/ext2_fs.h \ +dblist_dir.o: $(srcdir)/dblist_dir.c $(srcdir)/ext2_fs.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 -dir_iterate.o: $(srcdir)/dir_iterate.c $(top_srcdir)/include/linux/ext2_fs.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 -dupfs.o: $(srcdir)/dupfs.c $(top_srcdir)/include/linux/ext2_fs.h \ +dirblock.o: $(srcdir)/dirblock.c $(srcdir)/ext2_fs.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 +dir_iterate.o: $(srcdir)/dir_iterate.c $(srcdir)/ext2_fs.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 -expanddir.o: $(srcdir)/expanddir.c $(top_srcdir)/include/linux/ext2_fs.h \ +dupfs.o: $(srcdir)/dupfs.c $(srcdir)/ext2_fs.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 -fileio.o: $(srcdir)/fileio.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +expanddir.o: $(srcdir)/expanddir.c $(srcdir)/ext2_fs.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 -finddev.o: $(srcdir)/finddev.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +fileio.o: $(srcdir)/fileio.c $(srcdir)/ext2_fs.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 -flushb.o: $(srcdir)/flushb.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +finddev.o: $(srcdir)/finddev.c $(srcdir)/ext2_fs.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 -freefs.o: $(srcdir)/freefs.c $(top_srcdir)/include/linux/ext2_fs.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 -get_pathname.o: $(srcdir)/get_pathname.c \ - $(top_srcdir)/include/linux/ext2_fs.h $(srcdir)/ext2fs.h \ +flushb.o: $(srcdir)/flushb.c $(srcdir)/ext2_fs.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 $(top_srcdir)/include/linux/ext2_fs.h \ +freefs.o: $(srcdir)/freefs.c $(srcdir)/ext2_fs.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 -icount.o: $(srcdir)/icount.c $(top_srcdir)/include/linux/ext2_fs.h \ +get_pathname.o: $(srcdir)/get_pathname.c $(srcdir)/ext2_fs.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 -imager.o: $(srcdir)/imager.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +getsize.o: $(srcdir)/getsize.c $(srcdir)/ext2_fs.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 -initialize.o: $(srcdir)/initialize.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +icount.o: $(srcdir)/icount.c $(srcdir)/ext2_fs.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 -inline.o: $(srcdir)/inline.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +imager.o: $(srcdir)/imager.c $(srcdir)/ext2_fs.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 -inode.o: $(srcdir)/inode.c $(top_srcdir)/include/linux/ext2_fs.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 $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +initialize.o: $(srcdir)/initialize.c $(srcdir)/ext2_fs.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 +inline.o: $(srcdir)/inline.c $(srcdir)/ext2_fs.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 $(top_srcdir)/include/linux/ext2_fs.h \ +inode.o: $(srcdir)/inode.c $(srcdir)/ext2_fs.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 $(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 $(srcdir)/ext2fs.h \ + $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h llseek.o: $(srcdir)/llseek.c $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h -lookup.o: $(srcdir)/lookup.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +lookup.o: $(srcdir)/lookup.c $(srcdir)/ext2_fs.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 -mkdir.o: $(srcdir)/mkdir.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +mkdir.o: $(srcdir)/mkdir.c $(srcdir)/ext2_fs.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 $(top_srcdir)/include/linux/ext2_fs.h \ +mkjournal.o: $(srcdir)/mkjournal.c $(srcdir)/ext2_fs.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/jfs.h \ $(top_srcdir)/include/linux/jfs_compat.h $(top_srcdir)/include/linux/list.h -namei.o: $(srcdir)/namei.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +namei.o: $(srcdir)/namei.c $(srcdir)/ext2_fs.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 -native.o: $(srcdir)/native.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +native.o: $(srcdir)/native.c $(srcdir)/ext2_fs.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 -newdir.o: $(srcdir)/newdir.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +newdir.o: $(srcdir)/newdir.c $(srcdir)/ext2_fs.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 -openfs.o: $(srcdir)/openfs.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +openfs.o: $(srcdir)/openfs.c $(srcdir)/ext2_fs.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 -read_bb.o: $(srcdir)/read_bb.c $(top_srcdir)/include/linux/ext2_fs.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 -read_bb_file.o: $(srcdir)/read_bb_file.c \ - $(top_srcdir)/include/linux/ext2_fs.h $(srcdir)/ext2fs.h \ +read_bb.o: $(srcdir)/read_bb.c $(srcdir)/ext2_fs.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 -rs_bitmap.o: $(srcdir)/rs_bitmap.c $(top_srcdir)/include/linux/ext2_fs.h \ +read_bb_file.o: $(srcdir)/read_bb_file.c $(srcdir)/ext2_fs.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 -rw_bitmaps.o: $(srcdir)/rw_bitmaps.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +rs_bitmap.o: $(srcdir)/rs_bitmap.c $(srcdir)/ext2_fs.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 +rw_bitmaps.o: $(srcdir)/rw_bitmaps.c $(srcdir)/ext2_fs.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 -swapfs.o: $(srcdir)/swapfs.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +swapfs.o: $(srcdir)/swapfs.c $(srcdir)/ext2_fs.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 -test_io.o: $(srcdir)/test_io.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +test_io.o: $(srcdir)/test_io.c $(srcdir)/ext2_fs.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 -unix_io.o: $(srcdir)/unix_io.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +unix_io.o: $(srcdir)/unix_io.c $(srcdir)/ext2_fs.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 -unlink.o: $(srcdir)/unlink.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +unlink.o: $(srcdir)/unlink.c $(srcdir)/ext2_fs.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 -valid_blk.o: $(srcdir)/valid_blk.c $(top_srcdir)/include/linux/ext2_fs.h \ - $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ +valid_blk.o: $(srcdir)/valid_blk.c $(srcdir)/ext2_fs.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 -version.o: $(srcdir)/version.c $(top_srcdir)/include/linux/ext2_fs.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)/../../version.h -write_bb_file.o: $(srcdir)/write_bb_file.c \ - $(top_srcdir)/include/linux/ext2_fs.h $(srcdir)/ext2fs.h \ +version.o: $(srcdir)/version.c $(srcdir)/ext2_fs.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 \ + $(top_srcdir)/version.h +write_bb_file.o: $(srcdir)/write_bb_file.c $(srcdir)/ext2_fs.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 diff --git a/lib/ext2fs/alloc.c b/lib/ext2fs/alloc.c index e89c55f..3661f98 100644 --- a/lib/ext2fs/alloc.c +++ b/lib/ext2fs/alloc.c @@ -23,12 +23,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" /* diff --git a/lib/ext2fs/alloc_tables.c b/lib/ext2fs/alloc_tables.c index 8113854..ca274cc 100644 --- a/lib/ext2fs/alloc_tables.c +++ b/lib/ext2fs/alloc_tables.c @@ -24,12 +24,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" errcode_t ext2fs_allocate_group_table(ext2_filsys fs, dgrp_t group, diff --git a/lib/ext2fs/badblocks.c b/lib/ext2fs/badblocks.c index 195c8be..4e94e8c 100644 --- a/lib/ext2fs/badblocks.c +++ b/lib/ext2fs/badblocks.c @@ -23,12 +23,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fsP.h" /* diff --git a/lib/ext2fs/bb_compat.c b/lib/ext2fs/bb_compat.c index 63b0aad..40f7343 100644 --- a/lib/ext2fs/bb_compat.c +++ b/lib/ext2fs/bb_compat.c @@ -23,12 +23,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fsP.h" errcode_t badblocks_list_create(badblocks_list *ret, int size) diff --git a/lib/ext2fs/bb_inode.c b/lib/ext2fs/bb_inode.c index a9e32b3..34c4955 100644 --- a/lib/ext2fs/bb_inode.c +++ b/lib/ext2fs/bb_inode.c @@ -27,12 +27,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" struct set_badblock_record { diff --git a/lib/ext2fs/bitmaps.c b/lib/ext2fs/bitmaps.c index d215f30..44f16a9 100644 --- a/lib/ext2fs/bitmaps.c +++ b/lib/ext2fs/bitmaps.c @@ -24,12 +24,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" static errcode_t make_bitmap(__u32 start, __u32 end, __u32 real_end, diff --git a/lib/ext2fs/bitops.c b/lib/ext2fs/bitops.c index 3a74c02..e27c5a0 100644 --- a/lib/ext2fs/bitops.c +++ b/lib/ext2fs/bitops.c @@ -15,12 +15,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" #ifndef _EXT2_HAVE_ASM_BITOPS_ diff --git a/lib/ext2fs/block.c b/lib/ext2fs/block.c index bd07023..1abbf38 100644 --- a/lib/ext2fs/block.c +++ b/lib/ext2fs/block.c @@ -15,12 +15,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" struct block_context { diff --git a/lib/ext2fs/bmap.c b/lib/ext2fs/bmap.c index 7677499..6d73328 100644 --- a/lib/ext2fs/bmap.c +++ b/lib/ext2fs/bmap.c @@ -15,12 +15,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" #if defined(__GNUC__) && !defined(NO_INLINE_FUNCS) diff --git a/lib/ext2fs/bmove.c b/lib/ext2fs/bmove.c index e3cac4d..c0205ca 100644 --- a/lib/ext2fs/bmove.c +++ b/lib/ext2fs/bmove.c @@ -18,12 +18,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fsP.h" struct process_block_struct { diff --git a/lib/ext2fs/brel_ma.c b/lib/ext2fs/brel_ma.c index 3dbdc84..8ad8e9f 100644 --- a/lib/ext2fs/brel_ma.c +++ b/lib/ext2fs/brel_ma.c @@ -22,12 +22,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" #include "brel.h" diff --git a/lib/ext2fs/check_desc.c b/lib/ext2fs/check_desc.c index d946570..902c4b6 100644 --- a/lib/ext2fs/check_desc.c +++ b/lib/ext2fs/check_desc.c @@ -23,12 +23,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" /* diff --git a/lib/ext2fs/closefs.c b/lib/ext2fs/closefs.c index 976062a..91a342a 100644 --- a/lib/ext2fs/closefs.c +++ b/lib/ext2fs/closefs.c @@ -16,12 +16,7 @@ #include #include -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fsP.h" static int test_root(int a, int b) diff --git a/lib/ext2fs/cmp_bitmaps.c b/lib/ext2fs/cmp_bitmaps.c index 1f27421..51cc3d0 100644 --- a/lib/ext2fs/cmp_bitmaps.c +++ b/lib/ext2fs/cmp_bitmaps.c @@ -23,12 +23,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" errcode_t ext2fs_compare_block_bitmap(ext2fs_block_bitmap bm1, diff --git a/lib/ext2fs/dblist.c b/lib/ext2fs/dblist.c index 4688aa7..a195b5b 100644 --- a/lib/ext2fs/dblist.c +++ b/lib/ext2fs/dblist.c @@ -17,12 +17,7 @@ #include #include -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fsP.h" static EXT2_QSORT_TYPE dir_block_cmp(const void *a, const void *b); diff --git a/lib/ext2fs/dblist_dir.c b/lib/ext2fs/dblist_dir.c index f4c3f62..c4ea584 100644 --- a/lib/ext2fs/dblist_dir.c +++ b/lib/ext2fs/dblist_dir.c @@ -17,12 +17,7 @@ #include #include -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fsP.h" static int db_dir_proc(ext2_filsys fs, struct ext2_db_entry *db_info, diff --git a/lib/ext2fs/dir_iterate.c b/lib/ext2fs/dir_iterate.c index c47d1e6..ae97d82 100644 --- a/lib/ext2fs/dir_iterate.c +++ b/lib/ext2fs/dir_iterate.c @@ -18,12 +18,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fsP.h" errcode_t ext2fs_dir_iterate(ext2_filsys fs, diff --git a/lib/ext2fs/dirblock.c b/lib/ext2fs/dirblock.c index 0101a5e..d1d8ca8 100644 --- a/lib/ext2fs/dirblock.c +++ b/lib/ext2fs/dirblock.c @@ -16,12 +16,7 @@ #include #include -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" errcode_t ext2fs_read_dir_block(ext2_filsys fs, blk_t block, diff --git a/lib/ext2fs/dupfs.c b/lib/ext2fs/dupfs.c index 4fb1c3f..31579a4 100644 --- a/lib/ext2fs/dupfs.c +++ b/lib/ext2fs/dupfs.c @@ -16,12 +16,7 @@ #include #include -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fsP.h" errcode_t ext2fs_dup_handle(ext2_filsys src, ext2_filsys *dest) diff --git a/lib/ext2fs/expanddir.c b/lib/ext2fs/expanddir.c index 0e6adeb..112dedc 100644 --- a/lib/ext2fs/expanddir.c +++ b/lib/ext2fs/expanddir.c @@ -15,12 +15,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" struct expand_dir_struct { diff --git a/lib/ext2fs/ext2_fs.h b/lib/ext2fs/ext2_fs.h new file mode 100644 index 0000000..72636c2 --- /dev/null +++ b/lib/ext2fs/ext2_fs.h @@ -0,0 +1,622 @@ +/* + * linux/include/linux/ext2_fs.h + * + * Copyright (C) 1992, 1993, 1994, 1995 + * Remy Card (card@masi.ibp.fr) + * Laboratoire MASI - Institut Blaise Pascal + * Universite Pierre et Marie Curie (Paris VI) + * + * from + * + * linux/include/linux/minix_fs.h + * + * Copyright (C) 1991, 1992 Linus Torvalds + */ + +#ifndef _LINUX_EXT2_FS_H +#define _LINUX_EXT2_FS_H + +#include /* Changed from linux/types.h */ + +/* + * The second extended filesystem constants/structures + */ + +/* + * Define EXT2FS_DEBUG to produce debug messages + */ +#undef EXT2FS_DEBUG + +/* + * Define EXT2_PREALLOCATE to preallocate data blocks for expanding files + */ +#define EXT2_PREALLOCATE +#define EXT2_DEFAULT_PREALLOC_BLOCKS 8 + +/* + * The second extended file system version + */ +#define EXT2FS_DATE "95/08/09" +#define EXT2FS_VERSION "0.5b" + +/* + * Special inodes numbers + */ +#define EXT2_BAD_INO 1 /* Bad blocks inode */ +#define EXT2_ROOT_INO 2 /* Root inode */ +#define EXT2_ACL_IDX_INO 3 /* ACL inode */ +#define EXT2_ACL_DATA_INO 4 /* ACL inode */ +#define EXT2_BOOT_LOADER_INO 5 /* Boot loader inode */ +#define EXT2_UNDEL_DIR_INO 6 /* Undelete directory inode */ +#define EXT2_RESIZE_INO 7 /* Reserved group descriptors inode */ +#define EXT2_JOURNAL_INO 8 /* Journal inode */ + +/* First non-reserved inode for old ext2 filesystems */ +#define EXT2_GOOD_OLD_FIRST_INO 11 + +/* + * The second extended file system magic number + */ +#define EXT2_SUPER_MAGIC 0xEF53 + +/* + * Maximal count of links to a file + */ +#define EXT2_LINK_MAX 32000 + +/* + * Macro-instructions used to manage several block sizes + */ +#define EXT2_MIN_BLOCK_SIZE 1024 +#define EXT2_MAX_BLOCK_SIZE 4096 +#define EXT2_MIN_BLOCK_LOG_SIZE 10 +#ifdef __KERNEL__ +# define EXT2_BLOCK_SIZE(s) ((s)->s_blocksize) +#else +# define EXT2_BLOCK_SIZE(s) (EXT2_MIN_BLOCK_SIZE << (s)->s_log_block_size) +#endif +#define EXT2_ACLE_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (struct ext2_acl_entry)) +#define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (__u32)) +#ifdef __KERNEL__ +# define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_blocksize_bits) +#else +# define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10) +#endif +#ifdef __KERNEL__ +#define EXT2_ADDR_PER_BLOCK_BITS(s) ((s)->u.ext2_sb.s_addr_per_block_bits) +#define EXT2_INODE_SIZE(s) ((s)->u.ext2_sb.s_inode_size) +#define EXT2_FIRST_INO(s) ((s)->u.ext2_sb.s_first_ino) +#else +#define EXT2_INODE_SIZE(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \ + EXT2_GOOD_OLD_INODE_SIZE : \ + (s)->s_inode_size) +#define EXT2_FIRST_INO(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \ + EXT2_GOOD_OLD_FIRST_INO : \ + (s)->s_first_ino) +#endif + +/* + * Macro-instructions used to manage fragments + */ +#define EXT2_MIN_FRAG_SIZE 1024 +#define EXT2_MAX_FRAG_SIZE 4096 +#define EXT2_MIN_FRAG_LOG_SIZE 10 +#ifdef __KERNEL__ +# define EXT2_FRAG_SIZE(s) ((s)->u.ext2_sb.s_frag_size) +# define EXT2_FRAGS_PER_BLOCK(s) ((s)->u.ext2_sb.s_frags_per_block) +#else +# define EXT2_FRAG_SIZE(s) (EXT2_MIN_FRAG_SIZE << (s)->s_log_frag_size) +# define EXT2_FRAGS_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / EXT2_FRAG_SIZE(s)) +#endif + +/* + * ACL structures + */ +struct ext2_acl_header /* Header of Access Control Lists */ +{ + __u32 aclh_size; + __u32 aclh_file_count; + __u32 aclh_acle_count; + __u32 aclh_first_acle; +}; + +struct ext2_acl_entry /* Access Control List Entry */ +{ + __u32 acle_size; + __u16 acle_perms; /* Access permissions */ + __u16 acle_type; /* Type of entry */ + __u16 acle_tag; /* User or group identity */ + __u16 acle_pad1; + __u32 acle_next; /* Pointer on next entry for the */ + /* same inode or on next free entry */ +}; + +/* + * Structure of a blocks group descriptor + */ +struct ext2_group_desc +{ + __u32 bg_block_bitmap; /* Blocks bitmap block */ + __u32 bg_inode_bitmap; /* Inodes bitmap block */ + __u32 bg_inode_table; /* Inodes table block */ + __u16 bg_free_blocks_count; /* Free blocks count */ + __u16 bg_free_inodes_count; /* Free inodes count */ + __u16 bg_used_dirs_count; /* Directories count */ + __u16 bg_pad; + __u32 bg_reserved[3]; +}; + +/* + * Macro-instructions used to manage group descriptors + */ +#ifdef __KERNEL__ +# define EXT2_BLOCKS_PER_GROUP(s) ((s)->u.ext2_sb.s_blocks_per_group) +# define EXT2_DESC_PER_BLOCK(s) ((s)->u.ext2_sb.s_desc_per_block) +# define EXT2_INODES_PER_GROUP(s) ((s)->u.ext2_sb.s_inodes_per_group) +# define EXT2_DESC_PER_BLOCK_BITS(s) ((s)->u.ext2_sb.s_desc_per_block_bits) +#else +# define EXT2_BLOCKS_PER_GROUP(s) ((s)->s_blocks_per_group) +# define EXT2_DESC_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (struct ext2_group_desc)) +# define EXT2_INODES_PER_GROUP(s) ((s)->s_inodes_per_group) +#endif + +/* + * Constants relative to the data blocks + */ +#define EXT2_NDIR_BLOCKS 12 +#define EXT2_IND_BLOCK EXT2_NDIR_BLOCKS +#define EXT2_DIND_BLOCK (EXT2_IND_BLOCK + 1) +#define EXT2_TIND_BLOCK (EXT2_DIND_BLOCK + 1) +#define EXT2_N_BLOCKS (EXT2_TIND_BLOCK + 1) + +/* + * Inode flags + */ +#define EXT2_SECRM_FL 0x00000001 /* Secure deletion */ +#define EXT2_UNRM_FL 0x00000002 /* Undelete */ +#define EXT2_COMPR_FL 0x00000004 /* Compress file */ +#define EXT2_SYNC_FL 0x00000008 /* Synchronous updates */ +#define EXT2_IMMUTABLE_FL 0x00000010 /* Immutable file */ +#define EXT2_APPEND_FL 0x00000020 /* writes to file may only append */ +#define EXT2_NODUMP_FL 0x00000040 /* do not dump file */ +#define EXT2_NOATIME_FL 0x00000080 /* do not update atime */ +/* Reserved for compression usage... */ +#define EXT2_DIRTY_FL 0x00000100 +#define EXT2_COMPRBLK_FL 0x00000200 /* One or more compressed clusters */ +#define EXT2_NOCOMPR_FL 0x00000400 /* Access raw compressed data */ +#define EXT2_ECOMPR_FL 0x00000800 /* Compression error */ +/* End compression flags --- maybe not all used */ +#define EXT2_BTREE_FL 0x00001000 /* btree format dir */ +#define EXT2_IMAGIC_FL 0x00002000 +#define EXT3_JOURNAL_DATA_FL 0x00004000 /* file data should be journaled */ +#define EXT2_RESERVED_FL 0x80000000 /* reserved for ext2 lib */ + +#define EXT2_FL_USER_VISIBLE 0x00005FFF /* User visible flags */ +#define EXT2_FL_USER_MODIFIABLE 0x000000FF /* User modifiable flags */ + +/* + * ioctl commands + */ +#define EXT2_IOC_GETFLAGS _IOR('f', 1, long) +#define EXT2_IOC_SETFLAGS _IOW('f', 2, long) +#define EXT2_IOC_GETVERSION _IOR('v', 1, long) +#define EXT2_IOC_SETVERSION _IOW('v', 2, long) + +/* + * Structure of an inode on the disk + */ +struct ext2_inode { + __u16 i_mode; /* File mode */ + __u16 i_uid; /* Low 16 bits of Owner Uid */ + __u32 i_size; /* Size in bytes */ + __u32 i_atime; /* Access time */ + __u32 i_ctime; /* Creation time */ + __u32 i_mtime; /* Modification time */ + __u32 i_dtime; /* Deletion Time */ + __u16 i_gid; /* Low 16 bits of Group Id */ + __u16 i_links_count; /* Links count */ + __u32 i_blocks; /* Blocks count */ + __u32 i_flags; /* File flags */ + union { + struct { + __u32 l_i_reserved1; + } linux1; + struct { + __u32 h_i_translator; + } hurd1; + struct { + __u32 m_i_reserved1; + } masix1; + } osd1; /* OS dependent 1 */ + __u32 i_block[EXT2_N_BLOCKS];/* Pointers to blocks */ + __u32 i_generation; /* File version (for NFS) */ + __u32 i_file_acl; /* File ACL */ + __u32 i_dir_acl; /* Directory ACL */ + __u32 i_faddr; /* Fragment address */ + union { + struct { + __u8 l_i_frag; /* Fragment number */ + __u8 l_i_fsize; /* Fragment size */ + __u16 i_pad1; + __u16 l_i_uid_high; /* these 2 fields */ + __u16 l_i_gid_high; /* were reserved2[0] */ + __u32 l_i_reserved2; + } linux2; + struct { + __u8 h_i_frag; /* Fragment number */ + __u8 h_i_fsize; /* Fragment size */ + __u16 h_i_mode_high; + __u16 h_i_uid_high; + __u16 h_i_gid_high; + __u32 h_i_author; + } hurd2; + struct { + __u8 m_i_frag; /* Fragment number */ + __u8 m_i_fsize; /* Fragment size */ + __u16 m_pad1; + __u32 m_i_reserved2[2]; + } masix2; + } osd2; /* OS dependent 2 */ +}; + +#define i_size_high i_dir_acl + +#if defined(__KERNEL__) || defined(__linux__) +#define i_reserved1 osd1.linux1.l_i_reserved1 +#define i_frag osd2.linux2.l_i_frag +#define i_fsize osd2.linux2.l_i_fsize +#define i_uid_low i_uid +#define i_gid_low i_gid +#define i_uid_high osd2.linux2.l_i_uid_high +#define i_gid_high osd2.linux2.l_i_gid_high +#define i_reserved2 osd2.linux2.l_i_reserved2 + +#elif defined(__GNU__) + +#define i_translator osd1.hurd1.h_i_translator +#define i_frag osd2.hurd2.h_i_frag; +#define i_fsize osd2.hurd2.h_i_fsize; +#define i_uid_high osd2.hurd2.h_i_uid_high +#define i_gid_high osd2.hurd2.h_i_gid_high +#define i_author osd2.hurd2.h_i_author + +#elif defined(__masix__) + +#define i_reserved1 osd1.masix1.m_i_reserved1 +#define i_frag osd2.masix2.m_i_frag +#define i_fsize osd2.masix2.m_i_fsize +#define i_reserved2 osd2.masix2.m_i_reserved2 + +#endif /* defined(__KERNEL) || defined(__linux__) */ + +/* + * File system states + */ +#define EXT2_VALID_FS 0x0001 /* Unmounted cleanly */ +#define EXT2_ERROR_FS 0x0002 /* Errors detected */ + +/* + * Mount flags + */ +#define EXT2_MOUNT_CHECK 0x0001 /* Do mount-time checks */ +#define EXT2_MOUNT_GRPID 0x0004 /* Create files with directory's group */ +#define EXT2_MOUNT_DEBUG 0x0008 /* Some debugging messages */ +#define EXT2_MOUNT_ERRORS_CONT 0x0010 /* Continue on errors */ +#define EXT2_MOUNT_ERRORS_RO 0x0020 /* Remount fs ro on errors */ +#define EXT2_MOUNT_ERRORS_PANIC 0x0040 /* Panic on errors */ +#define EXT2_MOUNT_MINIX_DF 0x0080 /* Mimics the Minix statfs */ +#define EXT2_MOUNT_NO_UID32 0x0200 /* Disable 32-bit UIDs */ + +#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt +#define set_opt(o, opt) o |= EXT2_MOUNT_##opt +#define test_opt(sb, opt) ((sb)->u.ext2_sb.s_mount_opt & \ + EXT2_MOUNT_##opt) +/* + * Maximal mount counts between two filesystem checks + */ +#define EXT2_DFL_MAX_MNT_COUNT 20 /* Allow 20 mounts */ +#define EXT2_DFL_CHECKINTERVAL 0 /* Don't use interval check */ + +/* + * Behaviour when detecting errors + */ +#define EXT2_ERRORS_CONTINUE 1 /* Continue execution */ +#define EXT2_ERRORS_RO 2 /* Remount fs read-only */ +#define EXT2_ERRORS_PANIC 3 /* Panic */ +#define EXT2_ERRORS_DEFAULT EXT2_ERRORS_CONTINUE + +/* + * Structure of the super block + */ +struct ext2_super_block { + __u32 s_inodes_count; /* Inodes count */ + __u32 s_blocks_count; /* Blocks count */ + __u32 s_r_blocks_count; /* Reserved blocks count */ + __u32 s_free_blocks_count; /* Free blocks count */ + __u32 s_free_inodes_count; /* Free inodes count */ + __u32 s_first_data_block; /* First Data Block */ + __u32 s_log_block_size; /* Block size */ + __s32 s_log_frag_size; /* Fragment size */ + __u32 s_blocks_per_group; /* # Blocks per group */ + __u32 s_frags_per_group; /* # Fragments per group */ + __u32 s_inodes_per_group; /* # Inodes per group */ + __u32 s_mtime; /* Mount time */ + __u32 s_wtime; /* Write time */ + __u16 s_mnt_count; /* Mount count */ + __s16 s_max_mnt_count; /* Maximal mount count */ + __u16 s_magic; /* Magic signature */ + __u16 s_state; /* File system state */ + __u16 s_errors; /* Behaviour when detecting errors */ + __u16 s_minor_rev_level; /* minor revision level */ + __u32 s_lastcheck; /* time of last check */ + __u32 s_checkinterval; /* max. time between checks */ + __u32 s_creator_os; /* OS */ + __u32 s_rev_level; /* Revision level */ + __u16 s_def_resuid; /* Default uid for reserved blocks */ + __u16 s_def_resgid; /* Default gid for reserved blocks */ + /* + * These fields are for EXT2_DYNAMIC_REV superblocks only. + * + * Note: the difference between the compatible feature set and + * the incompatible feature set is that if there is a bit set + * in the incompatible feature set that the kernel doesn't + * know about, it should refuse to mount the filesystem. + * + * e2fsck's requirements are more strict; if it doesn't know + * about a feature in either the compatible or incompatible + * feature set, it must abort and not try to meddle with + * things it doesn't understand... + */ + __u32 s_first_ino; /* First non-reserved inode */ + __u16 s_inode_size; /* size of inode structure */ + __u16 s_block_group_nr; /* block group # of this superblock */ + __u32 s_feature_compat; /* compatible feature set */ + __u32 s_feature_incompat; /* incompatible feature set */ + __u32 s_feature_ro_compat; /* readonly-compatible feature set */ + __u8 s_uuid[16]; /* 128-bit uuid for volume */ + char s_volume_name[16]; /* volume name */ + char s_last_mounted[64]; /* directory where last mounted */ + __u32 s_algorithm_usage_bitmap; /* For compression */ + /* + * Performance hints. Directory preallocation should only + * happen if the EXT2_FEATURE_COMPAT_DIR_PREALLOC flag is on. + */ + __u8 s_prealloc_blocks; /* Nr of blocks to try to preallocate*/ + __u8 s_prealloc_dir_blocks; /* Nr to preallocate for dirs */ + __u16 s_padding1; + /* + * Journaling support valid if EXT2_FEATURE_COMPAT_HAS_JOURNAL set. + */ + __u8 s_journal_uuid[16]; /* uuid of journal superblock */ + __u32 s_journal_inum; /* inode number of journal file */ + __u32 s_journal_dev; /* device number of journal file */ + __u32 s_last_orphan; /* start of list of inodes to delete */ + + __u32 s_reserved[197]; /* Padding to the end of the block */ +}; + +#ifdef __KERNEL__ +#define EXT2_SB(sb) (&((sb)->u.ext2_sb)) +#else +/* Assume that user mode programs are passing in an ext2fs superblock, not + * a kernel struct super_block. This will allow us to call the feature-test + * macros from user land. */ +#define EXT2_SB(sb) (sb) +#endif + +/* + * Codes for operating systems + */ +#define EXT2_OS_LINUX 0 +#define EXT2_OS_HURD 1 +#define EXT2_OS_MASIX 2 +#define EXT2_OS_FREEBSD 3 +#define EXT2_OS_LITES 4 + +/* + * Revision levels + */ +#define EXT2_GOOD_OLD_REV 0 /* The good old (original) format */ +#define EXT2_DYNAMIC_REV 1 /* V2 format w/ dynamic inode sizes */ + +#define EXT2_CURRENT_REV EXT2_GOOD_OLD_REV +#define EXT2_MAX_SUPP_REV EXT2_DYNAMIC_REV + +#define EXT2_GOOD_OLD_INODE_SIZE 128 + +/* + * Feature set definitions + */ + +#define EXT2_HAS_COMPAT_FEATURE(sb,mask) \ + ( EXT2_SB(sb)->s_feature_compat & (mask) ) +#define EXT2_HAS_RO_COMPAT_FEATURE(sb,mask) \ + ( EXT2_SB(sb)->s_feature_ro_compat & (mask) ) +#define EXT2_HAS_INCOMPAT_FEATURE(sb,mask) \ + ( EXT2_SB(sb)->s_feature_incompat & (mask) ) + +#define EXT2_FEATURE_COMPAT_DIR_PREALLOC 0x0001 +#define EXT2_FEATURE_COMPAT_IMAGIC_INODES 0x0002 +#define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004 +#define EXT2_FEATURE_COMPAT_DIR_INDEX 0x0008 +#define EXT2_FEATURE_COMPAT_RESIZE_INODE 0x0010 + +#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001 +#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 +#define EXT2_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 + +#define EXT2_FEATURE_INCOMPAT_COMPRESSION 0x0001 +#define EXT2_FEATURE_INCOMPAT_FILETYPE 0x0002 +#define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004 /* Needs recovery */ +#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008 /* Journal device */ + +#define EXT2_FEATURE_COMPAT_SUPP 0 +#define EXT2_FEATURE_INCOMPAT_SUPP EXT2_FEATURE_INCOMPAT_FILETYPE +#define EXT2_FEATURE_RO_COMPAT_SUPP (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \ + EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \ + EXT2_FEATURE_RO_COMPAT_BTREE_DIR) + +/* + * Default values for user and/or group using reserved blocks + */ +#define EXT2_DEF_RESUID 0 +#define EXT2_DEF_RESGID 0 + +/* + * Structure of a directory entry + */ +#define EXT2_NAME_LEN 255 + +struct ext2_dir_entry { + __u32 inode; /* Inode number */ + __u16 rec_len; /* Directory entry length */ + __u16 name_len; /* Name length */ + char name[EXT2_NAME_LEN]; /* File name */ +}; + +/* + * The new version of the directory entry. Since EXT2 structures are + * stored in intel byte order, and the name_len field could never be + * bigger than 255 chars, it's safe to reclaim the extra byte for the + * file_type field. + */ +struct ext2_dir_entry_2 { + __u32 inode; /* Inode number */ + __u16 rec_len; /* Directory entry length */ + __u8 name_len; /* Name length */ + __u8 file_type; + char name[EXT2_NAME_LEN]; /* File name */ +}; + +/* + * Ext2 directory file types. Only the low 3 bits are used. The + * other bits are reserved for now. + */ +#define EXT2_FT_UNKNOWN 0 +#define EXT2_FT_REG_FILE 1 +#define EXT2_FT_DIR 2 +#define EXT2_FT_CHRDEV 3 +#define EXT2_FT_BLKDEV 4 +#define EXT2_FT_FIFO 5 +#define EXT2_FT_SOCK 6 +#define EXT2_FT_SYMLINK 7 + +#define EXT2_FT_MAX 8 + +/* + * EXT2_DIR_PAD defines the directory entries boundaries + * + * NOTE: It must be a multiple of 4 + */ +#define EXT2_DIR_PAD 4 +#define EXT2_DIR_ROUND (EXT2_DIR_PAD - 1) +#define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \ + ~EXT2_DIR_ROUND) + +#ifdef __KERNEL__ +/* + * Function prototypes + */ + +/* + * Ok, these declarations are also in but none of the + * ext2 source programs needs to include it so they are duplicated here. + */ +# define NORET_TYPE /**/ +# define ATTRIB_NORET __attribute__((noreturn)) +# define NORET_AND noreturn, + +/* acl.c */ +extern int ext2_permission (struct inode *, int); + +/* balloc.c */ +extern int ext2_bg_has_super(struct super_block *sb, int group); +extern unsigned long ext2_bg_num_gdb(struct super_block *sb, int group); +extern int ext2_new_block (const struct inode *, unsigned long, + __u32 *, __u32 *, int *); +extern void ext2_free_blocks (const struct inode *, unsigned long, + unsigned long); +extern unsigned long ext2_count_free_blocks (struct super_block *); +extern void ext2_check_blocks_bitmap (struct super_block *); +extern struct ext2_group_desc * ext2_get_group_desc(struct super_block * sb, + unsigned int block_group, + struct buffer_head ** bh); + +/* bitmap.c */ +extern unsigned long ext2_count_free (struct buffer_head *, unsigned); + +/* dir.c */ +extern int ext2_check_dir_entry (const char *, struct inode *, + struct ext2_dir_entry_2 *, struct buffer_head *, + unsigned long); + +/* file.c */ +extern int ext2_read (struct inode *, struct file *, char *, int); +extern int ext2_write (struct inode *, struct file *, char *, int); + +/* fsync.c */ +extern int ext2_sync_file (struct file *, struct dentry *, int); +extern int ext2_fsync_inode (struct inode *, int); + +/* ialloc.c */ +extern struct inode * ext2_new_inode (const struct inode *, int); +extern void ext2_free_inode (struct inode *); +extern unsigned long ext2_count_free_inodes (struct super_block *); +extern void ext2_check_inodes_bitmap (struct super_block *); + +/* inode.c */ + +extern struct buffer_head * ext2_getblk (struct inode *, long, int, int *); +extern struct buffer_head * ext2_bread (struct inode *, int, int, int *); + +extern void ext2_read_inode (struct inode *); +extern void ext2_write_inode (struct inode *, int); +extern void ext2_put_inode (struct inode *); +extern void ext2_delete_inode (struct inode *); +extern int ext2_sync_inode (struct inode *); +extern void ext2_discard_prealloc (struct inode *); + +/* ioctl.c */ +extern int ext2_ioctl (struct inode *, struct file *, unsigned int, + unsigned long); + +/* namei.c */ +extern struct inode_operations ext2_dir_inode_operations; + +/* super.c */ +extern void ext2_error (struct super_block *, const char *, const char *, ...) + __attribute__ ((format (printf, 3, 4))); +extern NORET_TYPE void ext2_panic (struct super_block *, const char *, + const char *, ...) + __attribute__ ((NORET_AND format (printf, 3, 4))); +extern void ext2_warning (struct super_block *, const char *, const char *, ...) + __attribute__ ((format (printf, 3, 4))); +extern void ext2_update_dynamic_rev (struct super_block *sb); +extern void ext2_put_super (struct super_block *); +extern void ext2_write_super (struct super_block *); +extern int ext2_remount (struct super_block *, int *, char *); +extern struct super_block * ext2_read_super (struct super_block *,void *,int); +extern int ext2_statfs (struct super_block *, struct statfs *); + +/* truncate.c */ +extern void ext2_truncate (struct inode *); + +/* + * Inodes and files operations + */ + +/* dir.c */ +extern struct file_operations ext2_dir_operations; + +/* file.c */ +extern struct inode_operations ext2_file_inode_operations; +extern struct file_operations ext2_file_operations; + +/* symlink.c */ +extern struct inode_operations ext2_fast_symlink_inode_operations; + +extern struct address_space_operations ext2_aops; + +#endif /* __KERNEL__ */ + +#endif /* _LINUX_EXT2_FS_H */ diff --git a/lib/ext2fs/fileio.c b/lib/ext2fs/fileio.c index b326fe2..80e5032 100644 --- a/lib/ext2fs/fileio.c +++ b/lib/ext2fs/fileio.c @@ -15,12 +15,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" struct ext2_file { diff --git a/lib/ext2fs/finddev.c b/lib/ext2fs/finddev.c index 69b5d4b..5d85324 100644 --- a/lib/ext2fs/finddev.c +++ b/lib/ext2fs/finddev.c @@ -31,12 +31,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" struct dir_list { diff --git a/lib/ext2fs/flushb.c b/lib/ext2fs/flushb.c index 342576b..03f48a6 100644 --- a/lib/ext2fs/flushb.c +++ b/lib/ext2fs/flushb.c @@ -21,12 +21,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" /* diff --git a/lib/ext2fs/freefs.c b/lib/ext2fs/freefs.c index 485f921..5cb3cf8 100644 --- a/lib/ext2fs/freefs.c +++ b/lib/ext2fs/freefs.c @@ -14,12 +14,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fsP.h" static void ext2fs_free_inode_cache(struct ext2_inode_cache *icache); diff --git a/lib/ext2fs/get_pathname.c b/lib/ext2fs/get_pathname.c index 3e37fe8..e218f2e 100644 --- a/lib/ext2fs/get_pathname.c +++ b/lib/ext2fs/get_pathname.c @@ -24,12 +24,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" struct get_pathname_struct { diff --git a/lib/ext2fs/getsize.c b/lib/ext2fs/getsize.c index 66f8524..e8fadba 100644 --- a/lib/ext2fs/getsize.c +++ b/lib/ext2fs/getsize.c @@ -33,12 +33,7 @@ #define BLKGETSIZE _IO(0x12,96) /* return device size */ #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" static int valid_offset (int fd, ext2_loff_t offset) diff --git a/lib/ext2fs/icount.c b/lib/ext2fs/icount.c index 98a9f72..d6f4cfc 100644 --- a/lib/ext2fs/icount.c +++ b/lib/ext2fs/icount.c @@ -15,12 +15,7 @@ #include #include -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" /* diff --git a/lib/ext2fs/imager.c b/lib/ext2fs/imager.c index f59541e..242e36a 100644 --- a/lib/ext2fs/imager.c +++ b/lib/ext2fs/imager.c @@ -30,12 +30,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" /* diff --git a/lib/ext2fs/initialize.c b/lib/ext2fs/initialize.c index 6251339..8022aee 100644 --- a/lib/ext2fs/initialize.c +++ b/lib/ext2fs/initialize.c @@ -24,12 +24,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" #if defined(__linux__) && defined(EXT2_OS_LINUX) diff --git a/lib/ext2fs/inline.c b/lib/ext2fs/inline.c index 729dd5d..5833b1d 100644 --- a/lib/ext2fs/inline.c +++ b/lib/ext2fs/inline.c @@ -26,13 +26,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #define INCLUDE_INLINE_FUNCS - #include "ext2fs.h" diff --git a/lib/ext2fs/inode.c b/lib/ext2fs/inode.c index 9912a98..4d4911a 100644 --- a/lib/ext2fs/inode.c +++ b/lib/ext2fs/inode.c @@ -21,12 +21,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fsP.h" #include "e2image.h" diff --git a/lib/ext2fs/irel_ma.c b/lib/ext2fs/irel_ma.c index 07ab9dd..437c06f 100644 --- a/lib/ext2fs/irel_ma.c +++ b/lib/ext2fs/irel_ma.c @@ -19,12 +19,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" #include "irel.h" diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c index 346d89b..7d10bd5 100644 --- a/lib/ext2fs/ismounted.c +++ b/lib/ext2fs/ismounted.c @@ -30,12 +30,7 @@ #endif /* HAVE_GETMNTINFO */ #include -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" #ifdef HAVE_MNTENT_H diff --git a/lib/ext2fs/link.c b/lib/ext2fs/link.c index e680259..04ac00c 100644 --- a/lib/ext2fs/link.c +++ b/lib/ext2fs/link.c @@ -15,12 +15,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" struct link_struct { diff --git a/lib/ext2fs/lookup.c b/lib/ext2fs/lookup.c index 6b44bc0..6010c45 100644 --- a/lib/ext2fs/lookup.c +++ b/lib/ext2fs/lookup.c @@ -15,12 +15,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" struct lookup_struct { diff --git a/lib/ext2fs/mkdir.c b/lib/ext2fs/mkdir.c index e037dad..15a6863 100644 --- a/lib/ext2fs/mkdir.c +++ b/lib/ext2fs/mkdir.c @@ -23,12 +23,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" #ifndef EXT2_FT_DIR diff --git a/lib/ext2fs/mkjournal.c b/lib/ext2fs/mkjournal.c index f405df7..bf5ca67 100644 --- a/lib/ext2fs/mkjournal.c +++ b/lib/ext2fs/mkjournal.c @@ -29,12 +29,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "e2p/e2p.h" #include "ext2fs.h" #include "jfs_user.h" diff --git a/lib/ext2fs/namei.c b/lib/ext2fs/namei.c index 71d314d..18be0f1 100644 --- a/lib/ext2fs/namei.c +++ b/lib/ext2fs/namei.c @@ -17,12 +17,7 @@ /* #define NAMEI_DEBUG */ -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" static errcode_t open_namei(ext2_filsys fs, ext2_ino_t root, ext2_ino_t base, diff --git a/lib/ext2fs/native.c b/lib/ext2fs/native.c index 2ea8549..6315a91 100644 --- a/lib/ext2fs/native.c +++ b/lib/ext2fs/native.c @@ -11,12 +11,7 @@ #include -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" static int i386_byteorder(void) diff --git a/lib/ext2fs/newdir.c b/lib/ext2fs/newdir.c index 940256b..b8e593e 100644 --- a/lib/ext2fs/newdir.c +++ b/lib/ext2fs/newdir.c @@ -15,12 +15,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" #ifndef EXT2_FT_DIR diff --git a/lib/ext2fs/nt_io.c b/lib/ext2fs/nt_io.c index 93b94f1..c39127c 100644 --- a/lib/ext2fs/nt_io.c +++ b/lib/ext2fs/nt_io.c @@ -178,7 +178,7 @@ NtDelayExecution( #include #include -#include +#include "ext2_fs.h" #include #include "et/com_err.h" diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c index 2697750..2abbb2a 100644 --- a/lib/ext2fs/openfs.c +++ b/lib/ext2fs/openfs.c @@ -23,12 +23,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" #include "e2image.h" diff --git a/lib/ext2fs/read_bb.c b/lib/ext2fs/read_bb.c index 85c8613..5d847fb 100644 --- a/lib/ext2fs/read_bb.c +++ b/lib/ext2fs/read_bb.c @@ -23,12 +23,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" struct read_bb_record { diff --git a/lib/ext2fs/read_bb_file.c b/lib/ext2fs/read_bb_file.c index 2aa2e57..7f54d6e 100644 --- a/lib/ext2fs/read_bb_file.c +++ b/lib/ext2fs/read_bb_file.c @@ -23,12 +23,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" /* diff --git a/lib/ext2fs/rs_bitmap.c b/lib/ext2fs/rs_bitmap.c index 240994f..30a9ef9 100644 --- a/lib/ext2fs/rs_bitmap.c +++ b/lib/ext2fs/rs_bitmap.c @@ -23,12 +23,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" errcode_t ext2fs_resize_generic_bitmap(__u32 new_end, __u32 new_real_end, diff --git a/lib/ext2fs/rw_bitmaps.c b/lib/ext2fs/rw_bitmaps.c index 093dddf..559f4a6 100644 --- a/lib/ext2fs/rw_bitmaps.c +++ b/lib/ext2fs/rw_bitmaps.c @@ -23,12 +23,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" #include "e2image.h" diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c index 75369c4..f26f7cd 100644 --- a/lib/ext2fs/swapfs.c +++ b/lib/ext2fs/swapfs.c @@ -15,12 +15,7 @@ #endif #include -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" void ext2fs_swap_super(struct ext2_super_block * sb) diff --git a/lib/ext2fs/test_io.c b/lib/ext2fs/test_io.c index faa447e..b259d0f 100644 --- a/lib/ext2fs/test_io.c +++ b/lib/ext2fs/test_io.c @@ -23,12 +23,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" /* diff --git a/lib/ext2fs/tst_badblocks.c b/lib/ext2fs/tst_badblocks.c index f463bc1..c9389fa 100644 --- a/lib/ext2fs/tst_badblocks.c +++ b/lib/ext2fs/tst_badblocks.c @@ -22,12 +22,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" blk_t test1[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0 }; diff --git a/lib/ext2fs/tst_byteswap.c b/lib/ext2fs/tst_byteswap.c index 96e44ec..e747c1e 100644 --- a/lib/ext2fs/tst_byteswap.c +++ b/lib/ext2fs/tst_byteswap.c @@ -22,12 +22,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" __u16 test1[] = { diff --git a/lib/ext2fs/tst_getsize.c b/lib/ext2fs/tst_getsize.c index 35f526e..08bb8ed 100644 --- a/lib/ext2fs/tst_getsize.c +++ b/lib/ext2fs/tst_getsize.c @@ -22,12 +22,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" int main(int argc, const char *argv[]) diff --git a/lib/ext2fs/tst_iscan.c b/lib/ext2fs/tst_iscan.c index fc0053b..f966d0b 100644 --- a/lib/ext2fs/tst_iscan.c +++ b/lib/ext2fs/tst_iscan.c @@ -22,12 +22,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" blk_t test_vec[] = { 8, 12, 24, 34, 43, 44, 100, 0 }; diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c index 6028b27..40bb6c2 100644 --- a/lib/ext2fs/unix_io.c +++ b/lib/ext2fs/unix_io.c @@ -31,12 +31,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" /* diff --git a/lib/ext2fs/unlink.c b/lib/ext2fs/unlink.c index 59b251f..03825c4 100644 --- a/lib/ext2fs/unlink.c +++ b/lib/ext2fs/unlink.c @@ -15,12 +15,7 @@ #include #endif -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" struct link_struct { diff --git a/lib/ext2fs/valid_blk.c b/lib/ext2fs/valid_blk.c index 09c6e07..c6a7c22 100644 --- a/lib/ext2fs/valid_blk.c +++ b/lib/ext2fs/valid_blk.c @@ -17,12 +17,7 @@ #include #include -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" /* diff --git a/lib/ext2fs/version.c b/lib/ext2fs/version.c index c0e6351..f8536fc 100644 --- a/lib/ext2fs/version.c +++ b/lib/ext2fs/version.c @@ -16,12 +16,7 @@ #include #include -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" #include "../../version.h" diff --git a/lib/ext2fs/write_bb_file.c b/lib/ext2fs/write_bb_file.c index 5550765..011c480 100644 --- a/lib/ext2fs/write_bb_file.c +++ b/lib/ext2fs/write_bb_file.c @@ -11,12 +11,7 @@ #include -#if EXT2_FLAT_INCLUDES #include "ext2_fs.h" -#else -#include -#endif - #include "ext2fs.h" errcode_t ext2fs_write_bb_FILE(ext2_badblocks_list bb_list, -- 1.8.3.1