aboutsummaryrefslogtreecommitdiffstats
path: root/e2fsck/pass1b.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2014-07-22 14:57:40 -0400
committerTheodore Ts'o <tytso@mit.edu>2014-07-22 14:57:40 -0400
commitf9f3050a0ad9be1c37b00c8478199d286ddcaeda (patch)
treede4f122ffe0849a52e6e1f16ec29f5fa7f721ba4 /e2fsck/pass1b.c
parent26dacce72cb8d6d0d00e2377e255d9b3e900a09a (diff)
parent23d6dd1f1032af47d9a8cc7e9ecc1ec7a9b95718 (diff)
downloadandroid_external_e2fsprogs-f9f3050a0ad9be1c37b00c8478199d286ddcaeda.tar.gz
android_external_e2fsprogs-f9f3050a0ad9be1c37b00c8478199d286ddcaeda.tar.bz2
android_external_e2fsprogs-f9f3050a0ad9be1c37b00c8478199d286ddcaeda.zip
Merge branch 'maint' into next
Conflicts: debian/changelog e2fsck/pass1.c lib/ext2fs/Makefile.in
Diffstat (limited to 'e2fsck/pass1b.c')
-rw-r--r--e2fsck/pass1b.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c
index d7c5e551..b4041d18 100644
--- a/e2fsck/pass1b.c
+++ b/e2fsck/pass1b.c
@@ -301,6 +301,7 @@ static void pass1b(e2fsck_t ctx, char *block_buf)
if (pctx.errcode == EXT2_ET_BAD_BLOCK_IN_INODE_TABLE)
continue;
if (pctx.errcode) {
+ pctx.ino = ino;
fix_problem(ctx, PR_1B_ISCAN_ERROR, &pctx);
ctx->flags |= E2F_FLAG_ABORT;
return;