From: Theodore Ts'o <tytso@mit.edu>
Date: Wed, 9 Jan 2013 02:14:25 +0000 (-0500)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.43-WIP-2015-05-18~403
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=df5e35fd63b42b66d5025fdca17bfdf6662a2827;p=tools%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:
	misc/mke2fs.c
---

df5e35fd63b42b66d5025fdca17bfdf6662a2827
diff --cc misc/mke2fs.c
index 3bc4088,32b4c34..8dd656c
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@@ -1991,13 -1921,15 +1991,22 @@@ profile_error
  	if (extended_opts)
  		parse_extended_opts(&fs_param, extended_opts);
  
 +	/* Don't allow user to set both metadata_csum and uninit_bg bits. */
 +	if ((fs_param.s_feature_ro_compat &
 +	     EXT4_FEATURE_RO_COMPAT_METADATA_CSUM) &&
 +	    (fs_param.s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_GDT_CSUM))
 +		fs_param.s_feature_ro_compat &=
 +				~EXT4_FEATURE_RO_COMPAT_GDT_CSUM;
 +
+ 	/* Can't support bigalloc feature without extents feature */
+ 	if ((fs_param.s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_BIGALLOC) &&
+ 	    !(fs_param.s_feature_incompat & EXT3_FEATURE_INCOMPAT_EXTENTS)) {
+ 		com_err(program_name, 0,
+ 			_("Can't support bigalloc feature without "
+ 			  "extents feature"));
+ 		exit(1);
+ 	}
+ 
  	/* Since sparse_super is the default, we would only have a problem
  	 * here if it was explicitly disabled.
  	 */