From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 17 Dec 2007 15:28:01 +0000 (-0500)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.41-WIP-0427~108
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b689b8dd14e69c652d2c8211bdef3effe81cfd65;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:

	lib/ext2fs/closefs.c
---

b689b8dd14e69c652d2c8211bdef3effe81cfd65
diff --cc debian/rules
index d3e2494d9,b66555a6c..b49b0ca6a
--- a/debian/rules
+++ b/debian/rules
@@@ -89,10 -94,10 +94,10 @@@ COMMON_CONF_FLAGS =  
                  --infodir=/usr/share/info --enable-fsck
  
  STD_CONF_FLAGS = --with-ccopts="${CCOPTS}" --enable-compression \
- 		--enable-blkid-devmapper
+ 		${DEVMAPPER}
  
  BF_CONF_FLAGS = --with-ccopts="${CCOPTS} ${BF_CCOPTS}" \
 -	--disable-nls --disable-swapfs --disable-imager \
 +	--disable-nls --disable-imager \
  	--disable-debugfs  --disable-e2initrd-helper
  
  MIPS_NOPIC_CONF_FLAGS = --with-ccopts="${CCOPTS}" \
diff --cc lib/ext2fs/closefs.c
index 0f9770432,88c515a28..a523c8e85
--- a/lib/ext2fs/closefs.c
+++ b/lib/ext2fs/closefs.c
@@@ -247,9 -256,12 +249,10 @@@ errcode_t ext2fs_flush(ext2_filsys fs
  	 * we write out the backup superblocks.)
  	 */
  	fs->super->s_state &= ~EXT2_VALID_FS;
+ 	fs->super->s_feature_incompat &= ~EXT3_FEATURE_INCOMPAT_RECOVER;
 -#ifdef EXT2FS_ENABLE_SWAPFS
 -	if (fs->flags & EXT2_FLAG_SWAP_BYTES) {
 -		*super_shadow = *fs->super;
 -		ext2fs_swap_super(super_shadow);
 -	}
 +#ifdef WORDS_BIGENDIAN
 +	*super_shadow = *fs->super;
 +	ext2fs_swap_super(super_shadow);
  #endif
  
  	/*
@@@ -323,9 -335,12 +326,10 @@@ write_primary_superblock_only
  
  	fs->super->s_block_group_nr = 0;
  	fs->super->s_state = fs_state;
+ 	fs->super->s_feature_incompat = feature_incompat;
 -#ifdef EXT2FS_ENABLE_SWAPFS
 -	if (fs->flags & EXT2_FLAG_SWAP_BYTES) {
 -		*super_shadow = *fs->super;
 -		ext2fs_swap_super(super_shadow);
 -	}
 +#ifdef WORDS_BIGENDIAN
 +	*super_shadow = *fs->super;
 +	ext2fs_swap_super(super_shadow);
  #endif
  
  	retval = io_channel_flush(fs->io);