Merge branch 'maint' into next

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

diff --cc lib/ext2fs/ext2fs.h
index 3d8c3cb,9e92e94..ed1a3ce
--- 1/lib/ext2fs/ext2fs.h
--- 2/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@@ -217,14 -195,13 +217,14 @@@ struct struct_ext2_filsys 
        char *                          device_name;
        struct ext2_super_block *       super;
        unsigned int                    blocksize;
-       int                             cluster_ratio_bits;
+       int                             fragsize;
        dgrp_t                          group_desc_count;
        unsigned long                   desc_blocks;
 -      struct ext2_group_desc *        group_desc;
 -      int                             inode_blocks_per_group;
 +      struct opaque_ext2_group_desc * group_desc;
 +      unsigned int                    inode_blocks_per_group;
        ext2fs_inode_bitmap             inode_map;
        ext2fs_block_bitmap             block_map;
 +      /* XXX FIXME-64: not 64-bit safe, but not used? */
        errcode_t (*get_blocks)(ext2_filsys fs, ext2_ino_t ino, blk_t *blocks);
        errcode_t (*check_directory)(ext2_filsys fs, ext2_ino_t ino);
        errcode_t (*write_bitmaps)(ext2_filsys fs);

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

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

diff --cc misc/mke2fs.8.in
Simple merge