From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 9 Dec 2007 22:03:01 +0000 (-0500)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.41-WIP-0427~109
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=e6a4571eec5ce0e75fb8a5a41c30bf0e68d90efe;p=tools%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:

	lib/ext2fs/closefs.c
---

e6a4571eec5ce0e75fb8a5a41c30bf0e68d90efe
diff --cc lib/ext2fs/closefs.c
index c8ef6ef,f3fe533..0f97704
--- a/lib/ext2fs/closefs.c
+++ b/lib/ext2fs/closefs.c
@@@ -218,23 -220,28 +218,23 @@@ errcode_t ext2fs_flush(ext2_filsys fs
  
  	fs->super->s_wtime = fs->now ? fs->now : time(NULL);
  	fs->super->s_block_group_nr = 0;
 -#ifdef EXT2FS_ENABLE_SWAPFS
 -	if (fs->flags & EXT2_FLAG_SWAP_BYTES) {
 -		retval = EXT2_ET_NO_MEMORY;
 -		retval = ext2fs_get_mem(SUPERBLOCK_SIZE, &super_shadow);
 -		if (retval)
 -			goto errout;
 -		retval = ext2fs_get_array(fs->blocksize, fs->desc_blocks,
 -					&group_shadow);
 -		if (retval)
 -			goto errout;
 -		memset(group_shadow, 0, (size_t) fs->blocksize *
 -		       fs->desc_blocks);
 -
 -		/* swap the group descriptors */
 -		for (j=0, s=fs->group_desc, t=group_shadow;
 -		     j < fs->group_desc_count; j++, t++, s++) {
 -			*t = *s;
 -			ext2fs_swap_group_desc(t);
 -		}
 -	} else {
 -		super_shadow = fs->super;
 -		group_shadow = fs->group_desc;
 +#ifdef WORDS_BIGENDIAN
 +	retval = EXT2_ET_NO_MEMORY;
 +	retval = ext2fs_get_mem(SUPERBLOCK_SIZE, &super_shadow);
 +	if (retval)
 +		goto errout;
- 	retval = ext2fs_get_mem((size_t)(fs->blocksize * fs->desc_blocks),
- 				&group_shadow);
++	retval = ext2fs_get_array(fs->desc_blocks, fs->blocksize, 
++				  &group_shadow);
 +	if (retval)
 +		goto errout;
 +	memset(group_shadow, 0, (size_t) fs->blocksize *
 +	       fs->desc_blocks);
 +	
 +	/* swap the group descriptors */
 +	for (j=0, s=fs->group_desc, t=group_shadow;
 +	     j < fs->group_desc_count; j++, t++, s++) {
 +		*t = *s;
 +		ext2fs_swap_group_desc(t);
  	}
  #else
  	super_shadow = fs->super;