From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 17 Sep 2012 02:06:29 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.43-WIP-2012-09-22~5
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=32dd6cdbe533f77dbcf05fe706cb60a95c464cd7;p=tools%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:
	resize/resize2fs.c
---

32dd6cdbe533f77dbcf05fe706cb60a95c464cd7
diff --cc resize/resize2fs.c
index 8a02ff4,861acff..8d6f198
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@@ -481,7 -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)