Merge branch 'maint' into next

Conflicts:
	e2fsck/pass2.c
	e2fsck/pass3.c

diff --cc e2fsck/e2fsck.h
Simple merge

diff --cc e2fsck/journal.c
Simple merge

diff --cc e2fsck/message.c
Simple merge

diff --cc e2fsck/pass1.c
index ab23e42d1f8ce3e628746e11603deae77e576377,a8534134644f64c98b458173b36a04eec7640abd..67e5b914320ae5272e5536291a824296817611b1
--- 1/e2fsck/pass1.c
--- 2/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@@ -1857,9 -1769,8 +1857,9 @@@ static void scan_extent_node(e2fsck_t c
        e2_blkcnt_t             blockcnt;
        unsigned int            i;
        int                     is_dir, is_leaf;
-       errcode_t               problem;
+       problem_t               problem;
        struct ext2_extent_info info;
 +      int                     failed_csum;
  
        pctx->errcode = ext2fs_extent_get_info(ehandle, &info);
        if (pctx->errcode)

diff --cc e2fsck/pass1b.c
Simple merge

diff --cc e2fsck/pass2.c
index 3c0bf49850b887642d955125a37d5917375b6a45,65d8de41968ebb75f38db2cc93e2895bc9cf4ef4..81a0f4bf0ed025f7814686396ff2a394803c6291
--- 1/e2fsck/pass2.c
--- 2/e2fsck/pass2.c
+++ b/e2fsck/pass2.c
@@@ -918,9 -844,8 +918,9 @@@ skip_checksum
        dict_init(&de_dict, DICTCOUNT_T_MAX, dict_de_cmp);
        prev = 0;
        do {
-               int group;
+               dgrp_t group;
                ext2_ino_t first_unused_inode;
 +              unsigned int name_len;
  
                problem = 0;
                dirent = (struct ext2_dir_entry *) (buf + offset);

diff --cc e2fsck/pass3.c
index 2dd414be8f2563f9df14a86b86d03e9d5f23cf80,926f462f6c9a3f420d9bcc8509ff016c1f0b57e9..fbaadcfc6d40e141b93d96efbba6660e4a28eb3e
--- 1/e2fsck/pass3.c
--- 2/e2fsck/pass3.c
+++ b/e2fsck/pass3.c
@@@ -198,10 -198,9 +198,10 @@@ static void check_root(e2fsck_t ctx
                return;
        }
  
 -      pctx.errcode = ext2fs_write_dir_block3(fs, blk, block, 0);
 +      pctx.errcode = ext2fs_write_dir_block4(fs, blk, block, 0,
 +                                             EXT2_ROOT_INO);
        if (pctx.errcode) {
-               pctx.str = "ext2fs_write_dir_block";
 -              pctx.str = "ext2fs_write_dir_block3";
++              pctx.str = "ext2fs_write_dir_block4";
                fix_problem(ctx, PR_3_CREATE_ROOT_ERROR, &pctx);
                ctx->flags |= E2F_FLAG_ABORT;
                return;

diff --cc e2fsck/pass5.c
Simple merge

diff --cc e2fsck/problem.h
Simple merge

diff --cc e2fsck/rehash.c
Simple merge

diff --cc e2fsck/super.c
Simple merge

diff --cc e2fsck/unix.c
Simple merge

diff --cc e2fsck/util.c
Simple merge

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

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

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

diff --cc misc/dumpe2fs.c
Simple merge