Merge branch 'maint' into next

diff --cc lib/ext2fs/dblist.c
index 8ee61b4ce38ba3e3dcbf0b946d23b4321bc9a42a,d981f71197f88a816311330e53b900299d5a0991..c0a3dfe4363e179e47a706a92259f20f87ca0ba9
--- 1/lib/ext2fs/dblist.c
--- 2/lib/ext2fs/dblist.c
+++ b/lib/ext2fs/dblist.c
@@@ -166,13 -162,13 +166,13 @@@ errcode_t ext2fs_add_dir_block2(ext2_db
        EXT2_CHECK_MAGIC(dblist, EXT2_ET_MAGIC_DBLIST);
  
        if (dblist->count >= dblist->size) {
 -              old_size = dblist->size * sizeof(struct ext2_db_entry);
 +              old_size = dblist->size * sizeof(struct ext2_db_entry2);
                dblist->size += dblist->size > 200 ? dblist->size / 2 : 100;
                retval = ext2fs_resize_mem(old_size, (size_t) dblist->size *
 -                                         sizeof(struct ext2_db_entry),
 +                                         sizeof(struct ext2_db_entry2),
                                           &dblist->list);
                if (retval) {
-                       dblist->size -= 100;
 -                      dblist->size = old_size / sizeof(struct ext2_db_entry);
++                      dblist->size = old_size / sizeof(struct ext2_db_entry2);
                        return retval;
                }
        }