Merge branch 'maint' into next

Conflicts:

	lib/ext2fs/closefs.c

diff --cc lib/blkid/devname.c
Simple merge

diff --cc lib/ext2fs/bmap.c
Simple merge

diff --cc lib/ext2fs/closefs.c
index c8ef6ef,f3fe533..0f97704
--- 1/lib/ext2fs/closefs.c
--- 2/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;

diff --cc lib/ext2fs/ext2fs.h
Simple merge

diff --cc lib/ext2fs/initialize.c
Simple merge

diff --cc lib/ext2fs/inode.c
Simple merge

diff --cc lib/ext2fs/ismounted.c
Simple merge

diff --cc lib/ext2fs/openfs.c
Simple merge

diff --cc misc/e2image.c
Simple merge