vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

e2fsck: convert 'delete files' warning to a proper fix_problem error 

In pass 3, convert the "delete files and re-run e2fsck" message to a
proper error code for more consistent error reporting and to make
translation easier.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
crypto
Darrick J. Wong 2014-08-10 18:21:15 -04:00 committed by Theodore Ts'o
parent 0165cfadfa
commit d5da89e868
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e2fsck/pass3.c
View File

@ -452,7 +452,7 @@ unlink:
retval = ext2fs_new_block2(fs, 0, ctx->block_found_map, &blk);
if (retval == EXT2_ET_BLOCK_ALLOC_FAIL &&
fix_problem(ctx, PR_3_LPF_NO_SPACE, &pctx)) {
printf("Delete some files and re-run e2fsck.\n\n");
fix_problem(ctx, PR_3_NO_SPACE_TO_RECOVER, &pctx);
ctx->lost_and_found = EXT2_ROOT_INO;
return 0;
}
@ -472,7 +472,7 @@ skip_new_block:
ctx->inode_used_map, &ino);
if (retval == EXT2_ET_INODE_ALLOC_FAIL &&
fix_problem(ctx, PR_3_LPF_NO_SPACE, &pctx)) {
printf("Delete some files and re-run e2fsck.\n\n");
fix_problem(ctx, PR_3_NO_SPACE_TO_RECOVER, &pctx);
ctx->lost_and_found = EXT2_ROOT_INO;
return 0;
}

5
e2fsck/problem.c
View File

@ -1619,6 +1619,11 @@ static struct e2fsck_problem problem_table[] = {
N_("Cannot allocate space for /@l.\nPlace lost files in root directory instead"),
PROMPT_NULL, 0 },
/* Delete some files and re-run e2fsck. */
{ PR_3_NO_SPACE_TO_RECOVER,
N_("Insufficient space to recover lost files!\nMove data off the @f and re-run e2fsck.\n\n"),
PROMPT_NONE, 0 },
/* Pass 3A Directory Optimization */
/* Pass 3A: Optimizing directories */

3
e2fsck/problem.h
View File

@ -967,6 +967,9 @@ struct problem_context {
/* Cannot allocate lost+found */
#define PR_3_LPF_NO_SPACE 0x030019
/* Insufficient space to recover lost files */
#define PR_3_NO_SPACE_TO_RECOVER 0x03001A
/*
* Pass 3a --- rehashing diretories
*/

3
tests/f_nospc_create_lnf/expect.1
View File

@ -6,7 +6,8 @@ Pass 3: Checking directory connectivity
Cannot allocate space for /lost+found.
Place lost files in root directory instead? yes
Delete some files and re-run e2fsck.
Insufficient space to recover lost files!
Move data off the filesystem and re-run e2fsck.
Pass 3A: Optimizing directories
Pass 4: Checking reference counts

3
tests/f_nospc_create_lnf/expect.2
View File

@ -6,7 +6,8 @@ Pass 3: Checking directory connectivity
Cannot allocate space for /lost+found.
Place lost files in root directory instead? yes
Delete some files and re-run e2fsck.
Insufficient space to recover lost files!
Move data off the filesystem and re-run e2fsck.
Pass 4: Checking reference counts
Pass 5: Checking group summary information