diff options
author | Theodore Ts'o <tytso@mit.edu> | 2013-12-03 00:24:39 -0500 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2013-12-03 00:24:39 -0500 |
commit | 2fae17697ad85781f5c045a67a1103cc4111b130 (patch) | |
tree | 8c95a56451314877d4df1fbc062691a56d1f6365 /e2fsck/pass3.c | |
parent | 7e0337ed742d0f31739984d8a4dbcc67d8a4cd88 (diff) | |
parent | 5ad07acadcc522d4963c43ab094f9e5bb7508bfa (diff) | |
download | e2fsprogs-2fae17697ad85781f5c045a67a1103cc4111b130.tar.gz |
Merge branch 'maint' into next
Conflicts:
e2fsck/pass2.c
e2fsck/pass3.c
Diffstat (limited to 'e2fsck/pass3.c')
-rw-r--r-- | e2fsck/pass3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/e2fsck/pass3.c b/e2fsck/pass3.c index 2dd414be..fbaadcfc 100644 --- a/e2fsck/pass3.c +++ b/e2fsck/pass3.c @@ -201,7 +201,7 @@ static void check_root(e2fsck_t ctx) 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_block4"; fix_problem(ctx, PR_3_CREATE_ROOT_ERROR, &pctx); ctx->flags |= E2F_FLAG_ABORT; return; |