From c23cb7159035a401d2fbaabc19bbae5e8cdce453 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Wed, 10 Feb 2010 23:21:56 +0000 Subject: [PATCH] * Wed Feb 10 2010 Eric Sandeen 1.41.10-1 - New upstream version --- .cvsignore | 2 +- e2fsprogs-1.41.9-24hr-fsck-grace.patch | 199 --- e2fsprogs-1.41.9-dlopen-fix.patch | 52 - e2fsprogs-1.41.9-resize-array.patch | 48 - e2fsprogs-1.41.9-topology-quiet.patch | 48 - e2fsprogs-1.41.9-topology.patch | 1537 ---------------------- e2fsprogs-1.41.9-trim.patch | 138 -- e2fsprogs-resize-minimum-fix.patch | 51 - e2fsprogs.spec | 23 +- e4fsprogs-1.41.9-s_jnl_blocks-swap.patch | 48 - sources | 2 +- 11 files changed, 7 insertions(+), 2141 deletions(-) delete mode 100644 e2fsprogs-1.41.9-24hr-fsck-grace.patch delete mode 100644 e2fsprogs-1.41.9-dlopen-fix.patch delete mode 100644 e2fsprogs-1.41.9-resize-array.patch delete mode 100644 e2fsprogs-1.41.9-topology-quiet.patch delete mode 100644 e2fsprogs-1.41.9-topology.patch delete mode 100644 e2fsprogs-1.41.9-trim.patch delete mode 100644 e2fsprogs-resize-minimum-fix.patch delete mode 100644 e4fsprogs-1.41.9-s_jnl_blocks-swap.patch diff --git a/.cvsignore b/.cvsignore index b93719a..9eb463c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -e2fsprogs-1.41.9.tar.gz +e2fsprogs-1.41.10.tar.gz diff --git a/e2fsprogs-1.41.9-24hr-fsck-grace.patch b/e2fsprogs-1.41.9-24hr-fsck-grace.patch deleted file mode 100644 index e5723b1..0000000 --- a/e2fsprogs-1.41.9-24hr-fsck-grace.patch +++ /dev/null @@ -1,199 +0,0 @@ -From ba5131f6d48eded504e84c2a8ffc8131df8a512e Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o -Date: Fri, 16 Oct 2009 20:46:45 -0400 -Subject: [PATCH] e2fsck: Accept superblock times to be fudged by up to 24 hours by default - -Unfortunately, due to Windows' unfortunate design decision to -configure the hardware clock to tick localtime, instead of the more -proper and less error-prone UTC time, many users end up in the -situation where the system clock is incorrectly set at the time when -e2fsck is run. - -Historically this was usually due to some distributions having buggy -init scripts and/or installers that didn't correctly detect this case -and take appropriate countermeasures. However, it's still possible, -despite the best efforts of init script and installer authors to not -be able to detect this misconfiguration, usually due to a buggy or -misconfigured virtualization manager or the installer not having -access to a network time server during the installation process. So -by default, we allow the superblock times to be fudged by up to 24 -hours. This can be disabled by setting options.accept_time_fudge to -the boolean value of false in e2fsck.conf. The old -options.buggy_init_scripts is left for backwards compatibility. - -Since we are now accepting the 24 hour time fudge by default, there is -no longer a need to install an Ubuntu-specific e2fsck.conf file, so we -can remove it. - -Signed-off-by: "Theodore Ts'o" ---- - debian/rules | 6 ------ - e2fsck/e2fsck.conf.5.in | 36 ++++++++++++++++++++++-------------- - e2fsck/e2fsck.conf.ubuntu | 2 -- - e2fsck/problem.c | 4 ++-- - e2fsck/super.c | 42 ++++++++++++++++++++++++------------------ - 5 files changed, 48 insertions(+), 42 deletions(-) - delete mode 100644 e2fsck/e2fsck.conf.ubuntu - -diff --git a/debian/rules b/debian/rules -index f62e86f..f658bd1 100755 ---- a/debian/rules -+++ b/debian/rules -@@ -445,12 +445,6 @@ endif - $(INSTALL) -p -m 0644 debugfs/debug_cmds.ct \ - ${debdir}/ss-dev/usr/share/doc/libss${SS_SOVERSION}/examples - -- if test -f /etc/lsb-release && \ -- grep -q DISTRIB_ID=Ubuntu /etc/lsb-release; then \ -- $(INSTALL) -p -m 0644 e2fsck/e2fsck.conf.ubuntu \ -- ${debdir}/e2fsprogs/etc/e2fsck.conf; \ -- fi -- - dh_installinfo -pcomerr-dev ${stdbuilddir}/lib/et/com_err.info - dh_installinfo -pe2fslibs-dev ${stdbuilddir}/doc/libext2fs.info - -diff --git a/e2fsck/e2fsck.conf.5.in b/e2fsck/e2fsck.conf.5.in -index 6638a39..a5021bd 100644 ---- a/e2fsck/e2fsck.conf.5.in -+++ b/e2fsck/e2fsck.conf.5.in -@@ -87,19 +87,27 @@ interrupts e2fsck using ^C, and the filesystem is not explicitly flagged - as containing errors, e2fsck will exit with an exit status of 0 instead - of 32. This setting defaults to false. - .TP --.I buggy_init_scripts --Some buggy distributions (such as Ubuntu) have init scripts and/or --installers which fail to correctly set the system clock before running --e2fsck and/or formatting the filesystem initially. Normally this --happens because the hardware clock is ticking localtime, instead of the --more proper and less error-prone UTC time. So while the kernel is --booting, the system time (which in Linux systems always ticks in UTC --time) is set from the hardware clock, but since the hardware clock is --ticking localtime, the system time is incorrect. Unfortunately, some --buggy distributions do not correct this before running e2fsck. If this --option is set to a boolean value of true, we attempt to work around this --situation by allowing the superblock last write time, last mount time, --and last check time to be in the future by up to 24 hours. -+.I accept_time_fudge -+Unfortunately, due to Windows' unfortunate design decision -+to configure the hardware clock to tick localtime, instead -+of the more proper and less error-prone UTC time, many -+users end up in the situation where the system clock is -+incorrectly set at the time when e2fsck is run. -+.IP -+Historically this was usually due to some distributions -+having buggy init scripts and/or installers that didn't -+correctly detect this case and take appropriate -+countermeasures. However, it's still possible, despite the -+best efforts of init script and installer authors to not be -+able to detect this misconfiguration, usually due to a -+buggy or misconfigured virtualization manager or the -+installer not having access to a network time server -+during the installation process. So by default, we allow -+the superblock times to be fudged by up to 24 hours. -+This can be disabled by setting -+.I accept_time_fudge -+to the -+boolean value of false. This setting defaults to true. - .TP - .I clear_test_fs_flag - This boolean relation controls whether or not -@@ -111,7 +119,7 @@ defaults to true. - .I defer_check_on_battery - This boolean relation controls whether or not the interval between - filesystem checks (either based on time or number of mounts) should --be doubled if the system is running on battery. It defaults to -+be doubled if the system is running on battery. This setting defaults to - true. - .TP - .I indexed_dir_slack_percentage -diff --git a/e2fsck/e2fsck.conf.ubuntu b/e2fsck/e2fsck.conf.ubuntu -deleted file mode 100644 -index 49d6d19..0000000 ---- a/e2fsck/e2fsck.conf.ubuntu -+++ /dev/null -@@ -1,2 +0,0 @@ --[options] -- buggy_init_scripts = 1 -diff --git a/e2fsck/problem.c b/e2fsck/problem.c -index 540ac91..a713f1b 100644 ---- a/e2fsck/problem.c -+++ b/e2fsck/problem.c -@@ -388,13 +388,13 @@ static struct e2fsck_problem problem_table[] = { - /* Last mount time is in the future (fudged) */ - { PR_0_FUTURE_SB_LAST_MOUNT_FUDGED, - N_("@S last mount time is in the future.\n\t(by less than a day, " -- "probably due to buggy init scripts) "), -+ "probably due to the hardware clock being incorrectly set) "), - PROMPT_FIX, PR_PREEN_OK | PR_NO_OK }, - - /* Last write time is in the future (fudged) */ - { PR_0_FUTURE_SB_LAST_WRITE_FUDGED, - N_("@S last write time is in the future.\n\t(by less than a day, " -- "probably due to buggy init scripts). "), -+ "probably due to the hardware clock being incorrectly set). "), - PROMPT_FIX, PR_PREEN_OK | PR_NO_OK }, - - /* Block group checksum (latch question) is invalid. */ -diff --git a/e2fsck/super.c b/e2fsck/super.c -index c946664..951f6db 100644 ---- a/e2fsck/super.c -+++ b/e2fsck/super.c -@@ -463,7 +463,7 @@ void check_super_block(e2fsck_t ctx) - int inodes_per_block; - int ipg_max; - int inode_size; -- int buggy_init_scripts; -+ int accept_time_fudge; - dgrp_t i; - blk_t should_be; - struct problem_context pctx; -@@ -795,25 +795,31 @@ void check_super_block(e2fsck_t ctx) - } - - /* -- * Some buggy distributions (such as Ubuntu) have init scripts -- * and/or installers which fail to correctly set the system -- * clock before running e2fsck and/or formatting the -- * filesystem initially. Normally this happens because the -- * hardware clock is ticking localtime, instead of the more -- * proper and less error-prone UTC time. So while the kernel -- * is booting, the system time (which in Linux systems always -- * ticks in UTC time) is set from the hardware clock, but -- * since the hardware clock is ticking localtime, the system -- * time is incorrect. Unfortunately, some buggy distributions -- * do not correct this before running e2fsck. If this option -- * is set to a boolean value of true, we attempt to work -- * around this situation by allowing the superblock last write -- * time, last mount time, and last check time to be in the -- * future by up to 24 hours. -+ * Unfortunately, due to Windows' unfortunate design decision -+ * to configure the hardware clock to tick localtime, instead -+ * of the more proper and less error-prone UTC time, many -+ * users end up in the situation where the system clock is -+ * incorrectly set at the time when e2fsck is run. -+ * -+ * Historically this was usually due to some distributions -+ * having buggy init scripts and/or installers that didn't -+ * correctly detect this case and take appropriate -+ * countermeasures. However, it's still possible, despite the -+ * best efforts of init script and installer authors to not be -+ * able to detect this misconfiguration, usually due to a -+ * buggy or misconfigured virtualization manager or the -+ * installer not having access to a network time server during -+ * the installation process. So by default, we allow the -+ * superblock times to be fudged by up to 24 hours. This can -+ * be disabled by setting options.accept_time_fudge to the -+ * boolean value of false in e2fsck.conf. We also support -+ * options.buggy_init_scripts for backwards compatibility. - */ -+ profile_get_boolean(ctx->profile, "options", "accept_time_fudge", -+ 0, 1, &accept_time_fudge); - profile_get_boolean(ctx->profile, "options", "buggy_init_scripts", -- 0, 0, &buggy_init_scripts); -- ctx->time_fudge = buggy_init_scripts ? 86400 : 0; -+ 0, accept_time_fudge, &accept_time_fudge); -+ ctx->time_fudge = accept_time_fudge ? 86400 : 0; - - /* - * Check to see if the superblock last mount time or last --- 1.6.5.104.g2567b.dirty diff --git a/e2fsprogs-1.41.9-dlopen-fix.patch b/e2fsprogs-1.41.9-dlopen-fix.patch deleted file mode 100644 index a1dcd8e..0000000 --- a/e2fsprogs-1.41.9-dlopen-fix.patch +++ /dev/null @@ -1,52 +0,0 @@ -commit 06ef971be505678ee462ae1844204ed24f14aedc -Author: Theodore Ts'o -Date: Thu Nov 12 17:54:45 2009 -0500 - - libss: initialize function pointer for readline_shutdown() - - Clear the function pointer for readline_shutdown() so that if libss is - linking against a readline library which doesn't supply a - readline_shutdown() function, ss_delete_invocation() won't seg fault. - - Thanks to Solar Designer for reporting this - problem to me. - - Signed-off-by: "Theodore Ts'o" - -libss: add newer libreadline to dlopen path - -Rawhide now has libreadline.so.6 ... add it to the ever-expanding -list of libs to look for. - -Unfortunately without commit 06ef971be505678ee462ae1844204ed24f14aedc -this fails in a rather cryptic way. - -Signed-off-by: Eric Sandeen ---- - -Index: e2fsprogs-1.41.9/lib/ss/invocation.c -=================================================================== ---- e2fsprogs-1.41.9.orig/lib/ss/invocation.c -+++ e2fsprogs-1.41.9/lib/ss/invocation.c -@@ -71,6 +71,7 @@ int ss_create_invocation(subsystem_name, - *(new_table->rqt_tables+1) = (ss_request_table *) NULL; - - new_table->readline_handle = 0; -+ new_table->readline_shutdown = 0; - new_table->readline = 0; - new_table->add_history = 0; - new_table->redisplay = 0; -Index: e2fsprogs-1.41.9/lib/ss/get_readline.c -=================================================================== ---- e2fsprogs-1.41.9.orig/lib/ss/get_readline.c -+++ e2fsprogs-1.41.9/lib/ss/get_readline.c -@@ -36,7 +36,7 @@ static void ss_release_readline(ss_data - } - - /* Libraries we will try to use for readline/editline functionality */ --#define DEFAULT_LIBPATH "libreadline.so.5:libreadline.so.4:libreadline.so:libedit.so.2:libedit.so:libeditline.so.0:libeditline.so" -+#define DEFAULT_LIBPATH "libreadline.so.6:libreadline.so.5:libreadline.so.4:libreadline.so:libedit.so.2:libedit.so:libeditline.so.0:libeditline.so" - - void ss_get_readline(int sci_idx) - { - diff --git a/e2fsprogs-1.41.9-resize-array.patch b/e2fsprogs-1.41.9-resize-array.patch deleted file mode 100644 index 3c2e022..0000000 --- a/e2fsprogs-1.41.9-resize-array.patch +++ /dev/null @@ -1,48 +0,0 @@ -commit 40b09fbe01fac8722b699b29f796e18550d68c84 -Author: Theodore Ts'o -Date: Fri Feb 5 22:25:03 2010 -0500 - - resize2fs: Fix fix uninit group test accessing invalid memory - - Commit 74128f8 added tests for uninit groups, but it could access past - the end of the group_desc[] array after processing the last group: - - ==19668== Invalid read of size 2 - ==19668== at 0x40518C: resize_fs (resize2fs.c:1824) - ==19668== by 0x405A46: main (main.c:451) - ==19668== Address 0x5a0d002 is not stack'd, malloc'd or (recently) free'd - ==19668== - ==19668== Invalid read of size 2 - ==19668== at 0x405391: resize_fs (resize2fs.c:1864) - ==19668== by 0x405A46: main (main.c:451) - ==19668== Address 0x5a0d002 is not stack'd, malloc'd or (recently) free'd - ==19668== - - It was found by Eric Sandeen running the regression suite through - valgrind. - - Signed-off-by: "Theodore Ts'o" - -diff --git a/resize/resize2fs.c b/resize/resize2fs.c -index 75c4721..346fd53 100644 ---- a/resize/resize2fs.c -+++ b/resize/resize2fs.c -@@ -1819,6 +1819,8 @@ static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs) - group_free; - ext2fs_group_desc_csum_set(fs, group); - group++; -+ if (group >= fs->group_desc_count) -+ break; - count = 0; - group_free = 0; - uninit = (fs->group_desc[group].bg_flags & -@@ -1859,6 +1861,8 @@ static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs) - group_free; - ext2fs_group_desc_csum_set(fs, group); - group++; -+ if (group >= fs->group_desc_count) -+ break; - count = 0; - group_free = 0; - uninit = (fs->group_desc[group].bg_flags & - diff --git a/e2fsprogs-1.41.9-topology-quiet.patch b/e2fsprogs-1.41.9-topology-quiet.patch deleted file mode 100644 index 0f215d3..0000000 --- a/e2fsprogs-1.41.9-topology-quiet.patch +++ /dev/null @@ -1,48 +0,0 @@ -mkfsing a plain file would lead to a warning about being unable -to determine geometry; we should just skip the topology-getting -if we see that we have a regular file. - -This was breaking "make check" but I had missed it since I -inadvertently stopped running the checks during the Fedora -RPM build. - -Also, add a newline to the warning. - -Signed-off-by: Eric Sandeen ---- - -diff --git a/misc/mke2fs.c b/misc/mke2fs.c -index 94b4c81..81b34ab 100644 ---- a/misc/mke2fs.c -+++ b/misc/mke2fs.c -@@ -47,6 +47,7 @@ extern int optind; - #endif - #include - #include -+#include - #include - #include - #include -@@ -1035,6 +1036,11 @@ static int ext2fs_get_device_geometry(const char *file, - blkid_topology tp; - unsigned long min_io; - unsigned long opt_io; -+ struct stat statbuf; -+ -+ /* Nothing to do for a regular file */ -+ if (!stat(file, &statbuf) && S_ISREG(statbuf.st_mode)) -+ return 0; - - pr = blkid_new_probe_from_filename(file); - if (!pr) -@@ -1630,7 +1636,7 @@ got_size: - retval = ext2fs_get_device_geometry(device_name, &fs_param); - if (retval < 0) { - fprintf(stderr, -- _("warning: Unable to get device geometry for %s"), -+ _("warning: Unable to get device geometry for %s\n"), - device_name); - } else if (retval) { - printf(_("%s alignment is offset by %lu bytes.\n"), - - diff --git a/e2fsprogs-1.41.9-topology.patch b/e2fsprogs-1.41.9-topology.patch deleted file mode 100644 index 5fff0a0..0000000 --- a/e2fsprogs-1.41.9-topology.patch +++ /dev/null @@ -1,1537 +0,0 @@ -Index: e2fsprogs-1.41.9/debugfs/Makefile.in -=================================================================== ---- e2fsprogs-1.41.9.orig/debugfs/Makefile.in -+++ e2fsprogs-1.41.9/debugfs/Makefile.in -@@ -96,65 +96,74 @@ debug_cmds.o: debug_cmds.c $(top_srcdir) - $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_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 \ -- $(top_srcdir)/lib/et/com_err.h $(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/ext2fs/ext2_fs.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 $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h \ -- $(top_srcdir)/version.h -+ $(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/ext2fs/ext3_extents.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ -+ $(top_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -+ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/version.h $(srcdir)/jfs_user.h \ -+ $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \ -+ $(top_srcdir)/lib/ext2fs/kernel-list.h - util.o: $(srcdir)/util.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/ext2fs/ext2_fs.h \ -+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h - ls.o: $(srcdir)/ls.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/ext2fs/ext2_fs.h $(top_srcdir)/lib/et/com_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h - ncheck.o: $(srcdir)/ncheck.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/ext2fs/ext2_fs.h \ -+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h - icheck.o: $(srcdir)/icheck.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/ext2fs/ext2_fs.h \ -+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h - lsdel.o: $(srcdir)/lsdel.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/ext2fs/ext2_fs.h \ -+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h - dump.o: $(srcdir)/dump.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/ext2fs/ext2_fs.h \ -+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h - set_fields.o: $(srcdir)/set_fields.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/ext2fs/ext2_fs.h \ -+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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 -+ $(top_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -+ $(top_srcdir)/lib/e2p/e2p.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/ext2fs/ext2_fs.h \ -+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ -+ $(top_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/jfs_user.h $(top_srcdir)/lib/ext2fs/kernel-jbd.h \ -- $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h \ -- $(top_srcdir)/lib/uuid/uuid.h -+ $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h - htree.o: $(srcdir)/htree.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/ext2fs/ext2_fs.h \ -+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -+ $(top_srcdir)/lib/e2p/e2p.h - unused.o: $(srcdir)/unused.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/ext2fs/ext2_fs.h \ -+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h -Index: e2fsprogs-1.41.9/depfix.sed -=================================================================== ---- e2fsprogs-1.41.9.orig/depfix.sed -+++ e2fsprogs-1.41.9/depfix.sed -@@ -25,6 +25,8 @@ s/ */ /g - s;/usr/include/[^ ]* *;;g - s;/usr/lib/[^ ]* *;;g - s;/mit/cygnus[^ ]* *;;g -+s;../[^ ]*lib/blkid/blkid[^ ]* *;;g -+s;../[^ ]*lib/uuid/uuid.h[^ ]* *;;g - - # - # Now insert a trailing newline... -Index: e2fsprogs-1.41.9/e2fsck/Makefile.in -=================================================================== ---- e2fsprogs-1.41.9.orig/e2fsck/Makefile.in -+++ e2fsprogs-1.41.9/e2fsck/Makefile.in -@@ -284,195 +284,170 @@ distclean: clean - # - e2fsck.o: $(srcdir)/e2fsck.c $(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/ext2fs/ext2_fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h - crc32.o: $(srcdir)/crc32.c $(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/ext2fs/ext2_fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/crc32defs.h crc32table.h - gen_crc32table.o: $(srcdir)/gen_crc32table.c $(srcdir)/crc32defs.h - dict.o: $(srcdir)/dict.c $(srcdir)/dict.h --super.o: $(srcdir)/super.c $(top_srcdir)/lib/uuid/uuid.h $(srcdir)/e2fsck.h \ -+super.o: $(srcdir)/super.c $(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/ext2fs/ext2_fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h - pass1.o: $(srcdir)/pass1.c $(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/ext2fs/ext2_fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h - pass1b.o: $(srcdir)/pass1b.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 \ -- $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ -- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ -+ $(top_builddir)/lib/ext2fs/ext2_err.h \ - $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h $(srcdir)/dict.h - pass2.o: $(srcdir)/pass2.c $(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/ext2fs/ext2_fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h $(srcdir)/dict.h - pass3.o: $(srcdir)/pass3.c $(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/ext2fs/ext2_fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h - pass4.o: $(srcdir)/pass4.c $(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/ext2fs/ext2_fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h - pass5.o: $(srcdir)/pass5.c $(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/ext2fs/ext2_fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ - $(srcdir)/profile.h prof_err.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/ext2fs/ext2_fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/ext2fs/kernel-jbd.h \ - $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h \ -- $(srcdir)/problem.h $(top_srcdir)/lib/uuid/uuid.h -+ $(srcdir)/problem.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/ext2fs/ext2_fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/ext2fs/kernel-jbd.h \ - $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-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/ext2fs/ext2_fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/ext2fs/kernel-jbd.h \ - $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-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 \ -- $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ -- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ -+ $(top_builddir)/lib/ext2fs/ext2_err.h \ - $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ - $(srcdir)/profile.h prof_err.h - util.o: $(srcdir)/util.c $(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/ext2fs/ext2_fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ -- $(srcdir)/profile.h prof_err.h --unix.o: $(srcdir)/unix.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 $(srcdir)/e2fsck.h \ - $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ -+ $(srcdir)/profile.h prof_err.h -+unix.o: $(srcdir)/unix.c $(top_srcdir)/lib/e2p/e2p.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ -+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/e2fsck.h \ -+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h $(top_srcdir)/version.h - dirinfo.o: $(srcdir)/dirinfo.c $(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/ext2fs/ext2_fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ -- $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/uuid/uuid.h \ -- $(top_srcdir)/lib/ext2fs/tdb.h -+ $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/ext2fs/tdb.h - dx_dirinfo.o: $(srcdir)/dx_dirinfo.c $(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/ext2fs/ext2_fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ - $(srcdir)/profile.h prof_err.h - ehandler.o: $(srcdir)/ehandler.c $(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/ext2fs/ext2_fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ - $(srcdir)/profile.h prof_err.h - problem.o: $(srcdir)/problem.c $(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/ext2fs/ext2_fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h $(srcdir)/problemP.h - message.o: $(srcdir)/message.c $(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/ext2fs/ext2_fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h - ea_refcount.o: $(srcdir)/ea_refcount.c $(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/ext2fs/ext2_fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ - $(srcdir)/profile.h prof_err.h - rehash.o: $(srcdir)/rehash.c $(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/ext2fs/ext2_fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h - region.o: $(srcdir)/region.c $(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/ext2fs/ext2_fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ - $(srcdir)/profile.h prof_err.h - profile.o: $(srcdir)/profile.c $(top_srcdir)/lib/et/com_err.h \ - $(srcdir)/profile.h prof_err.h -Index: e2fsprogs-1.41.9/lib/blkid/Makefile.in -=================================================================== ---- e2fsprogs-1.41.9.orig/lib/blkid/Makefile.in -+++ e2fsprogs-1.41.9/lib/blkid/Makefile.in -@@ -26,8 +26,7 @@ SRCS= $(srcdir)/cache.c $(srcdir)/dev.c - $(srcdir)/read.c $(srcdir)/resolve.c $(srcdir)/save.c $(srcdir)/tag.c \ - $(srcdir)/version.c - --HFILES= blkid.h --HFILES_IN= blkid_types.h -+HFILES_IN= blkid.h blkid_types.h - - LIBRARY= libblkid - LIBDIR= blkid -@@ -63,11 +62,15 @@ DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(D - - all:: $(SMANPAGES) blkid.pc - --$(top_builddir)/lib/blkid/blkid_types.h: $(srcdir)/blkid_types.h.in $(top_builddir)/config.status -+blkid_types.h: $(srcdir)/blkid_types.h.in $(top_builddir)/config.status - $(E) " CONFIG.STATUS $@" - $(Q) cd $(top_builddir); \ - CONFIG_FILES=$(my_dir)/blkid_types.h ./config.status - -+blkid.h: $(srcdir)/blkid.h.in -+ $(E) " CP $@" -+ $(Q) cp $(srcdir)/blkid.h.in blkid.h -+ - libblkid.3: $(DEP_SUBSTITUTE) $(srcdir)/libblkid.3.in - $(E) " SUBST $@" - $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/libblkid.3.in libblkid.3 -@@ -151,10 +154,6 @@ install:: all installdirs - $(Q) $(INSTALL_DATA) libblkid.a $(DESTDIR)$(libdir)/libblkid.a - -$(Q) $(RANLIB) $(DESTDIR)$(libdir)/libblkid.a - $(Q) $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libblkid.a -- $(Q) set -e; for i in $(HFILES); do \ -- echo " INSTALL_DATA $(includedir)/blkid/$$i"; \ -- $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/blkid/$$i; \ -- done - $(Q) set -e; for i in $(HFILES_IN); do \ - echo " INSTALL_DATA $(includedir)/blkid/$$i"; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/blkid/$$i; \ -@@ -179,7 +178,7 @@ clean:: - tst_devno tst_getsize tst_probe tst_read tst_resolve tst_save \ - tst_tag tst_types tests/*.out tests/*.ok \ - tests/*.img results test_probe core profiled/* \ -- checker/* blkid_types.h ../libblkid.a ../libblkid_p.a \ -+ checker/* blkid.h blkid_types.h ../libblkid.a ../libblkid_p.a \ - $(SMANPAGES) blkid - -rmdir tests - -@@ -188,36 +187,22 @@ distclean:: clean - $(RM) -f .depend Makefile blkid.pc \ - $(srcdir)/TAGS $(srcdir)/Makefile.in.old - --$(OBJS): subdirs -+$(OBJS): subdirs $(HFILES_IN) - - # +++ Dependency line eater +++ - # - # Makefile dependencies follow. This must be the last section in - # the Makefile.in file - # --cache.o: $(srcdir)/cache.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \ -- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h --dev.o: $(srcdir)/dev.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \ -- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h --devname.o: $(srcdir)/devname.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \ -- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h --devno.o: $(srcdir)/devno.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \ -- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h --getsize.o: $(srcdir)/getsize.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \ -- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h --llseek.o: $(srcdir)/llseek.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \ -- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h --probe.o: $(srcdir)/probe.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \ -- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h \ -- $(top_srcdir)/lib/uuid/uuid.h $(srcdir)/probe.h --read.o: $(srcdir)/read.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \ -- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h \ -- $(top_srcdir)/lib/uuid/uuid.h --resolve.o: $(srcdir)/resolve.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \ -- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h --save.o: $(srcdir)/save.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \ -- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h --tag.o: $(srcdir)/tag.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \ -- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h --version.o: $(srcdir)/version.c $(srcdir)/blkid.h \ -- $(top_builddir)/lib/blkid/blkid_types.h $(top_srcdir)/version.h -+cache.o: $(srcdir)/cache.c $(srcdir)/list.h -+dev.o: $(srcdir)/dev.c $(srcdir)/list.h -+devname.o: $(srcdir)/devname.c $(srcdir)/list.h -+devno.o: $(srcdir)/devno.c $(srcdir)/list.h -+getsize.o: $(srcdir)/getsize.c $(srcdir)/list.h -+llseek.o: $(srcdir)/llseek.c $(srcdir)/list.h -+probe.o: $(srcdir)/probe.c $(srcdir)/list.h $(srcdir)/probe.h -+read.o: $(srcdir)/read.c $(srcdir)/list.h -+resolve.o: $(srcdir)/resolve.c $(srcdir)/list.h -+save.o: $(srcdir)/save.c $(srcdir)/list.h -+tag.o: $(srcdir)/tag.c $(srcdir)/list.h -+version.o: $(srcdir)/version.c $(top_srcdir)/version.h -Index: e2fsprogs-1.41.9/lib/blkid/blkid.h -=================================================================== ---- e2fsprogs-1.41.9.orig/lib/blkid/blkid.h -+++ /dev/null -@@ -1,110 +0,0 @@ --/* -- * blkid.h - Interface for libblkid, a library to identify block devices -- * -- * Copyright (C) 2001 Andreas Dilger -- * Copyright (C) 2003 Theodore Ts'o -- * -- * %Begin-Header% -- * This file may be redistributed under the terms of the -- * GNU Lesser General Public License. -- * %End-Header% -- */ -- --#ifndef _BLKID_BLKID_H --#define _BLKID_BLKID_H -- --#include --#include -- --#ifdef __cplusplus --extern "C" { --#endif -- --#define BLKID_VERSION "1.0.0" --#define BLKID_DATE "12-Feb-2003" -- --typedef struct blkid_struct_dev *blkid_dev; --typedef struct blkid_struct_cache *blkid_cache; --typedef __s64 blkid_loff_t; -- --typedef struct blkid_struct_tag_iterate *blkid_tag_iterate; --typedef struct blkid_struct_dev_iterate *blkid_dev_iterate; -- --/* -- * Flags for blkid_get_dev -- * -- * BLKID_DEV_CREATE Create an empty device structure if not found -- * in the cache. -- * BLKID_DEV_VERIFY Make sure the device structure corresponds -- * with reality. -- * BLKID_DEV_FIND Just look up a device entry, and return NULL -- * if it is not found. -- * BLKID_DEV_NORMAL Get a valid device structure, either from the -- * cache or by probing the device. -- */ --#define BLKID_DEV_FIND 0x0000 --#define BLKID_DEV_CREATE 0x0001 --#define BLKID_DEV_VERIFY 0x0002 --#define BLKID_DEV_NORMAL (BLKID_DEV_CREATE | BLKID_DEV_VERIFY) -- --/* cache.c */ --extern void blkid_put_cache(blkid_cache cache); --extern int blkid_get_cache(blkid_cache *cache, const char *filename); --extern void blkid_gc_cache(blkid_cache cache); -- --/* dev.c */ --extern const char *blkid_dev_devname(blkid_dev dev); -- --extern blkid_dev_iterate blkid_dev_iterate_begin(blkid_cache cache); --extern int blkid_dev_set_search(blkid_dev_iterate iter, -- char *search_type, char *search_value); --extern int blkid_dev_next(blkid_dev_iterate iterate, blkid_dev *dev); --extern void blkid_dev_iterate_end(blkid_dev_iterate iterate); -- --/* devno.c */ --extern char *blkid_devno_to_devname(dev_t devno); -- --/* devname.c */ --extern int blkid_probe_all(blkid_cache cache); --extern int blkid_probe_all_new(blkid_cache cache); --extern blkid_dev blkid_get_dev(blkid_cache cache, const char *devname, -- int flags); -- --/* getsize.c */ --extern blkid_loff_t blkid_get_dev_size(int fd); -- --/* probe.c */ --int blkid_known_fstype(const char *fstype); --extern blkid_dev blkid_verify(blkid_cache cache, blkid_dev dev); -- --/* read.c */ -- --/* resolve.c */ --extern char *blkid_get_tag_value(blkid_cache cache, const char *tagname, -- const char *devname); --extern char *blkid_get_devname(blkid_cache cache, const char *token, -- const char *value); -- --/* tag.c */ --extern blkid_tag_iterate blkid_tag_iterate_begin(blkid_dev dev); --extern int blkid_tag_next(blkid_tag_iterate iterate, -- const char **type, const char **value); --extern void blkid_tag_iterate_end(blkid_tag_iterate iterate); --extern int blkid_dev_has_tag(blkid_dev dev, const char *type, -- const char *value); --extern blkid_dev blkid_find_dev_with_tag(blkid_cache cache, -- const char *type, -- const char *value); --extern int blkid_parse_tag_string(const char *token, char **ret_type, -- char **ret_val); -- --/* version.c */ --extern int blkid_parse_version_string(const char *ver_string); --extern int blkid_get_library_version(const char **ver_string, -- const char **date_string); -- --#ifdef __cplusplus --} --#endif -- --#endif /* _BLKID_BLKID_H */ -Index: e2fsprogs-1.41.9/lib/blkid/blkid.h.in -=================================================================== ---- /dev/null -+++ e2fsprogs-1.41.9/lib/blkid/blkid.h.in -@@ -0,0 +1,110 @@ -+/* -+ * blkid.h - Interface for libblkid, a library to identify block devices -+ * -+ * Copyright (C) 2001 Andreas Dilger -+ * Copyright (C) 2003 Theodore Ts'o -+ * -+ * %Begin-Header% -+ * This file may be redistributed under the terms of the -+ * GNU Lesser General Public License. -+ * %End-Header% -+ */ -+ -+#ifndef _BLKID_BLKID_H -+#define _BLKID_BLKID_H -+ -+#include -+#include -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#define BLKID_VERSION "1.0.0" -+#define BLKID_DATE "12-Feb-2003" -+ -+typedef struct blkid_struct_dev *blkid_dev; -+typedef struct blkid_struct_cache *blkid_cache; -+typedef __s64 blkid_loff_t; -+ -+typedef struct blkid_struct_tag_iterate *blkid_tag_iterate; -+typedef struct blkid_struct_dev_iterate *blkid_dev_iterate; -+ -+/* -+ * Flags for blkid_get_dev -+ * -+ * BLKID_DEV_CREATE Create an empty device structure if not found -+ * in the cache. -+ * BLKID_DEV_VERIFY Make sure the device structure corresponds -+ * with reality. -+ * BLKID_DEV_FIND Just look up a device entry, and return NULL -+ * if it is not found. -+ * BLKID_DEV_NORMAL Get a valid device structure, either from the -+ * cache or by probing the device. -+ */ -+#define BLKID_DEV_FIND 0x0000 -+#define BLKID_DEV_CREATE 0x0001 -+#define BLKID_DEV_VERIFY 0x0002 -+#define BLKID_DEV_NORMAL (BLKID_DEV_CREATE | BLKID_DEV_VERIFY) -+ -+/* cache.c */ -+extern void blkid_put_cache(blkid_cache cache); -+extern int blkid_get_cache(blkid_cache *cache, const char *filename); -+extern void blkid_gc_cache(blkid_cache cache); -+ -+/* dev.c */ -+extern const char *blkid_dev_devname(blkid_dev dev); -+ -+extern blkid_dev_iterate blkid_dev_iterate_begin(blkid_cache cache); -+extern int blkid_dev_set_search(blkid_dev_iterate iter, -+ char *search_type, char *search_value); -+extern int blkid_dev_next(blkid_dev_iterate iterate, blkid_dev *dev); -+extern void blkid_dev_iterate_end(blkid_dev_iterate iterate); -+ -+/* devno.c */ -+extern char *blkid_devno_to_devname(dev_t devno); -+ -+/* devname.c */ -+extern int blkid_probe_all(blkid_cache cache); -+extern int blkid_probe_all_new(blkid_cache cache); -+extern blkid_dev blkid_get_dev(blkid_cache cache, const char *devname, -+ int flags); -+ -+/* getsize.c */ -+extern blkid_loff_t blkid_get_dev_size(int fd); -+ -+/* probe.c */ -+int blkid_known_fstype(const char *fstype); -+extern blkid_dev blkid_verify(blkid_cache cache, blkid_dev dev); -+ -+/* read.c */ -+ -+/* resolve.c */ -+extern char *blkid_get_tag_value(blkid_cache cache, const char *tagname, -+ const char *devname); -+extern char *blkid_get_devname(blkid_cache cache, const char *token, -+ const char *value); -+ -+/* tag.c */ -+extern blkid_tag_iterate blkid_tag_iterate_begin(blkid_dev dev); -+extern int blkid_tag_next(blkid_tag_iterate iterate, -+ const char **type, const char **value); -+extern void blkid_tag_iterate_end(blkid_tag_iterate iterate); -+extern int blkid_dev_has_tag(blkid_dev dev, const char *type, -+ const char *value); -+extern blkid_dev blkid_find_dev_with_tag(blkid_cache cache, -+ const char *type, -+ const char *value); -+extern int blkid_parse_tag_string(const char *token, char **ret_type, -+ char **ret_val); -+ -+/* version.c */ -+extern int blkid_parse_version_string(const char *ver_string); -+extern int blkid_get_library_version(const char **ver_string, -+ const char **date_string); -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /* _BLKID_BLKID_H */ -Index: e2fsprogs-1.41.9/lib/blkid/version.c -=================================================================== ---- e2fsprogs-1.41.9.orig/lib/blkid/version.c -+++ e2fsprogs-1.41.9/lib/blkid/version.c -@@ -16,7 +16,7 @@ - #include - #include - --#include "blkid.h" -+#include - #include "../../version.h" - - static const char *lib_version = E2FSPROGS_VERSION; -Index: e2fsprogs-1.41.9/lib/uuid/Makefile.in -=================================================================== ---- e2fsprogs-1.41.9.orig/lib/uuid/Makefile.in -+++ e2fsprogs-1.41.9/lib/uuid/Makefile.in -@@ -69,6 +69,10 @@ BSDLIB_INSTALL_DIR = $(root_libdir) - - all:: tst_uuid uuid_time $(SMANPAGES) uuid.pc - -+uuid.h: $(srcdir)/uuid.h.in -+ $(E) " CP $@" -+ $(Q) cp $(srcdir)/uuid.h.in uuid.h -+ - $(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_types.h.in $(top_builddir)/config.status - cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status - -@@ -137,7 +141,7 @@ install:: all installdirs - -$(Q) $(RANLIB) $(DESTDIR)$(libdir)/libuuid.a - $(Q) $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libuuid.a - $(E) " INSTALL_DATA $(includedir)/uuid/uuid.h" -- $(Q) $(INSTALL_DATA) $(srcdir)/uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h -+ $(Q) $(INSTALL_DATA) uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h - $(Q) for i in $(SMANPAGES); do \ - $(RM) -f $(DESTDIR)$(man3dir)/$$i.gz; \ - echo " INSTALL_DATA $(man3dir)/$$i"; \ -@@ -161,7 +165,7 @@ uninstall:: - $(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3 - - clean:: -- $(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/* checker/* -+ $(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/* checker/* uuid.h - $(RM) -f ../libuuid.a ../libuuid_p.a tst_uuid uuid_time $(SMANPAGES) - - check:: tst_uuid -@@ -179,21 +183,20 @@ distclean:: clean - ../../lib/libuuid.so: image - ../../lib/libuuid.dylib: image - --$(OBJS): subdirs -+$(OBJS): subdirs uuid.h - - # +++ Dependency line eater +++ - # - # Makefile dependencies follow. This must be the last section in - # the Makefile.in file - # --clear.o: $(srcdir)/clear.c $(srcdir)/uuidP.h $(srcdir)/uuid.h --compare.o: $(srcdir)/compare.c $(srcdir)/uuidP.h $(srcdir)/uuid.h --copy.o: $(srcdir)/copy.c $(srcdir)/uuidP.h $(srcdir)/uuid.h --gen_uuid.o: $(srcdir)/gen_uuid.c $(srcdir)/uuidP.h $(srcdir)/uuid.h \ -- $(srcdir)/uuidd.h --isnull.o: $(srcdir)/isnull.c $(srcdir)/uuidP.h $(srcdir)/uuid.h --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 $(srcdir)/uuidP.h $(srcdir)/uuid.h -+clear.o: $(srcdir)/clear.c $(srcdir)/uuidP.h -+compare.o: $(srcdir)/compare.c $(srcdir)/uuidP.h -+copy.o: $(srcdir)/copy.c $(srcdir)/uuidP.h -+gen_uuid.o: $(srcdir)/gen_uuid.c $(srcdir)/uuidP.h $(srcdir)/uuidd.h -+isnull.o: $(srcdir)/isnull.c $(srcdir)/uuidP.h -+pack.o: $(srcdir)/pack.c $(srcdir)/uuidP.h -+parse.o: $(srcdir)/parse.c $(srcdir)/uuidP.h -+unpack.o: $(srcdir)/unpack.c $(srcdir)/uuidP.h -+unparse.o: $(srcdir)/unparse.c $(srcdir)/uuidP.h -+uuid_time.o: $(srcdir)/uuid_time.c $(srcdir)/uuidP.h -Index: e2fsprogs-1.41.9/lib/uuid/tst_uuid.c -=================================================================== ---- e2fsprogs-1.41.9.orig/lib/uuid/tst_uuid.c -+++ e2fsprogs-1.41.9/lib/uuid/tst_uuid.c -@@ -41,7 +41,7 @@ - #include - #include - --#include "uuid.h" -+#include - - static int test_uuid(const char * uuid, int isValid) - { -Index: e2fsprogs-1.41.9/lib/uuid/uuid.h -=================================================================== ---- e2fsprogs-1.41.9.orig/lib/uuid/uuid.h -+++ /dev/null -@@ -1,103 +0,0 @@ --/* -- * Public include file for the UUID library -- * -- * Copyright (C) 1996, 1997, 1998 Theodore Ts'o. -- * -- * %Begin-Header% -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, and the entire permission notice in its entirety, -- * including the disclaimer of warranties. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * 3. The name of the author may not be used to endorse or promote -- * products derived from this software without specific prior -- * written permission. -- * -- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED -- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF -- * WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE -- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -- * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH -- * DAMAGE. -- * %End-Header% -- */ -- --#ifndef _UUID_UUID_H --#define _UUID_UUID_H -- --#include --#ifndef _WIN32 --#include --#endif --#include -- --typedef unsigned char uuid_t[16]; -- --/* UUID Variant definitions */ --#define UUID_VARIANT_NCS 0 --#define UUID_VARIANT_DCE 1 --#define UUID_VARIANT_MICROSOFT 2 --#define UUID_VARIANT_OTHER 3 -- --/* UUID Type definitions */ --#define UUID_TYPE_DCE_TIME 1 --#define UUID_TYPE_DCE_RANDOM 4 -- --/* Allow UUID constants to be defined */ --#ifdef __GNUC__ --#define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \ -- static const uuid_t name __attribute__ ((unused)) = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15} --#else --#define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \ -- static const uuid_t name = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15} --#endif -- --#ifdef __cplusplus --extern "C" { --#endif -- --/* clear.c */ --void uuid_clear(uuid_t uu); -- --/* compare.c */ --int uuid_compare(const uuid_t uu1, const uuid_t uu2); -- --/* copy.c */ --void uuid_copy(uuid_t dst, const uuid_t src); -- --/* gen_uuid.c */ --void uuid_generate(uuid_t out); --void uuid_generate_random(uuid_t out); --void uuid_generate_time(uuid_t out); -- --/* isnull.c */ --int uuid_is_null(const uuid_t uu); -- --/* parse.c */ --int uuid_parse(const char *in, uuid_t uu); -- --/* unparse.c */ --void uuid_unparse(const uuid_t uu, char *out); --void uuid_unparse_lower(const uuid_t uu, char *out); --void uuid_unparse_upper(const uuid_t uu, char *out); -- --/* uuid_time.c */ --time_t uuid_time(const uuid_t uu, struct timeval *ret_tv); --int uuid_type(const uuid_t uu); --int uuid_variant(const uuid_t uu); -- --#ifdef __cplusplus --} --#endif -- --#endif /* _UUID_UUID_H */ -Index: e2fsprogs-1.41.9/lib/uuid/uuid.h.in -=================================================================== ---- /dev/null -+++ e2fsprogs-1.41.9/lib/uuid/uuid.h.in -@@ -0,0 +1,103 @@ -+/* -+ * Public include file for the UUID library -+ * -+ * Copyright (C) 1996, 1997, 1998 Theodore Ts'o. -+ * -+ * %Begin-Header% -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, and the entire permission notice in its entirety, -+ * including the disclaimer of warranties. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. The name of the author may not be used to endorse or promote -+ * products derived from this software without specific prior -+ * written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED -+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF -+ * WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH -+ * DAMAGE. -+ * %End-Header% -+ */ -+ -+#ifndef _UUID_UUID_H -+#define _UUID_UUID_H -+ -+#include -+#ifndef _WIN32 -+#include -+#endif -+#include -+ -+typedef unsigned char uuid_t[16]; -+ -+/* UUID Variant definitions */ -+#define UUID_VARIANT_NCS 0 -+#define UUID_VARIANT_DCE 1 -+#define UUID_VARIANT_MICROSOFT 2 -+#define UUID_VARIANT_OTHER 3 -+ -+/* UUID Type definitions */ -+#define UUID_TYPE_DCE_TIME 1 -+#define UUID_TYPE_DCE_RANDOM 4 -+ -+/* Allow UUID constants to be defined */ -+#ifdef __GNUC__ -+#define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \ -+ static const uuid_t name __attribute__ ((unused)) = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15} -+#else -+#define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \ -+ static const uuid_t name = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15} -+#endif -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* clear.c */ -+void uuid_clear(uuid_t uu); -+ -+/* compare.c */ -+int uuid_compare(const uuid_t uu1, const uuid_t uu2); -+ -+/* copy.c */ -+void uuid_copy(uuid_t dst, const uuid_t src); -+ -+/* gen_uuid.c */ -+void uuid_generate(uuid_t out); -+void uuid_generate_random(uuid_t out); -+void uuid_generate_time(uuid_t out); -+ -+/* isnull.c */ -+int uuid_is_null(const uuid_t uu); -+ -+/* parse.c */ -+int uuid_parse(const char *in, uuid_t uu); -+ -+/* unparse.c */ -+void uuid_unparse(const uuid_t uu, char *out); -+void uuid_unparse_lower(const uuid_t uu, char *out); -+void uuid_unparse_upper(const uuid_t uu, char *out); -+ -+/* uuid_time.c */ -+time_t uuid_time(const uuid_t uu, struct timeval *ret_tv); -+int uuid_type(const uuid_t uu); -+int uuid_variant(const uuid_t uu); -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /* _UUID_UUID_H */ -Index: e2fsprogs-1.41.9/lib/uuid/uuidP.h -=================================================================== ---- e2fsprogs-1.41.9.orig/lib/uuid/uuidP.h -+++ e2fsprogs-1.41.9/lib/uuid/uuidP.h -@@ -39,7 +39,7 @@ - #endif - #include - --#include "uuid.h" -+#include - - /* - * Offset between 15-Oct-1582 and 1-Jan-70 -Index: e2fsprogs-1.41.9/misc/Makefile.in -=================================================================== ---- e2fsprogs-1.41.9.orig/misc/Makefile.in -+++ e2fsprogs-1.41.9/misc/Makefile.in -@@ -565,73 +565,79 @@ distclean: clean - # - 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/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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)/lib/ext2fs/kernel-jbd.h \ -- $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h \ -- $(srcdir)/util.h $(top_srcdir)/lib/blkid/blkid.h \ -- $(top_builddir)/lib/blkid/blkid_types.h $(top_srcdir)/version.h \ -- $(srcdir)/nls-enable.h -+ $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -+ $(top_srcdir)/lib/e2p/e2p.h $(srcdir)/jfs_user.h \ -+ $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \ -+ $(top_srcdir)/lib/ext2fs/kernel-list.h $(srcdir)/util.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 - mke2fs.o: $(srcdir)/mke2fs.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/uuid/uuid.h $(top_srcdir)/lib/e2p/e2p.h \ -- $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ -- $(top_srcdir)/lib/ext2fs/ext3_extents.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)/util.h \ -- $(srcdir)/../e2fsck/profile.h prof_err.h $(top_srcdir)/version.h \ -- $(srcdir)/nls-enable.h -+ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ -+ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ -+ $(top_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -+ $(srcdir)/util.h $(srcdir)/../e2fsck/profile.h prof_err.h \ -+ $(top_srcdir)/version.h $(srcdir)/nls-enable.h - chattr.o: $(srcdir)/chattr.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)/lib/ext2fs/ext2_fs.h \ -- $(top_srcdir)/version.h $(srcdir)/nls-enable.h -+ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/version.h $(srcdir)/nls-enable.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)/lib/ext2fs/ext2_fs.h \ -- $(top_srcdir)/version.h $(srcdir)/nls-enable.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/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(top_srcdir)/lib/e2p/e2p.h $(srcdir)/jfs_user.h \ - $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \ -- $(top_srcdir)/lib/ext2fs/kernel-list.h $(top_srcdir)/lib/uuid/uuid.h \ -- $(top_srcdir)/version.h $(srcdir)/nls-enable.h -+ $(top_srcdir)/lib/ext2fs/kernel-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 \ -- $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2fs/ext3_extents.h \ -+ $(top_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/nls-enable.h - fsck.o: $(srcdir)/fsck.c $(top_srcdir)/version.h $(srcdir)/nls-enable.h \ -- $(srcdir)/fsck.h $(top_srcdir)/lib/blkid/blkid.h \ -- $(top_builddir)/lib/blkid/blkid_types.h -+ $(srcdir)/fsck.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/ext3_extents.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ -+ $(top_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -+ $(srcdir)/nls-enable.h $(srcdir)/util.h -+uuidgen.o: $(srcdir)/uuidgen.c $(srcdir)/nls-enable.h -+blkid.o: $(srcdir)/blkid.c $(top_srcdir)/lib/ext2fs/ext2fs.h \ -+ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ - $(top_srcdir)/lib/ext2fs/ext3_extents.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)/nls-enable.h \ -- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \ -- $(srcdir)/util.h --uuidgen.o: $(srcdir)/uuidgen.c $(top_srcdir)/lib/uuid/uuid.h \ -- $(srcdir)/nls-enable.h --blkid.o: $(srcdir)/blkid.c $(top_srcdir)/lib/blkid/blkid.h \ -- $(top_builddir)/lib/blkid/blkid_types.h -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h - logsave.o: $(srcdir)/logsave.c --e2freefrag.o: $(srcdir)/e2freefrag.c e2freefrag.h \ -- $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ -- $(top_srcdir)/lib/ext2fs/bitops.h --filefrag.o: $(srcdir)/filefrag.c -+filefrag.o: $(srcdir)/filefrag.c $(top_builddir)/lib/ext2fs/ext2_types.h \ -+ $(top_srcdir)/lib/ext2fs/fiemap.h - base_device.o: $(srcdir)/base_device.c $(srcdir)/fsck.h --ismounted.o: $(srcdir)/ismounted.c $(top_srcdir)/lib/et/com_err.h -+ismounted.o: $(srcdir)/ismounted.c $(srcdir)/fsck.h \ -+ $(top_srcdir)/lib/et/com_err.h - profile.o: $(srcdir)/../e2fsck/profile.c $(top_srcdir)/lib/et/com_err.h \ - $(srcdir)/../e2fsck/profile.h prof_err.h --e2undo.o: $(srcdir)/e2undo.c $(top_srcdir)/lib/ext2fs/tdb.h -+e2undo.o: $(srcdir)/e2undo.c $(top_srcdir)/lib/ext2fs/tdb.h \ -+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -+ $(srcdir)/nls-enable.h -+e2freefrag.o: $(srcdir)/e2freefrag.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ -+ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ -+ $(top_srcdir)/lib/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -+ $(srcdir)/e2freefrag.h -Index: e2fsprogs-1.41.9/resize/Makefile.in -=================================================================== ---- e2fsprogs-1.41.9.orig/resize/Makefile.in -+++ e2fsprogs-1.41.9/resize/Makefile.in -@@ -146,27 +146,36 @@ source_tar_file: $(top_srcdir)/.exclude- - # - extent.o: $(srcdir)/extent.c $(srcdir)/resize2fs.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_fs.h \ -+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -+ $(top_srcdir)/lib/e2p/e2p.h - resize2fs.o: $(srcdir)/resize2fs.c $(srcdir)/resize2fs.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_fs.h \ -+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -+ $(top_srcdir)/lib/e2p/e2p.h - main.o: $(srcdir)/main.c $(top_srcdir)/lib/e2p/e2p.h \ - $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ - $(srcdir)/resize2fs.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/ext2fs/ext3_extents.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/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(top_srcdir)/version.h - online.o: $(srcdir)/online.c $(srcdir)/resize2fs.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_fs.h \ -+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -+ $(top_srcdir)/lib/e2p/e2p.h - sim_progress.o: $(srcdir)/sim_progress.c $(srcdir)/resize2fs.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_fs.h \ -+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.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_builddir)/lib/ext2fs/ext2_err.h \ -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ -+ $(top_srcdir)/lib/e2p/e2p.h -Index: e2fsprogs-1.41.9/configure -=================================================================== ---- e2fsprogs-1.41.9.orig/configure -+++ e2fsprogs-1.41.9/configure -@@ -15757,6 +15757,96 @@ _ACEOF - - fi - -+if test -n "$BLKID_CMT"; then -+ { $as_echo "$as_me:$LINENO: checking for library containing blkid_probe_all" >&5 -+$as_echo_n "checking for library containing blkid_probe_all... " >&6; } -+if test "${ac_cv_search_blkid_probe_all+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_func_search_save_LIBS=$LIBS -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char blkid_probe_all (); -+int -+main () -+{ -+return blkid_probe_all (); -+ ; -+ return 0; -+} -+_ACEOF -+for ac_lib in '' blkid; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_search_blkid_probe_all=$ac_res -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_blkid_probe_all+set}" = set; then -+ break -+fi -+done -+if test "${ac_cv_search_blkid_probe_all+set}" = set; then -+ : -+else -+ ac_cv_search_blkid_probe_all=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_blkid_probe_all" >&5 -+$as_echo "$ac_cv_search_blkid_probe_all" >&6; } -+ac_res=$ac_cv_search_blkid_probe_all -+if test "$ac_res" != no; then -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ -+fi -+ -+fi -+ - - - -@@ -15790,7 +15880,7 @@ fi - - - --for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit -+for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit blkid_probe_get_topology - do - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -Index: e2fsprogs-1.41.9/configure.in -=================================================================== ---- e2fsprogs-1.41.9.orig/configure.in -+++ e2fsprogs-1.41.9/configure.in -@@ -828,7 +828,14 @@ AC_CHECK_MEMBER(struct sockaddr.sa_len, - [#include - #include ]) - dnl --AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit) -+dnl This will add -lblkid to the AC_CHECK_FUNCS search if we are using -+dnl the system-provided blkid library -+dnl -+if test -n "$BLKID_CMT"; then -+ AC_SEARCH_LIBS([blkid_probe_all], [blkid]) -+fi -+dnl -+AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit blkid_probe_get_topology) - dnl - dnl Check to see if -lsocket is required (solaris) to make something - dnl that uses socket() to compile; this is needed for the UUID library -Index: e2fsprogs-1.41.9/misc/mke2fs.c -=================================================================== ---- e2fsprogs-1.41.9.orig/misc/mke2fs.c -+++ e2fsprogs-1.41.9/misc/mke2fs.c -@@ -49,6 +49,7 @@ extern int optind; - #include - #include - #include -+#include - - #include "ext2fs/ext2_fs.h" - #include "et/com_err.h" -@@ -614,6 +615,8 @@ static void show_stats(ext2_filsys fs) - s->s_log_block_size); - printf(_("Fragment size=%u (log=%u)\n"), fs->fragsize, - s->s_log_frag_size); -+ printf(_("Stride=%u blocks, Stripe width=%u blocks\n"), -+ s->s_raid_stride, s->s_raid_stripe_width); - printf(_("%u inodes, %u blocks\n"), s->s_inodes_count, - s->s_blocks_count); - printf(_("%u blocks (%2.2f%%) reserved for the super user\n"), -@@ -1073,6 +1076,43 @@ static int get_bool_from_profile(char ** - extern const char *mke2fs_default_profile; - static const char *default_files[] = { "", 0 }; - -+#ifdef HAVE_BLKID_PROBE_GET_TOPOLOGY -+/* -+ * Sets the geometry of a device (stripe/stride), and returns the -+ * device's alignment offset, if any, or a negative error. -+ */ -+static int ext2fs_get_device_geometry(const char *file, -+ struct ext2_super_block *fs_param) -+{ -+ int rc = -1; -+ int blocksize; -+ blkid_probe pr; -+ blkid_topology tp; -+ unsigned long min_io; -+ unsigned long opt_io; -+ -+ pr = blkid_new_probe_from_filename(file); -+ if (!pr) -+ goto out; -+ -+ tp = blkid_probe_get_topology(pr); -+ if (!tp) -+ goto out; -+ -+ min_io = blkid_topology_get_minimum_io_size(tp); -+ opt_io = blkid_topology_get_optimal_io_size(tp); -+ blocksize = EXT2_BLOCK_SIZE(fs_param); -+ -+ fs_param->s_raid_stride = min_io / blocksize; -+ fs_param->s_raid_stripe_width = opt_io / blocksize; -+ -+ rc = blkid_topology_get_alignment_offset(tp); -+out: -+ blkid_free_probe(pr); -+ return rc; -+} -+#endif -+ - static void PRS(int argc, char *argv[]) - { - int b, c; -@@ -1633,6 +1673,21 @@ got_size: - fs_param.s_log_frag_size = fs_param.s_log_block_size = - int_log2(blocksize >> EXT2_MIN_BLOCK_LOG_SIZE); - -+#ifdef HAVE_BLKID_PROBE_GET_TOPOLOGY -+ retval = ext2fs_get_device_geometry(device_name, &fs_param); -+ if (retval < 0) { -+ fprintf(stderr, -+ _("warning: Unable to get device geometry for %s"), -+ device_name); -+ } else if (retval) { -+ printf(_("%s alignment is offset by %lu bytes.\n"), -+ device_name, retval); -+ printf(_("This may result in very poor performance, " -+ "(re)-partitioning suggested.\n")); -+ proceed_question(); -+ } -+#endif -+ - blocksize = EXT2_BLOCK_SIZE(&fs_param); - - lazy_itable_init = get_bool_from_profile(fs_types, -Index: e2fsprogs-1.41.9/tests/f_resize_inode/expect -=================================================================== ---- e2fsprogs-1.41.9.orig/tests/f_resize_inode/expect -+++ e2fsprogs-1.41.9/tests/f_resize_inode/expect -@@ -3,6 +3,7 @@ Filesystem label= - OS type: Linux - Block size=1024 (log=0) - Fragment size=1024 (log=0) -+Stride=0 blocks, Stripe width=0 blocks - 4096 inodes, 16384 blocks - 819 blocks (5.00%) reserved for the super user - First data block=1 -Index: e2fsprogs-1.41.9/tests/m_dasd_bs/expect.1 -=================================================================== ---- e2fsprogs-1.41.9.orig/tests/m_dasd_bs/expect.1 -+++ e2fsprogs-1.41.9/tests/m_dasd_bs/expect.1 -@@ -2,6 +2,7 @@ Filesystem label= - OS type: Linux - Block size=2048 (log=1) - Fragment size=2048 (log=1) -+Stride=0 blocks, Stripe width=0 blocks - 16384 inodes, 32768 blocks - 1638 blocks (5.00%) reserved for the super user - First data block=0 -Index: e2fsprogs-1.41.9/tests/m_large_file/expect.1 -=================================================================== ---- e2fsprogs-1.41.9.orig/tests/m_large_file/expect.1 -+++ e2fsprogs-1.41.9/tests/m_large_file/expect.1 -@@ -2,6 +2,7 @@ Filesystem label= - OS type: Linux - Block size=4096 (log=2) - Fragment size=4096 (log=2) -+Stride=0 blocks, Stripe width=0 blocks - 64 inodes, 16384 blocks - 819 blocks (5.00%) reserved for the super user - First data block=0 -Index: e2fsprogs-1.41.9/tests/m_meta_bg/expect.1 -=================================================================== ---- e2fsprogs-1.41.9.orig/tests/m_meta_bg/expect.1 -+++ e2fsprogs-1.41.9/tests/m_meta_bg/expect.1 -@@ -2,6 +2,7 @@ Filesystem label= - OS type: Linux - Block size=1024 (log=0) - Fragment size=1024 (log=0) -+Stride=0 blocks, Stripe width=0 blocks - 32768 inodes, 131072 blocks - 6553 blocks (5.00%) reserved for the super user - First data block=1 -Index: e2fsprogs-1.41.9/tests/m_no_opt/expect.1 -=================================================================== ---- e2fsprogs-1.41.9.orig/tests/m_no_opt/expect.1 -+++ e2fsprogs-1.41.9/tests/m_no_opt/expect.1 -@@ -2,6 +2,7 @@ Filesystem label= - OS type: Linux - Block size=1024 (log=0) - Fragment size=1024 (log=0) -+Stride=0 blocks, Stripe width=0 blocks - 16384 inodes, 65536 blocks - 3276 blocks (5.00%) reserved for the super user - First data block=1 -Index: e2fsprogs-1.41.9/tests/m_raid_opt/expect.1 -=================================================================== ---- e2fsprogs-1.41.9.orig/tests/m_raid_opt/expect.1 -+++ e2fsprogs-1.41.9/tests/m_raid_opt/expect.1 -@@ -2,6 +2,7 @@ Filesystem label= - OS type: Linux - Block size=1024 (log=0) - Fragment size=1024 (log=0) -+Stride=13 blocks, Stripe width=0 blocks - 32768 inodes, 131072 blocks - 6553 blocks (5.00%) reserved for the super user - First data block=1 -Index: e2fsprogs-1.41.9/tests/m_std/expect.1 -=================================================================== ---- e2fsprogs-1.41.9.orig/tests/m_std/expect.1 -+++ e2fsprogs-1.41.9/tests/m_std/expect.1 -@@ -2,6 +2,7 @@ Filesystem label= - OS type: Linux - Block size=1024 (log=0) - Fragment size=1024 (log=0) -+Stride=0 blocks, Stripe width=0 blocks - 16384 inodes, 65536 blocks - 3276 blocks (5.00%) reserved for the super user - First data block=1 -Index: e2fsprogs-1.41.9/tests/m_uninit/expect.1 -=================================================================== ---- e2fsprogs-1.41.9.orig/tests/m_uninit/expect.1 -+++ e2fsprogs-1.41.9/tests/m_uninit/expect.1 -@@ -2,6 +2,7 @@ Filesystem label= - OS type: Linux - Block size=1024 (log=0) - Fragment size=1024 (log=0) -+Stride=0 blocks, Stripe width=0 blocks - 32768 inodes, 131072 blocks - 6553 blocks (5.00%) reserved for the super user - First data block=1 diff --git a/e2fsprogs-1.41.9-trim.patch b/e2fsprogs-1.41.9-trim.patch deleted file mode 100644 index bed02a5..0000000 --- a/e2fsprogs-1.41.9-trim.patch +++ /dev/null @@ -1,138 +0,0 @@ -Try calling the BLKDISCARD ioctl at mkfs time to pre-discard all blocks -on an ssd, or a thinly-provisioned storage device. - -No real error checking; if it fails, it fails, and that's ok - it's -just an optimization. Also, it cannot work in conjunction with -the undo io manager, for obvious reasons. - -Optionally disabled with a "-K" (mnemonic: Keep) option. - -Signed-off-by: Eric Sandeen ---- - -Index: e2fsprogs-1.41.9/misc/mke2fs.8.in -=================================================================== ---- e2fsprogs-1.41.9.orig/misc/mke2fs.8.in -+++ e2fsprogs-1.41.9/misc/mke2fs.8.in -@@ -45,6 +45,9 @@ mke2fs \- create an ext2/ext3/ext4 files - .I journal-options - ] - [ -+.B \-K -+] -+[ - .B \-N - .I number-of-inodes - ] -@@ -364,6 +367,10 @@ and may be no more than 102,400 filesyst - @JDEV@.BR size " or " device - @JDEV@options can be given for a filesystem. - .TP -+.BI \-K -+Keep, do not attempt to discard blocks at mkfs time (discarding blocks initially -+is useful on solid state devices and sparse / thin-provisioned storage). -+.TP - .BI \-l " filename" - Read the bad blocks list from - .IR filename . -Index: e2fsprogs-1.41.9/misc/mke2fs.c -=================================================================== ---- e2fsprogs-1.41.9.orig/misc/mke2fs.c -+++ e2fsprogs-1.41.9/misc/mke2fs.c -@@ -79,6 +79,7 @@ int cflag; - int verbose; - int quiet; - int super_only; -+int discard = 1; - int force; - int noaction; - int journal_size; -@@ -111,7 +112,7 @@ static void usage(void) - "\t[-g blocks-per-group] [-L volume-label] " - "[-M last-mounted-directory]\n\t[-O feature[,...]] " - "[-r fs-revision] [-E extended-option[,...]]\n" -- "\t[-T fs-type] [-U UUID] [-jnqvFSV] device [blocks-count]\n"), -+ "\t[-T fs-type] [-U UUID] [-jnqvFKSV] device [blocks-count]\n"), - program_name); - exit(1); - } -@@ -1206,7 +1207,7 @@ static void PRS(int argc, char *argv[]) - } - - while ((c = getopt (argc, argv, -- "b:cf:g:G:i:jl:m:no:qr:s:t:vE:FI:J:L:M:N:O:R:ST:U:V")) != EOF) { -+ "b:cf:g:G:i:jl:m:no:qr:s:t:vE:FI:J:KL:M:N:O:R:ST:U:V")) != EOF) { - switch (c) { - case 'b': - blocksize = strtol(optarg, &tmp, 0); -@@ -1285,6 +1286,9 @@ static void PRS(int argc, char *argv[]) - case 'J': - parse_journal_opts(optarg); - break; -+ case 'K': -+ discard = 0; -+ break; - case 'j': - if (!journal_size) - journal_size = -1; -@@ -1906,6 +1910,48 @@ static int mke2fs_setup_tdb(const char * - return retval; - } - -+#ifdef __linux__ -+ -+#ifndef BLKDISCARD -+#define BLKDISCARD _IO(0x12,119) -+#endif -+ -+static void mke2fs_discard_blocks(ext2_filsys fs) -+{ -+ int fd; -+ int ret; -+ int blocksize; -+ __u64 blocks; -+ __uint64_t range[2]; -+ -+ blocks = fs->super->s_blocks_count; -+ blocksize = EXT2_BLOCK_SIZE(fs->super); -+ range[0] = 0; -+ range[1] = blocks * blocksize; -+ -+ fd = open64(fs->device_name, O_RDONLY); -+ -+ /* -+ * We don't care about whether the ioctl succeeds; it's only an -+ * optmization for SSDs or sparse storage. -+ */ -+ if (fd > 0) { -+ ret = ioctl(fd, BLKDISCARD, &range); -+ if (verbose) { -+ printf(_("Calling BLKDISCARD from %llu to %llu "), -+ range[0], range[1]); -+ if (ret) -+ printf(_("failed.\n")); -+ else -+ printf(_("succeeded.\n")); -+ } -+ close(fd); -+ } -+} -+#else -+#define mke2fs_discard_blocks(fs) -+#endif -+ - int main (int argc, char *argv[]) - { - errcode_t retval = 0; -@@ -1949,6 +1995,11 @@ int main (int argc, char *argv[]) - com_err(device_name, retval, _("while setting up superblock")); - exit(1); - } -+ -+ /* Can't undo discard ... */ -+ if (discard && (io_ptr != undo_io_manager)) -+ mke2fs_discard_blocks(fs); -+ - sprintf(tdb_string, "tdb_data_size=%d", fs->blocksize <= 4096 ? - 32768 : fs->blocksize * 8); - io_channel_set_options(fs->io, tdb_string); diff --git a/e2fsprogs-resize-minimum-fix.patch b/e2fsprogs-resize-minimum-fix.patch deleted file mode 100644 index 179ebfe..0000000 --- a/e2fsprogs-resize-minimum-fix.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- - resize/resize2fs.c | 20 +++++++++++++++++--- - 1 files changed, 17 insertions(+), 3 deletions(-) - -diff --git a/resize/resize2fs.c b/resize/resize2fs.c -index c0b00b6..648e1f9 100644 ---- a/resize/resize2fs.c -+++ b/resize/resize2fs.c -@@ -1900,6 +1900,8 @@ blk_t calculate_minimum_resize_size(ext2_filsys fs) - blk_t inode_count, blks_needed, groups, data_blocks; - blk_t grp, data_needed, last_start; - int overhead = 0, num_of_superblocks = 0; -+ int extra_groups = 0; -+ int flexbg_size = 1 << fs->super->s_log_groups_per_flex; - - /* - * first figure out how many group descriptors we need to -@@ -1934,11 +1936,9 @@ blk_t calculate_minimum_resize_size(ext2_filsys fs) - * of inode tables of slack space so the resize - * operation can be guaranteed to finish. - */ -- int flexbg_size = 1 << fs->super->s_log_groups_per_flex; -- int extra_groups; -- - extra_groups = flexbg_size - (groups & (flexbg_size - 1)); - data_needed += META_OVERHEAD(fs) * extra_groups; -+ extra_groups = groups % flexbg_size; - } - - /* -@@ -2002,6 +2002,20 @@ blk_t calculate_minimum_resize_size(ext2_filsys fs) - } - - groups += extra_grps; -+ extra_groups += extra_grps; -+ if (fs->super->s_feature_incompat -+ & EXT4_FEATURE_INCOMPAT_FLEX_BG -+ && extra_groups > flexbg_size) { -+ /* -+ * For ext4 we need to allow for up to a flex_bg worth -+ * of inode tables of slack space so the resize -+ * operation can be guaranteed to finish. -+ */ -+ extra_groups = flexbg_size - -+ (groups & (flexbg_size - 1)); -+ data_needed += META_OVERHEAD(fs) * extra_groups; -+ extra_groups = groups % flexbg_size; -+ } - } - - /* now for the fun voodoo */ diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 8acc6eb..36893f4 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -3,8 +3,8 @@ Summary: Utilities for managing ext2, ext3, and ext4 filesystems Name: e2fsprogs -Version: 1.41.9 -Release: 10%{?dist} +Version: 1.41.10 +Release: 1%{?dist} # License tags based on COPYING file distinctions for various components License: GPLv2 @@ -13,14 +13,6 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: ext2_types-wrapper.h Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch -Patch4: e2fsprogs-resize-minimum-fix.patch -Patch5: e2fsprogs-1.41.9-24hr-fsck-grace.patch -Patch6: e2fsprogs-1.41.9-topology.patch -Patch7: e2fsprogs-1.41.9-trim.patch -Patch8: e4fsprogs-1.41.9-s_jnl_blocks-swap.patch -Patch9: e2fsprogs-1.41.9-topology-quiet.patch -Patch10: e2fsprogs-1.41.9-resize-array.patch -Patch11: e2fsprogs-1.41.9-dlopen-fix.patch Url: http://e2fsprogs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -146,14 +138,6 @@ It was originally inspired by the Multics SubSystem library. # mildly unsafe but 'til I get something better, avoid full fsck # after an selinux install... %patch2 -p1 -b .featurecheck -%patch4 -p1 -b .resize -%patch5 -p1 -b .24h -%patch6 -p1 -b .topo -%patch7 -p1 -b .trim -%patch8 -p1 -b .journalblocks -%patch9 -p1 -b .topo2 -%patch10 -p1 -b .resize2 -%patch11 -p1 -b .dlopen %build %configure --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \ @@ -317,6 +301,9 @@ exit 0 %{_libdir}/pkgconfig/ss.pc %changelog +* Wed Feb 10 2010 Eric Sandeen 1.41.10-1 +- New upstream version + * Sun Feb 07 2010 Eric Sandeen 1.41.9-10 - Upstream version of resize2fs array fix, original was wrong diff --git a/e4fsprogs-1.41.9-s_jnl_blocks-swap.patch b/e4fsprogs-1.41.9-s_jnl_blocks-swap.patch deleted file mode 100644 index 4b594f9..0000000 --- a/e4fsprogs-1.41.9-s_jnl_blocks-swap.patch +++ /dev/null @@ -1,48 +0,0 @@ -libext2fs: don't swap extent-based journal backup on read - -The f_illitable_flexbg test was failing on ppc, because -e2fsck_move_ext3_journal is doing a direct memcmp of i_block with -s_jnl_blocks, and failing. - -This is because we don't swap extent data on read from disk; rather -we do it when we access the extents. However, ext2fs_swap_super -was swapping s_jnl_blocks unconditionally, so these didn't match. - -Looks like we need to treat s_jnl_blocks the same as i_block, and -swap it on access, not on read. Except for the last i_size bit... - -Signed-off-by: Eric Sandeen ---- - -diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c -index 42bc01e..38f5f9b 100644 ---- a/lib/ext2fs/swapfs.c -+++ b/lib/ext2fs/swapfs.c -@@ -73,9 +73,19 @@ void ext2fs_swap_super(struct ext2_super_block * sb) - sb->s_kbytes_written = ext2fs_swab64(sb->s_kbytes_written); - for (i=0; i < 4; i++) - sb->s_hash_seed[i] = ext2fs_swab32(sb->s_hash_seed[i]); -+ -+ /* if journal backup is for a valid extent-based journal... */ -+ if (!ext2fs_extent_header_verify(sb->s_jnl_blocks, -+ sizeof(sb->s_jnl_blocks))) { -+ /* ... swap only the journal i_size */ -+ sb->s_jnl_blocks[16] = ext2fs_swab32(sb->s_jnl_blocks[16]); -+ /* and the extent data is not swapped on read */ -+ return; -+ } -+ -+ /* direct/indirect journal: swap it all */ - for (i=0; i < 17; i++) - sb->s_jnl_blocks[i] = ext2fs_swab32(sb->s_jnl_blocks[i]); -- - } - - void ext2fs_swap_group_desc(struct ext2_group_desc *gdp) - - --- -To unsubscribe from this list: send the line "unsubscribe linux-ext4" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html - diff --git a/sources b/sources index 33a2f0e..9dd5d54 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -52f60a9e19a02f142f5546f1b5681927 e2fsprogs-1.41.9.tar.gz +f9c7bb5c036a119453ce02fa871038da e2fsprogs-1.41.10.tar.gz