From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 21 Jun 2013 03:20:51 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.43-WIP-2015-05-18~388
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93061ea0f4d9f94579d09480f17dd47169c82081;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:
	RELEASE-NOTES
	version.h
---

93061ea0f4d9f94579d09480f17dd47169c82081
diff --cc RELEASE-NOTES
index 6d662542e,e51b1f5f5..cef56a9bb
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@@ -1,25 -1,5 +1,24 @@@
 +E2fsprogs 1.43-WIP (June 16, 2012)
 +=======================================
 +
 +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.8 (June 16, 2013)
- ================================
+ E2fsprogs 1.42.8 (June 20, 2013)
 -================================
  
  As a part of mke2fs's option parsing cleanup, the use of the -R option
  will give a warning that it is depreated (it has been so documented
diff --cc misc/mke2fs.c
index 2ffbbe9a6,22c2815db..d96f156f6
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@@ -2438,27 -2360,13 +2438,33 @@@ int main (int argc, char *argv[]
  		com_err(device_name, retval, _("while setting up superblock"));
  		exit(1);
  	}
 +	fs->progress_ops = &ext2fs_numeric_progress_ops;
 +
 +	/* Check the user's mkfs options for metadata checksumming */
 +	if (!quiet &&
 +	    EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
 +				       EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {
 +		if (!EXT2_HAS_INCOMPAT_FEATURE(fs->super,
 +				EXT3_FEATURE_INCOMPAT_EXTENTS))
 +			printf(_("Extents are not enabled.  The file extent "
 +				 "tree can be checksummed, whereas block maps "
 +				 "cannot.  Not enabling extents reduces the "
 +				 "coverage of metadata checksumming.  "
 +				 "Pass -O extents to rectify.\n"));
 +		if (!EXT2_HAS_INCOMPAT_FEATURE(fs->super,
 +				EXT4_FEATURE_INCOMPAT_64BIT))
 +			printf(_("64-bit filesystem support is not "
 +				 "enabled.  The larger fields afforded by "
 +				 "this feature enable full-strength "
 +				 "checksumming.  Pass -O 64bit to rectify.\n"));
 +	}
  
+ 	/* Calculate journal blocks */
+ 	if (!journal_device && ((journal_size) ||
+ 		(fs_param.s_feature_compat &
+ 		 EXT3_FEATURE_COMPAT_HAS_JOURNAL)))
+ 		journal_blocks = figure_journal_size(journal_size, fs);
+ 
  	/* Can't undo discard ... */
  	if (!noaction && discard && (io_ptr != undo_io_manager)) {
  		retval = mke2fs_discard_device(fs);
diff --cc version.h
index d22de6546,50d5879df..12242ea98
--- a/version.h
+++ b/version.h
@@@ -7,6 -7,5 +7,5 @@@
   * file may be redistributed under the GNU Public License v2.
   */
  
 -#define E2FSPROGS_VERSION "1.42.8"
 +#define E2FSPROGS_VERSION "1.43-WIP"
- #define E2FSPROGS_DATE "16-Jun-2013"
- 
+ #define E2FSPROGS_DATE "20-Jun-2013"