Merge branch 'maint'

diff --cc e2fsck/unix.c
index 1ad3ae0,303cec9..f5ece71
--- 1/e2fsck/unix.c
--- 2/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@@ -1349,27 -1386,16 +1349,26 @@@ no_journal
                }
        }
  
 +      if (sb->s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_GDT_CSUM &&
 +          !(ctx->options & E2F_OPT_READONLY)) {
 +              retval = ext2fs_set_gdt_csum(ctx->fs);
 +              if (retval) {
 +                      com_err(ctx->program_name, retval,
 +                              _("while setting block group checksum info"));
 +                      fatal_error(ctx, 0);
 +              }
 +      }
 +
        e2fsck_write_bitmaps(ctx);
 -      
 +#ifdef RESOURCE_TRACK
 +      io_channel_flush(ctx->fs->io);
 +      if (ctx->options & E2F_OPT_TIME)
 +              print_resource_track(NULL, &ctx->global_rtrack, ctx->fs->io);
 +#endif
        ext2fs_close(fs);
        ctx->fs = NULL;
-       free(ctx->filesystem_name);
        free(ctx->journal_name);
  
 -#ifdef RESOURCE_TRACK
 -      if (ctx->options & E2F_OPT_TIME)
 -              print_resource_track(NULL, &ctx->global_rtrack);
 -#endif
        e2fsck_free_context(ctx);
        remove_error_table(&et_ext2_error_table);
        remove_error_table(&et_prof_error_table);