Merge branch 'maint' into next

[thirdparty/e2fsprogs.git] / e2fsck / problem.h

diff --git a/e2fsck/problem.h b/e2fsck/problem.h
index 49a8c3ad61f603359f79f13f49cb9d4da699e9fa..2c79169ef33bbd3d8976ca257e069088dd4b2f94 100644 (file)
--- a/e2fsck/problem.h
+++ b/e2fsck/problem.h
@@ -91,7 +91,7 @@ struct problem_context {
 /* Miscellaneous superblock corruption */
 #define PR_0_MISC_CORRUPT_SUPER                        0x00000B
 
-/* Error determing physical device size of filesystem */
+/* Error determining physical device size of filesystem */
 #define PR_0_GETSIZE_ERROR                     0x00000C
 
 /* Inode count in the superblock incorrect */
@@ -282,6 +282,11 @@ struct problem_context {
 /* Invalid quota inode number */
 #define PR_0_INVALID_QUOTA_INO                 0x00004F
 
+/* Inode count in the superblock incorrect */
+#define PR_0_INODE_COUNT_BIG                   0x000050
+
+/* Meta_bg and resize_inode are not compatible, remove resize_inode*/
+#define PR_0_DISABLE_RESIZE_INODE              0x000051
 
 /*
  * Pass 1 errors
@@ -794,7 +799,7 @@ struct problem_context {
 /* Directory entry has deleted or unused inode */
 #define PR_2_UNUSED_INODE      0x020003
 
-/* Directry entry is link to '.' */
+/* Directory entry is link to '.' */
 #define PR_2_LINK_DOT          0x020004
 
 /* Directory entry points to inode now located in a bad block */
@@ -803,7 +808,7 @@ struct problem_context {
 /* Directory entry contains a link to a directory */
 #define PR_2_LINK_DIR          0x020006
 
-/* Directory entry contains a link to the root directry */
+/* Directory entry contains a link to the root directory */
 #define PR_2_LINK_ROOT         0x020007
 
 /* Directory entry has illegal characters in its name */
@@ -1093,7 +1098,7 @@ struct problem_context {
 #define PR_3_LPF_ENCRYPTED             0x03001B
 
 /*
- * Pass 3a --- rehashing diretories
+ * Pass 3a --- rehashing directories
  */
 /* Pass 3a: Reindexing directories */
 #define PR_3A_PASS_HEADER              0x031000
@@ -1137,6 +1142,9 @@ struct problem_context {
 /* Extended attribute inode ref count wrong */
 #define PR_4_EA_INODE_REF_COUNT                0x040005
 
+/* directory exceeds max links, but no DIR_NLINK feature in superblock */
+#define PR_4_DIR_NLINK_FEATURE         0x040006
+
 /*
  * Pass 5 errors
  */
@@ -1210,7 +1218,7 @@ struct problem_context {
 /* Inode range not used, but marked in bitmap */
 #define PR_5_INODE_RANGE_UNUSED                0x050016
 
-/* Inode rangeused, but not marked used in bitmap */
+/* Inode range used, but not marked used in bitmap */
 #define PR_5_INODE_RANGE_USED          0x050017
 
 /* Block in use but group is marked BLOCK_UNINIT */