Merge branch 'maint' into next

Conflicts:
	e2fsck/pass1b.c

diff --cc e2fsck/pass1.c
Simple merge

diff --cc e2fsck/pass1b.c
index 8d42d100ee44db0b206540fe6f33c5298b8525a0,bb81d5e99de90113f4b798c629999238b0645c45..2d1b448bdb9ceea5c5e45b76fcb17cc84e99daac
--- 1/e2fsck/pass1b.c
--- 2/e2fsck/pass1b.c
+++ b/e2fsck/pass1b.c
@@@ -261,8 -261,7 +261,8 @@@ struct process_block_struct 
        e2fsck_t        ctx;
        ext2_ino_t      ino;
        int             dup_blocks;
-       blk64_t         cur_cluster;
+       blk64_t         cur_cluster, phys_cluster;
 +      blk64_t         last_blk;
        struct ext2_inode *inode;
        struct problem_context *pctx;
  };
@@@ -317,8 -315,7 +317,9 @@@ static void pass1b(e2fsck_t ctx, char *
                pb.dup_blocks = 0;
                pb.inode = &inode;
                pb.cur_cluster = ~0;
+               pb.phys_cluster = ~0;
 +              pb.last_blk = 0;
 +              pb.pctx->blk = pb.pctx->blk2 = 0;
  
                if (ext2fs_inode_has_valid_blocks2(fs, &inode) ||
                    (ino == EXT2_BAD_INO))
@@@ -360,8 -352,7 +361,8 @@@ static int process_pass1b_block(ext2_fi
  {
        struct process_block_struct *p;
        e2fsck_t ctx;
-       blk64_t lc;
+       blk64_t lc, pc;
 +      problem_t op;
  
        if (HOLE_BLKADDR(*block_nr))
                return 0;

diff --cc e2fsck/pass2.c
Simple merge

diff --cc e2fsck/problem.c
Simple merge

diff --cc e2fsck/problem.h
Simple merge