From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 11 May 2014 22:30:11 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.43-WIP-2015-05-18~297
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9bc7484cc79f486f6cf4a36a5d936e545f99f3d;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:
	e2fsck/pass1.c
---

c9bc7484cc79f486f6cf4a36a5d936e545f99f3d
diff --cc e2fsck/pass1.c
index eb9497c95,9ef724ade..180ecc830
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@@ -607,10 -558,9 +607,10 @@@ void e2fsck_pass1(e2fsck_t ctx
  	struct ext2_super_block *sb = ctx->fs->super;
  	const char	*old_op;
  	unsigned int	save_type;
 -	int		imagic_fs, extent_fs;
 +	int		imagic_fs, extent_fs, inlinedata_fs;
- 	int		busted_fs_time = 0;
+ 	int		low_dtime_check = 1;
  	int		inode_size;
 +	int		failed_csum = 0;
  
  	init_resource_track(&rtrack, ctx->fs->io);
  	clear_problem_context(&pctx);