Merge branch 'maint' into next

diff --combined lib/ext2fs/ext2fs.h
index c4a4ef019051e7ddf6522c8800438064fd8492e6,c86596a68c1124662d5d876ec3c58622b1370c2b..185be5df511fcd43937e1db25a03f1eebc3cd674
--- 1/lib/ext2fs/ext2fs.h
--- 2/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@@ -111,14 -111,9 +111,14 @@@ typedef struct struct_ext2_filsys *ext2
  #define EXT2FS_UNMARK_ERROR   1
  #define EXT2FS_TEST_ERROR     2
  
 -typedef struct ext2fs_struct_generic_bitmap *ext2fs_generic_bitmap;
 -typedef struct ext2fs_struct_generic_bitmap *ext2fs_inode_bitmap;
 -typedef struct ext2fs_struct_generic_bitmap *ext2fs_block_bitmap;
 +struct ext2fs_struct_generic_bitmap_base {
 +      errcode_t               magic;
 +      ext2_filsys             fs;
 +};
 +
 +typedef struct ext2fs_struct_generic_bitmap_base *ext2fs_generic_bitmap;
 +typedef struct ext2fs_struct_generic_bitmap_base *ext2fs_inode_bitmap;
 +typedef struct ext2fs_struct_generic_bitmap_base *ext2fs_block_bitmap;
  
  #define EXT2_FIRST_INODE(s)   EXT2_FIRST_INO(s)
  
@@@ -630,7 -625,8 +630,8 @@@ typedef struct ext2_icount *ext2_icount
                                         EXT4_FEATURE_RO_COMPAT_METADATA_CSUM|\
                                         EXT4_FEATURE_RO_COMPAT_READONLY |\
                                         EXT4_FEATURE_RO_COMPAT_PROJECT |\
-                                        EXT4_FEATURE_RO_COMPAT_SHARED_BLOCKS)
+                                        EXT4_FEATURE_RO_COMPAT_SHARED_BLOCKS |\
+                                        EXT4_FEATURE_RO_COMPAT_VERITY)
  
  /*
   * These features are only allowed if EXT2_FLAG_SOFTSUPP_FEATURES is passed

diff --combined misc/tune2fs.c
index 0f095f4d7d51e68e47f5702a5e72000f86b15abe,b8cddfa13d3882119251a8a7c99d3629fa21a532..3fe1c2881cb9cb13a045da2501b2c40fb851a181
--- 1/misc/tune2fs.c
--- 2/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@@ -2119,10 -2119,6 +2119,10 @@@ static int parse_extended_opts(ext2_fil
                               intv);
                        fs->super->s_mmp_update_interval = intv;
                        ext2fs_mark_super_dirty(fs);
 +              } else if (!strcmp(token, "force_fsck")) {
 +                      fs->super->s_state |= EXT2_ERROR_FS;
 +                      printf(_("Setting filesystem error flag to force fsck.\n"));
 +                      ext2fs_mark_super_dirty(fs);
                } else if (!strcmp(token, "test_fs")) {
                        fs->super->s_flags |= EXT2_FLAGS_TEST_FILESYS;
                        printf("Setting test filesystem flag\n");
@@@ -2205,7 -2201,6 +2205,7 @@@
                        "\tmmp_update_interval=<mmp update interval in seconds>\n"
                        "\tstride=<RAID per-disk chunk size in blocks>\n"
                        "\tstripe_width=<RAID stride*data disks in blocks>\n"
 +                      "\tforce_fsck\n"
                        "\ttest_fs\n"
                        "\t^test_fs\n"));
                free(buf);
@@@ -3056,6 -3051,7 +3056,7 @@@ _("Warning: The journal is dirty. You m
                                ext2fs_close_free(&fs);
                        exit(1);
                }
+               sb = fs->super;
        }
  #endif