diff mbox

[02/21] e2fsck: convert 'delete files' warning to a proper fix_problem error

Message ID 20140805010510.2611.45729.stgit@birch.djwong.org
State Accepted, archived
Headers show

Commit Message

Darrick Wong Aug. 5, 2014, 1:05 a.m. UTC 
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>
---
 e2fsck/pass3.c                    |    4 ++--
 e2fsck/problem.c                  |    5 +++++
 e2fsck/problem.h                  |    3 +++
 tests/f_nospc_create_lnf/expect.1 |    3 ++-
 tests/f_nospc_create_lnf/expect.2 |    3 ++-
 5 files changed, 14 insertions(+), 4 deletions(-)



--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Theodore Ts'o Aug. 10, 2014, 10:16 p.m. UTC | #1 
On Mon, Aug 04, 2014 at 06:05:10PM -0700, Darrick J. Wong wrote:
> 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>

Applied, thanks.

					- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/e2fsck/pass3.c b/e2fsck/pass3.c
index 0b02961..63b1d70 100644
--- a/e2fsck/pass3.c
+++ b/e2fsck/pass3.c
@@ -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;
 	}
diff --git a/e2fsck/problem.c b/e2fsck/problem.c
index 452137a..2d29c35 100644
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@ -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 */
diff --git a/e2fsck/problem.h b/e2fsck/problem.h
index 72cfc4d..89146ec 100644
--- a/e2fsck/problem.h
+++ b/e2fsck/problem.h
@@ -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
  */
diff --git a/tests/f_nospc_create_lnf/expect.1 b/tests/f_nospc_create_lnf/expect.1
index fc20628..986fe12 100644
--- a/tests/f_nospc_create_lnf/expect.1
+++ b/tests/f_nospc_create_lnf/expect.1
@@ -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
diff --git a/tests/f_nospc_create_lnf/expect.2 b/tests/f_nospc_create_lnf/expect.2
index 5a44649..e9757f8 100644
--- a/tests/f_nospc_create_lnf/expect.2
+++ b/tests/f_nospc_create_lnf/expect.2
@@ -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