From: Theodore Ts'o Date: Thu, 10 Jul 2014 05:07:39 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/maint' into next X-Git-Tag: v1.43-WIP-2015-05-18~277 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f10554e1c2a40299586bb3bc8ba15edb5bb9cf40;p=thirdparty%2Fe2fsprogs.git Merge remote-tracking branch 'origin/maint' into next Conflicts: RELEASE-NOTES debian/changelog version.h --- f10554e1c2a40299586bb3bc8ba15edb5bb9cf40 diff --cc RELEASE-NOTES index adbaf8c45,cdbfe17a7..dad9970e2 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@@ -1,23 -1,116 +1,136 @@@ +E2fsprogs 1.43-WIP (December 28, 2013) -- 38cc555a5fc +====================================== + +Add support for the ext4 metadata checksum feature. + +Check to make sure file system features which can not be supported by +HURD are not enabled if the file system is created to be +HURD-compatible. + + +Programmer's Notes +------------------ + +Reduce the use of libc functions in libext2fs that may not be present +in the boot loader environment, at least for those functions that are +needed by boot loadsers such as yaboot. + +Support for the MMP feature can now be disabled at compile time. + + + E2fsprogs 1.42.11 (July 9, 2014) + ================================ + + Add support so that mke2fs can create hugefiles so that they are + aligned relative to the beginning of the disk, instead of relative to + the beginning of the partition, using the mke2fs.conf configuration + parameter "hugefiles_align_disk". + + Fix a bug which causes e2fsck to abort a journal replay on a file + system with bigalloc enabled. (Addresses Debian Bug: #744953) + + Add sanity checks so that mke2fs will refuse insanely large flex_bg + counts specified by the -G option. Insanely large flex_bg sizes can + result in a file system which can't be unmounted, or with extremely + pessimal metadata layouts. + + The mke2fs program will provide a better metadata layout for + moderately large (but believable) flex_bg counts, such as 133,072. + + The mke2fs progam will also check the kernel version number to + determine whether the lazy_itable_init option is supported, so that + lazy inode table initialization can be used even if the ext4 is + compiled as a module which isn't loaded at the time that mke2fs is + run. + + Add description of ext4's mount options to the ext4 section 5 man + page. + + Improve the chattr man page and clean up the chattr usage message. + + E2fsck will now automatically fix a last mount time or last write time + which is in the future in preen mode, instead of aborting the fsck + check. + + Mke2fs will now check the file system revision number requested by the + command line, and reject it if it is too large. A file system with an + unsupported revision number will not be accepted by any of the other + file system tools, and this command line option is rarely used, so + let's try to help the user not shoot their own foot off. + + The debugfs progam can now set the error count and associated + first_error and last_error fields in the superblock using the + set_super_value command. + + Resize2fs will not try to calculate the minimum size of a file system + if it contains errors. Otherwise a very badly corrupted file system + image can cause the minimum size calculation to loop forwever. Since + resize2fs will not allow a file system marked as containing errors to + be resized. It's pointless to calculate the minimum size, so just + skip it. + + Fixed a typo in one of mke2fs's error message. + + If filefrag runs into an error, it will continue processing the rest + of the files specified on thec ommand line, but then exit with an + error code. + + Filefrag now prints some additional new flags (such as + FIEMAP_EXTENT_ENCODED), and print unknown flags as hex values. + + Fixed support in filefrag for files with > 2**32 blocks on 32-bit + platforms. + + Fixed a file descriptor leak in debugfs when copying files. + + Fixed a regression introduced in 1.42.10 which caused mke2fs to fail + to create file systems larger than 2GB on 32-bit platforms. + (Addresses Red Hat Bugzilla: #1099892, Debian Bug: #752107) + + Add Esparanto and Ukrainian translations, and update Czech, Dutch, + French, German, Italian, Polish, Sweedish, and Vietnamese + translations. + + Fixed various compiler warnings. + + + Programmer's Notes + ------------------ + + The gcc "-checker" option has been long deprecated, so remove support + from e2fsprogs. It was causing a few people to be confused when they + tried enabling the configure option. + + Update to the latest version of the config.status and config.rpath + files, as well as newer versions of the autoconf files in aclocal.m4. + Also, move the e2fsprogs-specific macros to acinclude.m4, which allows + people who want to use autoreconf to do so. + + Make the use of strptime() function in debugfs to be more portable to + fix regression test failures for FreeBSD and MacOS. + + A few miscellaneous changes designed to make life easier for + translators. + + Fix the f_quota test and some Makefile dependencies if quota support + is not enabled. + + Fix cross-compilation support, which got broken in 1.42.10. + (Addresses Debian Bug: #753375) + + Delete lib/ext2_types.h on a make clean, and build it as necessary. + + Add a debug program used for libext2fs unit tests. + + Clean up the tests so that it avoids using GNU-specific behaviour in + mktemp. Make sure the temporary files are cleaned up if the tests are + interrupted. + + Add a new ext2fs_close_free() helper function which automatically + takes care of freeing the ext2_filsys structure even if ext2fs_close() + returns an error. + + E2fsprogs 1.42.10 (May 18, 2014) ================================ diff --cc debian/changelog index 3f1f80c3f,1f6d3a85f..1d8da2ef3 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,44 +1,50 @@@ +e2fsprogs (1.43~WIP-2014-02-04-1) unstable; urgency=low + + * Merge in updates from the maint branch (changes from 1.42.10-1) + + -- Theodore Y. Ts'o Wed, 04 Feb 2014 23:31:56 -0500 + + e2fsprogs (1.42.11-1) unstable; urgency=medium + + * New upstream version + * NMU acknowledge (Closes: #752107) + * mke2fs can now create hugefiles which are aligned to the beginning + of the disk (instead of relative to the beginning of the partition), + controlled via a mke2fs.conf configuration parameter. + * Fix a bug which caused e2fsck to abort a journal replay on a file + system with bigalloc enabled. (Closes: #744953) + * Fix mke2fs so it more correctly handles large flex_bg counts + * Mke2fs will check the kernel version number and not just the sysfs + feature flag to determine whether it is safe to enable lazy + inode table initialization, so it won't get faked out if the ext4 is + compiled as a mdoule which hasn't happened to be loaded yet. + * E2fsck will now automatically fix a last mount time or last write time + which is in the future in preen mode. + * Mke2fs will now check the file system revision number requested by the + command line, and reject it if it is too large. + * If filefrag runs into an error, it will continue processing the rest + of the files specified on thec ommand line, but then exit with an + error code. + * Filefrag now prints some additional new flags (such as + FIEMAP_EXTENT_ENCODED), and print unknown flags as hex values. + * Fixed support in filefrag for files with > 2**32 blocks on 32-bit + platforms. + * Fixed a file descriptor leak in debugfs when copying files. + * Add Esparanto and Ukrainian translations, and update Czech, Dutch, + French, German, Italian, Polish, Sweedish, and Vietnamese translations. + * Fixed cross-compilation support. (Closes: #753375) + * Update/fix various man pages + + -- Theodore Y. Ts'o Wed, 9 July 2014 23:43:27 -0400 + + e2fsprogs (1.42.10-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add patch from upstream git that fixes creating filesystems in files + larger than 2GB on 32 bit architectures (Closes: #752107) + + -- Hilko Bengen Sat, 21 Jun 2014 12:57:25 +0200 + e2fsprogs (1.42.10-1) unstable; urgency=medium * New upstream version diff --cc misc/mke2fs.c index ceb61c1c5,da77e3acf..e26408ca2 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@@ -3030,23 -2913,9 +3030,23 @@@ no_journal EXT4_FEATURE_RO_COMPAT_QUOTA)) create_quota_inodes(fs); - retval = mk_hugefiles(fs); + retval = mk_hugefiles(fs, device_name); if (retval) com_err(program_name, retval, "while creating huge files"); + /* Copy files from the specified directory */ + if (root_dir) { + if (!quiet) + printf("%s", _("Copying files into the device: ")); + + retval = populate_fs(fs, EXT2_ROOT_INO, root_dir, + EXT2_ROOT_INO); + if (retval) { + com_err(program_name, retval, "%s", + _("\nError while populating file system\n")); + exit(1); + } else if (!quiet) + printf("%s", _("done\n")); + } if (!quiet) printf("%s", _("Writing superblocks and " diff --cc version.h index 5b3379369,f38b6f3a2..1cdd954f8 --- a/version.h +++ b/version.h @@@ -7,5 -7,5 +7,5 @@@ * file may be redistributed under the GNU Public License v2. */ -#define E2FSPROGS_VERSION "1.42.11" +#define E2FSPROGS_VERSION "1.43-WIP" - #define E2FSPROGS_DATE "18-May-2014" + #define E2FSPROGS_DATE "09-Jul-2014"