From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 15 Dec 2013 01:56:29 +0000 (-0500)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.43-WIP-2015-05-18~366
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b24aadee872b8200729db479a6418a9d7f83794;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:
	misc/tune2fs.c
---

2b24aadee872b8200729db479a6418a9d7f83794
diff --cc misc/tune2fs.c
index 1ae0ee66e,a8dc11124..a84e6d6d2
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@@ -2653,8 -2154,8 +2653,7 @@@ retry_open
  		int set_csum = 0;
  		dgrp_t i;
  
- 		if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
- 				EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {
 -		if (sb->s_feature_ro_compat &
 -		    EXT4_FEATURE_RO_COMPAT_GDT_CSUM) {
++		if (ext2fs_has_group_desc_csum(fs)) {
  			/*
  			 * Changing the UUID requires rewriting all metadata,
  			 * which can race with a mounted fs.  Don't allow that.