From: Theodore Ts'o Date: Tue, 3 Dec 2013 05:24:39 +0000 (-0500) Subject: Merge branch 'maint' into next X-Git-Tag: v1.43-WIP-2015-05-18~373 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=2fae17697ad85781f5c045a67a1103cc4111b130;p=tools%2Fe2fsprogs.git Merge branch 'maint' into next Conflicts: e2fsck/pass2.c e2fsck/pass3.c --- 2fae17697ad85781f5c045a67a1103cc4111b130 diff --cc e2fsck/pass1.c index ab23e42,a853413..67e5b91 --- a/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/pass2.c index 3c0bf49,65d8de4..81a0f4b --- a/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 2dd414b,926f462..fbaadcf --- a/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;