From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 26 Jul 2014 20:53:37 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.43-WIP-2015-05-18~268^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87b9f5e3fe9ff3353bc30e218ee1f7ae020be8b1;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:
	e2fsck/pass1b.c
---

87b9f5e3fe9ff3353bc30e218ee1f7ae020be8b1
diff --cc e2fsck/pass1b.c
index 8d42d100e,bb81d5e99..2d1b448bd
--- a/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;