From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 3 Sep 2019 14:39:23 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.46.0~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc5433647cb79bf1e7660f441c64330b3b8757cc;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next
---

dc5433647cb79bf1e7660f441c64330b3b8757cc
diff --cc e2fsck/problem.c
index 4863ea7ab,5eb5973d7..27c695754
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@@ -1240,12 -1243,16 +1243,22 @@@ static struct e2fsck_problem problem_ta
  	  N_("EA @i %N for parent @i %i missing EA_INODE flag.\n "),
  	  PROMPT_FIX, PR_PREEN_OK, 0, 0, 0 },
  
 +	/* Offer to clear uninitialized flag on an extent */
 +	{ PR_1_CLEAR_UNINIT_EXTENT,
 +	  /* xgettext:no-c-format */
 +	  N_("@i %i has @x marked uninitialized at @b %c (len %N).  "),
 +	  PROMPT_CLEAR, PR_PREEN_OK, 0, 0, 0 },
 +
+ 	/* Casefold flag set on a non-directory */
+ 	{ PR_1_CASEFOLD_NONDIR,
+ 	  N_("@i %i has the casefold flag set but is not a directory.  "),
+ 	  PROMPT_CLEAR_FLAG, 0, 0, 0, 0 },
+ 
+ 	/* Casefold flag set, but file system is missing the casefold feature */
+ 	{ PR_1_CASEFOLD_FEATURE,
+ 	  N_("@d %p has the casefold flag, but the\ncasefold feature is not enabled.  "),
+ 	  PROMPT_CLEAR_FLAG, 0, 0, 0, 0 },
+ 
  	/* Pass 1b errors */
  
  	/* Pass 1B: Rescan for duplicate/bad blocks */