From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 30 Nov 2012 00:54:46 +0000 (-0500)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.43-WIP-2015-05-18~410
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=ccea20f62d592d765380d71508c999d9a26a20c1;p=tools%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:
	misc/tune2fs.c
---

ccea20f62d592d765380d71508c999d9a26a20c1
diff --cc misc/tune2fs.c
index b290c46,84fe4ce..17c1565
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@@ -144,9 -141,10 +144,11 @@@ static __u32 ok_features[3] = 
  		EXT4_FEATURE_RO_COMPAT_DIR_NLINK|
  		EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE|
  		EXT4_FEATURE_RO_COMPAT_GDT_CSUM |
 +		EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER |
+ #ifdef CONFIG_QUOTA
  		EXT4_FEATURE_RO_COMPAT_QUOTA |
+ #endif
 -		EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER
 +		EXT4_FEATURE_RO_COMPAT_METADATA_CSUM
  };
  
  static __u32 clear_ok_features[3] = {
@@@ -163,9 -161,10 +165,11 @@@
  		EXT4_FEATURE_RO_COMPAT_HUGE_FILE|
  		EXT4_FEATURE_RO_COMPAT_DIR_NLINK|
  		EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE|
 +		EXT4_FEATURE_RO_COMPAT_GDT_CSUM |
+ #ifdef CONFIG_QUOTA
  		EXT4_FEATURE_RO_COMPAT_QUOTA |
+ #endif
 -		EXT4_FEATURE_RO_COMPAT_GDT_CSUM
 +		EXT4_FEATURE_RO_COMPAT_METADATA_CSUM
  };
  
  /*
diff --cc resize/resize2fs.c
index 8d6f198,ce8ed91..96f515f
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@@ -479,11 -480,10 +479,9 @@@ retry
  	group_block = fs->super->s_first_data_block +
  		old_fs->group_desc_count * fs->super->s_blocks_per_group;
  
 -	csum_flag = EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
 -					       EXT4_FEATURE_RO_COMPAT_GDT_CSUM);
 +	csum_flag = ext2fs_has_group_desc_csum(fs);
  	if (access("/sys/fs/ext4/features/lazy_itable_init", F_OK) == 0)
  		lazy_itable_init = 1;
- 	adj = old_fs->group_desc_count;
- 	max_group = fs->group_desc_count - adj;
  	if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
  		old_desc_blocks = fs->super->s_first_meta_bg;
  	else