X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=e2fsck%2Fproblem.h;h=24e7ed708548ad9cbc69ae7ac7b047fd0a08209b;hb=3fc1db6218f885b5f0a50084f4634f7b793d638f;hp=b432e6403cae9a4ca73de12d29d46f8cbb54f7a1;hpb=8394902e04e64ed10ca81e869892c00143ee4931;p=tools%2Fe2fsprogs.git diff --git a/e2fsck/problem.h b/e2fsck/problem.h index b432e64..24e7ed7 100644 --- a/e2fsck/problem.h +++ b/e2fsck/problem.h @@ -13,10 +13,10 @@ typedef __u32 problem_t; struct problem_context { errcode_t errcode; - ino_t ino, ino2, dir; + ext2_ino_t ino, ino2, dir; struct ext2_inode *inode; struct ext2_dir_entry *dirent; - blk_t blk, blk2; + blk64_t blk, blk2; e2_blkcnt_t blkcount; int group; __u64 num; @@ -28,13 +28,16 @@ struct problem_context { * handled as a set. The user answers once for a particular latch * group. */ -#define PR_LATCH_MASK 0x0070 /* Latch mask */ +#define PR_LATCH_MASK 0x0ff0 /* Latch mask */ #define PR_LATCH_BLOCK 0x0010 /* Latch for illegal blocks (pass 1) */ #define PR_LATCH_BBLOCK 0x0020 /* Latch for bad block inode blocks (pass 1) */ #define PR_LATCH_IBITMAP 0x0030 /* Latch for pass 5 inode bitmap proc. */ #define PR_LATCH_BBITMAP 0x0040 /* Latch for pass 5 inode bitmap proc. */ #define PR_LATCH_RELOC 0x0050 /* Latch for superblock relocate hint */ #define PR_LATCH_DBLOCK 0x0060 /* Latch for pass 1b dup block headers */ +#define PR_LATCH_LOW_DTIME 0x0070 /* Latch for pass1 orphaned list refugees */ +#define PR_LATCH_TOOBIG 0x0080 /* Latch for file to big errors */ +#define PR_LATCH_OPTIMIZE_DIR 0x0090 /* Latch for optimize directories */ #define PR_LATCH(x) ((((x) & PR_LATCH_MASK) >> 4) - 1) @@ -79,12 +82,12 @@ struct problem_context { /* Adding UUID to filesystem */ #define PR_0_ADD_UUID 0x000009 -/* Relocate hint */ +/* Relocate hint */ #define PR_0_RELOCATE_HINT 0x00000A /* Miscellaneous superblock corruption */ #define PR_0_MISC_CORRUPT_SUPER 0x00000B - + /* Error determing physical device size of filesystem */ #define PR_0_GETSIZE_ERROR 0x00000C @@ -97,14 +100,14 @@ struct problem_context { /* Journal inode is invalid */ #define PR_0_JOURNAL_BAD_INODE 0x00000F -/* Superblock has a journal device (which we can't handle yet) */ -#define PR_0_JOURNAL_UNSUPP_DEV 0x000010 +/* The external journal has multiple filesystems (which we can't handle yet) */ +#define PR_0_JOURNAL_UNSUPP_MULTIFS 0x000010 -/* Superblock has a bad journal device */ -#define PR_0_JOURNAL_BAD_DEV 0x000011 +/* Can't find external journal */ +#define PR_0_CANT_FIND_JOURNAL 0x000011 -/* Superblock has a journal UUID (which we can't handle yet) */ -#define PR_0_JOURNAL_UNSUPP_UUID 0x000012 +/* External journal has bad superblock */ +#define PR_0_EXT_JOURNAL_BAD_SUPER 0x000012 /* Superblock has a bad journal UUID */ #define PR_0_JOURNAL_BAD_UUID 0x000013 @@ -121,27 +124,96 @@ struct problem_context { /* Superblock has recovery flag set but no journal */ #define PR_0_JOURNAL_RECOVER_SET 0x000017 -/* Warning message about leaving data in the journal */ -#define PR_0_JOURNAL_RESET_JOURNAL 0x000018 +/* Journal has data, but recovery flag is clear */ +#define PR_0_JOURNAL_RECOVERY_CLEAR 0x000018 + +/* Ask if we should clear the journal */ +#define PR_0_JOURNAL_RESET_JOURNAL 0x000019 -/* Superblock recovery flag clear - journal needs to be reset */ -#define PR_0_JOURNAL_RESET_PROMPT 0x000019 +/* Filesystem revision is 0, but feature flags are set */ +#define PR_0_FS_REV_LEVEL 0x00001A /* Clearing orphan inode */ #define PR_0_ORPHAN_CLEAR_INODE 0x000020 - + /* Illegal block found in orphaned inode */ #define PR_0_ORPHAN_ILLEGAL_BLOCK_NUM 0x000021 /* Already cleared block found in orphaned inode */ #define PR_0_ORPHAN_ALREADY_CLEARED_BLOCK 0x000022 - + /* Illegal orphan inode in superblock */ #define PR_0_ORPHAN_ILLEGAL_HEAD_INODE 0x000023 /* Illegal inode in orphaned inode list */ #define PR_0_ORPHAN_ILLEGAL_INODE 0x000024 +/* Journal has unsupported read-only feature - abort */ +#define PR_0_JOURNAL_UNSUPP_ROCOMPAT 0x000025 + +/* Journal has unsupported incompatible feature - abort */ +#define PR_0_JOURNAL_UNSUPP_INCOMPAT 0x000026 + +/* Journal has unsupported version number */ +#define PR_0_JOURNAL_UNSUPP_VERSION 0x000027 + +/* Moving journal to hidden file */ +#define PR_0_MOVE_JOURNAL 0x000028 + +/* Error moving journal */ +#define PR_0_ERR_MOVE_JOURNAL 0x000029 + +/* Clearing V2 journal superblock */ +#define PR_0_CLEAR_V2_JOURNAL 0x00002A + +/* Run journal anyway */ +#define PR_0_JOURNAL_RUN 0x00002B + +/* Run journal anyway by default */ +#define PR_0_JOURNAL_RUN_DEFAULT 0x00002C + +/* Backup journal inode blocks */ +#define PR_0_BACKUP_JNL 0x00002D + +/* Reserved blocks w/o resize_inode */ +#define PR_0_NONZERO_RESERVED_GDT_BLOCKS 0x00002E + +/* Resize_inode not enabled, but resize inode is non-zero */ +#define PR_0_CLEAR_RESIZE_INODE 0x00002F + +/* Resize inode invalid */ +#define PR_0_RESIZE_INODE_INVALID 0x000030 + +/* Last mount time is in the future */ +#define PR_0_FUTURE_SB_LAST_MOUNT 0x000031 + +/* Last write time is in the future */ +#define PR_0_FUTURE_SB_LAST_WRITE 0x000032 + +/* Superblock hint for external journal incorrect */ +#define PR_0_EXTERNAL_JOURNAL_HINT 0x000033 + +/* Superblock hint for external journal incorrect */ +#define PR_0_DIRHASH_HINT 0x000034 + +/* Group descriptor N checksum is invalid */ +#define PR_0_GDT_CSUM 0x000035 + +/* Group descriptor N marked uninitialized without feature set. */ +#define PR_0_GDT_UNINIT 0x000036 + +/* Block bitmap is not initialised and Inode bitmap is */ +#define PR_0_BB_UNINIT_IB_INIT 0x000037 + +/* Group descriptor N has invalid unused inodes count. */ +#define PR_0_GDT_ITABLE_UNUSED 0x000038 + +/* Last group block bitmap is uninitialized. */ +#define PR_0_BB_UNINIT_LAST 0x000039 + +/* Journal transaction found corrupt */ +#define PR_0_JNL_TXN_CORRUPT 0x00003A + /* * Pass 1 errors */ @@ -199,7 +271,7 @@ struct problem_context { /* Too many bad blocks in inode */ #define PR_1_TOO_MANY_BAD_BLOCKS 0x010011 - + /* Illegal block number in bad block inode */ #define PR_1_BB_ILLEGAL_BLOCK_NUM 0x010012 @@ -208,84 +280,81 @@ struct problem_context { /* Duplicate or bad blocks in use! */ #define PR_1_DUP_BLOCKS_PREENSTOP 0x010014 - -/* Bad block used as bad block indirect block */ + +/* Bad block used as bad block indirect block */ #define PR_1_BBINODE_BAD_METABLOCK 0x010015 /* Inconsistency can't be fixed prompt */ #define PR_1_BBINODE_BAD_METABLOCK_PROMPT 0x010016 - + /* Bad primary block */ -#define PR_1_BAD_PRIMARY_BLOCK 0x0100017 - +#define PR_1_BAD_PRIMARY_BLOCK 0x010017 + /* Bad primary block prompt */ -#define PR_1_BAD_PRIMARY_BLOCK_PROMPT 0x0100018 +#define PR_1_BAD_PRIMARY_BLOCK_PROMPT 0x010018 /* Bad primary superblock */ -#define PR_1_BAD_PRIMARY_SUPERBLOCK 0x0100019 +#define PR_1_BAD_PRIMARY_SUPERBLOCK 0x010019 /* Bad primary block group descriptors */ -#define PR_1_BAD_PRIMARY_GROUP_DESCRIPTOR 0x010001A +#define PR_1_BAD_PRIMARY_GROUP_DESCRIPTOR 0x01001A /* Bad superblock in group */ -#define PR_1_BAD_SUPERBLOCK 0x010001B +#define PR_1_BAD_SUPERBLOCK 0x01001B /* Bad block group descriptors in group */ -#define PR_1_BAD_GROUP_DESCRIPTORS 0x010001C +#define PR_1_BAD_GROUP_DESCRIPTORS 0x01001C -/* Block claimed for no reason */ -#define PR_1_PROGERR_CLAIMED_BLOCK 0x010001D +/* Block claimed for no reason */ +#define PR_1_PROGERR_CLAIMED_BLOCK 0x01001D /* Error allocating blocks for relocating metadata */ -#define PR_1_RELOC_BLOCK_ALLOCATE 0x010001E - +#define PR_1_RELOC_BLOCK_ALLOCATE 0x01001E + /* Error allocating block buffer during relocation process */ -#define PR_1_RELOC_MEMORY_ALLOCATE 0x010001F - -/* Relocating metadata group information from X to Y */ -#define PR_1_RELOC_FROM_TO 0x0100020 - +#define PR_1_RELOC_MEMORY_ALLOCATE 0x01001F + +/* Relocating metadata group information from X to Y */ +#define PR_1_RELOC_FROM_TO 0x010020 + /* Relocating metatdata group information to X */ -#define PR_1_RELOC_TO 0x0100021 - +#define PR_1_RELOC_TO 0x010021 + /* Block read error during relocation process */ -#define PR_1_RELOC_READ_ERR 0x0100022 - +#define PR_1_RELOC_READ_ERR 0x010022 + /* Block write error during relocation process */ -#define PR_1_RELOC_WRITE_ERR 0x0100023 +#define PR_1_RELOC_WRITE_ERR 0x010023 /* Error allocating inode bitmap */ -#define PR_1_ALLOCATE_IBITMAP_ERROR 0x0100024 +#define PR_1_ALLOCATE_IBITMAP_ERROR 0x010024 /* Error allocating block bitmap */ -#define PR_1_ALLOCATE_BBITMAP_ERROR 0x0100025 +#define PR_1_ALLOCATE_BBITMAP_ERROR 0x010025 /* Error allocating icount structure */ -#define PR_1_ALLOCATE_ICOUNT 0x0100026 - +#define PR_1_ALLOCATE_ICOUNT 0x010026 + /* Error allocating dbcount */ -#define PR_1_ALLOCATE_DBCOUNT 0x0100027 +#define PR_1_ALLOCATE_DBCOUNT 0x010027 /* Error while scanning inodes */ -#define PR_1_ISCAN_ERROR 0x0100028 +#define PR_1_ISCAN_ERROR 0x010028 /* Error while iterating over blocks */ -#define PR_1_BLOCK_ITERATE 0x0100029 +#define PR_1_BLOCK_ITERATE 0x010029 -/* Error while storing inode count information */ -#define PR_1_ICOUNT_STORE 0x010002A +/* Error while storing inode count information */ +#define PR_1_ICOUNT_STORE 0x01002A -/* Error while storing directory block information */ -#define PR_1_ADD_DBLOCK 0x010002B +/* Error while storing directory block information */ +#define PR_1_ADD_DBLOCK 0x01002B /* Error while reading inode (for clearing) */ -#define PR_1_READ_INODE 0x010002C +#define PR_1_READ_INODE 0x01002C /* Suppress messages prompt */ -#define PR_1_SUPPRESS_MESSAGES 0x010002D - -/* Filesystem contains large files, but has no such flag in sb */ -#define PR_1_FEATURE_LARGE_FILES 0x01002E +#define PR_1_SUPPRESS_MESSAGES 0x01002D /* Imagic flag set on an inode when filesystem doesn't support it */ #define PR_1_SET_IMAGIC 0x01002F @@ -299,6 +368,138 @@ struct problem_context { /* Non-zero size on on device, fifo or socket inode */ #define PR_1_SET_NONZSIZE 0x010032 +/* Filesystem revision is 0, but feature flags are set */ +#define PR_1_FS_REV_LEVEL 0x010033 + +/* Journal inode not in use, needs clearing */ +#define PR_1_JOURNAL_INODE_NOT_CLEAR 0x010034 + +/* Journal inode has wrong mode */ +#define PR_1_JOURNAL_BAD_MODE 0x010035 + +/* Inode that was part of orphan linked list */ +#define PR_1_LOW_DTIME 0x010036 + +/* Latch question which asks how to deal with low dtime inodes */ +#define PR_1_ORPHAN_LIST_REFUGEES 0x010037 + +/* Error allocating refcount structure */ +#define PR_1_ALLOCATE_REFCOUNT 0x010038 + +/* Error reading Extended Attribute block */ +#define PR_1_READ_EA_BLOCK 0x010039 + +/* Invalid Extended Attribute block */ +#define PR_1_BAD_EA_BLOCK 0x01003A + +/* Error reading Extended Attribute block while fixing refcount -- abort */ +#define PR_1_EXTATTR_READ_ABORT 0x01003B + +/* Extended attribute reference count incorrect */ +#define PR_1_EXTATTR_REFCOUNT 0x01003C + +/* Error writing Extended Attribute block while fixing refcount */ +#define PR_1_EXTATTR_WRITE 0x01003D + +/* Multiple EA blocks not supported */ +#define PR_1_EA_MULTI_BLOCK 0x01003E + +/* Error allocating EA region allocation structure */ +#define PR_1_EA_ALLOC_REGION 0x01003F + +/* Error EA allocation collision */ +#define PR_1_EA_ALLOC_COLLISION 0x010040 + +/* Bad extended attribute name */ +#define PR_1_EA_BAD_NAME 0x010041 + +/* Bad extended attribute value */ +#define PR_1_EA_BAD_VALUE 0x010042 + +/* Inode too big (latch question) */ +#define PR_1_INODE_TOOBIG 0x010043 + +/* Directory too big */ +#define PR_1_TOOBIG_DIR 0x010044 + +/* Regular file too big */ +#define PR_1_TOOBIG_REG 0x010045 + +/* Symlink too big */ +#define PR_1_TOOBIG_SYMLINK 0x010046 + +/* INDEX_FL flag set on a non-HTREE filesystem */ +#define PR_1_HTREE_SET 0x010047 + +/* INDEX_FL flag set on a non-directory */ +#define PR_1_HTREE_NODIR 0x010048 + +/* Invalid root node in HTREE directory */ +#define PR_1_HTREE_BADROOT 0x010049 + +/* Unsupported hash version in HTREE directory */ +#define PR_1_HTREE_HASHV 0x01004A + +/* Incompatible flag in HTREE root node */ +#define PR_1_HTREE_INCOMPAT 0x01004B + +/* HTREE too deep */ +#define PR_1_HTREE_DEPTH 0x01004C + +/* Bad block has indirect block that conflicts with filesystem block */ +#define PR_1_BB_FS_BLOCK 0x01004D + +/* Resize inode failed */ +#define PR_1_RESIZE_INODE_CREATE 0x01004E + +/* inode->i_size is too long */ +#define PR_1_EXTRA_ISIZE 0x01004F + +/* attribute name is too long */ +#define PR_1_ATTR_NAME_LEN 0x010050 + +/* wrong EA value offset */ +#define PR_1_ATTR_VALUE_OFFSET 0x010051 + +/* wrong EA blocknumber */ +#define PR_1_ATTR_VALUE_BLOCK 0x010052 + +/* wrong EA value size */ +#define PR_1_ATTR_VALUE_SIZE 0x010053 + +/* wrong EA hash value */ +#define PR_1_ATTR_HASH 0x010054 + +/* inode appears to be a directory */ +#define PR_1_TREAT_AS_DIRECTORY 0x010055 + +/* Error while reading extent tree */ +#define PR_1_READ_EXTENT 0x010056 + +/* Error deleting a bogus extent */ +#define PR_1_EXTENT_DELETE_FAIL 0x010057 + +/* Bad starting block in extent */ +#define PR_1_EXTENT_BAD_START_BLK 0x010058 + +/* Extent ends beyond filesystem */ +#define PR_1_EXTENT_ENDS_BEYOND 0x010059 + +/* EXTENTS_FL flag set on a non-extents capable filesystem */ +#define PR_1_EXTENTS_SET 0x01005A + +/* inode has extents, superblock missing INCOMPAT_EXTENTS feature */ +#define PR_1_EXTENT_FEATURE 0x01005B + +/* inode missing EXTENTS_FL, but is an extent inode */ +#define PR_1_UNSET_EXTENT_FL 0x01005C + +/* Fast symlink has EXTENTS_FL set */ +#define PR_1_FAST_SYMLINK_EXTENT_FL 0x01005D + +/* Extents are out of order */ +#define PR_1_OUT_OF_ORDER_EXTENTS 0x01005E + /* * Pass 1b errors */ @@ -314,13 +515,19 @@ struct problem_context { /* Duplicate/bad block(s) end */ #define PR_1B_DUP_BLOCK_END 0x011003 - + /* Error while scanning inodes */ #define PR_1B_ISCAN_ERROR 0x011004 /* Error allocating inode bitmap */ #define PR_1B_ALLOCATE_IBITMAP_ERROR 0x011005 +/* Error while iterating over blocks */ +#define PR_1B_BLOCK_ITERATE 0x0110006 + +/* Error adjusting EA refcount */ +#define PR_1B_ADJ_EA_REFCOUNT 0x0110007 + /* Pass 1C: Scan directories for inodes with dup blocks. */ #define PR_1C_PASS_HEADER 0x012000 @@ -332,13 +539,13 @@ struct problem_context { /* File has duplicate blocks */ #define PR_1D_DUP_FILE 0x013001 -/* List of files sharing duplicate blocks */ +/* List of files sharing duplicate blocks */ #define PR_1D_DUP_FILE_LIST 0x013002 -/* File sharing blocks with filesystem metadata */ +/* File sharing blocks with filesystem metadata */ #define PR_1D_SHARE_METADATA 0x013003 -/* Report of how many duplicate/bad inodes */ +/* Report of how many duplicate/bad inodes */ #define PR_1D_NUM_DUP_INODES 0x013004 /* Duplicated blocks already reassigned or cloned. */ @@ -352,7 +559,7 @@ struct problem_context { /* Couldn't clone file (error) */ #define PR_1D_CLONE_ERROR 0x013008 - + /* * Pass 2 errors */ @@ -384,10 +591,10 @@ struct problem_context { /* Directory entry has illegal characters in its name */ #define PR_2_BAD_NAME 0x020008 -/* Missing '.' in directory inode */ +/* Missing '.' in directory inode */ #define PR_2_MISSING_DOT 0x020009 -/* Missing '..' in directory inode */ +/* Missing '..' in directory inode */ #define PR_2_MISSING_DOT_DOT 0x02000A /* First entry in directory inode doesn't contain '.' */ @@ -410,16 +617,16 @@ struct problem_context { /* i_fsize should be zero */ #define PR_2_FSIZE_ZERO 0x020011 - + /* inode has bad mode */ #define PR_2_BAD_MODE 0x020012 /* directory corrupted */ #define PR_2_DIR_CORRUPTED 0x020013 - + /* filename too long */ #define PR_2_FILENAME_LONG 0x020014 - + /* Directory inode has a missing block (hole) */ #define PR_2_DIRECTORY_HOLE 0x020015 @@ -440,7 +647,7 @@ struct problem_context { /* Duplicate '..' entry */ #define PR_2_DUP_DOT_DOT 0x02001B - + /* Internal error: couldn't find dir_info */ #define PR_2_NO_DIRINFO 0x02001C @@ -486,6 +693,75 @@ struct problem_context { /* Directory filename can't be zero-length */ #define PR_2_NULL_NAME 0x020030 +/* Invalid symlink */ +#define PR_2_INVALID_SYMLINK 0x020031 + +/* i_file_acl (extended attribute) is bad */ +#define PR_2_FILE_ACL_BAD 0x020032 + +/* Filesystem contains large files, but has no such flag in sb */ +#define PR_2_FEATURE_LARGE_FILES 0x020033 + +/* Node in HTREE directory not referenced */ +#define PR_2_HTREE_NOTREF 0x020034 + +/* Node in HTREE directory referenced twice */ +#define PR_2_HTREE_DUPREF 0x020035 + +/* Node in HTREE directory has bad min hash */ +#define PR_2_HTREE_MIN_HASH 0x020036 + +/* Node in HTREE directory has bad max hash */ +#define PR_2_HTREE_MAX_HASH 0x020037 + +/* Clear invalid HTREE directory */ +#define PR_2_HTREE_CLEAR 0x020038 + +/* Clear the htree flag forcibly */ +/* #define PR_2_HTREE_FCLR 0x020039 */ + +/* Bad block in htree interior node */ +#define PR_2_HTREE_BADBLK 0x02003A + +/* Error adjusting EA refcount */ +#define PR_2_ADJ_EA_REFCOUNT 0x02003B + +/* Invalid HTREE root node */ +#define PR_2_HTREE_BAD_ROOT 0x02003C + +/* Invalid HTREE limit */ +#define PR_2_HTREE_BAD_LIMIT 0x02003D + +/* Invalid HTREE count */ +#define PR_2_HTREE_BAD_COUNT 0x02003E + +/* HTREE interior node has out-of-order hashes in table */ +#define PR_2_HTREE_HASH_ORDER 0x02003F + +/* Node in HTREE directory has bad depth */ +#define PR_2_HTREE_BAD_DEPTH 0x020040 + +/* Duplicate directory entry found */ +#define PR_2_DUPLICATE_DIRENT 0x020041 + +/* Non-unique filename found */ +#define PR_2_NON_UNIQUE_FILE 0x020042 + +/* Duplicate directory entry found */ +#define PR_2_REPORT_DUP_DIRENT 0x020043 + +/* i_blocks_hi should be zero */ +#define PR_2_BLOCKS_HI_ZERO 0x020044 + +/* Unexpected HTREE block */ +#define PR_2_UNEXPECTED_HTREE_BLOCK 0x020045 + +/* Inode found in group where _INODE_UNINIT is set */ +#define PR_2_INOREF_BG_INO_UNINIT 0x020046 + +/* Inode found in group unused inodes area */ +#define PR_2_INOREF_IN_UNUSED 0x020047 + /* * Pass 3 errors */ @@ -526,9 +802,9 @@ struct problem_context { /* Error in ext2fs_new_inode while creating /lost+found */ #define PR_3_ERR_LPF_NEW_INODE 0x03000B -/* Error in ext2fs_new_dir_block while creating /lost+found */ +/* Error in ext2fs_new_dir_block while creating /lost+found */ #define PR_3_ERR_LPF_NEW_DIR_BLOCK 0x03000C - + /* Error while writing directory block for /lost+found */ #define PR_3_ERR_LPF_WRITE_BLOCK 0x03000D @@ -538,12 +814,12 @@ struct problem_context { /* Couldn't fix parent directory -- error */ #define PR_3_FIX_PARENT_ERR 0x03000F -/* Couldn't fix parent directory -- couldn't find it */ +/* Couldn't fix parent directory -- couldn't find it */ #define PR_3_FIX_PARENT_NOFIND 0x030010 - + /* Error allocating inode bitmap */ #define PR_3_ALLOCATE_IBITMAP_ERROR 0x030011 - + /* Error creating root directory */ #define PR_3_CREATE_ROOT_ERROR 0x030012 @@ -563,6 +839,27 @@ struct problem_context { #define PR_3_LPF_NOTDIR 0x030017 /* + * Pass 3a --- rehashing diretories + */ +/* Pass 3a: Reindexing directories */ +#define PR_3A_PASS_HEADER 0x031000 + +/* Error iterating over directories */ +#define PR_3A_OPTIMIZE_ITER 0x031001 + +/* Error rehash directory */ +#define PR_3A_OPTIMIZE_DIR_ERR 0x031002 + +/* Rehashing dir header */ +#define PR_3A_OPTIMIZE_DIR_HEADER 0x031003 + +/* Rehashing directory %d */ +#define PR_3A_OPTIMIZE_DIR 0x031004 + +/* Rehashing dir end */ +#define PR_3A_OPTIMIZE_DIR_END 0x031005 + +/* * Pass 4 errors */ @@ -587,7 +884,7 @@ struct problem_context { /* Pass 5: Checking group summary information */ #define PR_5_PASS_HEADER 0x050000 - + /* Padding at end of inode bitmap is not set. */ #define PR_5_INODE_BMAP_PADDING 0x050001 @@ -598,24 +895,24 @@ struct problem_context { #define PR_5_BLOCK_BITMAP_HEADER 0x050003 /* Block not used, but marked in bitmap */ -#define PR_5_UNUSED_BLOCK 0x050004 - +#define PR_5_BLOCK_UNUSED 0x050004 + /* Block used, but not marked used in bitmap */ #define PR_5_BLOCK_USED 0x050005 -/* Block bitmap differences end */ +/* Block bitmap differences end */ #define PR_5_BLOCK_BITMAP_END 0x050006 /* Inode bitmap differences header */ #define PR_5_INODE_BITMAP_HEADER 0x050007 /* Inode not used, but marked in bitmap */ -#define PR_5_UNUSED_INODE 0x050008 - +#define PR_5_INODE_UNUSED 0x050008 + /* Inode used, but not marked used in bitmap */ #define PR_5_INODE_USED 0x050009 -/* Inode bitmap differences end */ +/* Inode bitmap differences end */ #define PR_5_INODE_BITMAP_END 0x05000A /* Free inodes count for group wrong */ @@ -645,6 +942,31 @@ struct problem_context { /* Error copying in replacement block bitmap */ #define PR_5_COPY_BBITMAP_ERROR 0x050013 +/* Block range not used, but marked in bitmap */ +#define PR_5_BLOCK_RANGE_UNUSED 0x050014 + +/* Block range used, but not marked used in bitmap */ +#define PR_5_BLOCK_RANGE_USED 0x050015 + +/* Inode range not used, but marked in bitmap */ +#define PR_5_INODE_RANGE_UNUSED 0x050016 + +/* Inode rangeused, but not marked used in bitmap */ +#define PR_5_INODE_RANGE_USED 0x050017 + +/* Block in use but group is marked BLOCK_UNINIT */ +#define PR_5_BLOCK_UNINIT 0x050018 + +/* Inode in use but group is marked INODE_UNINIT */ +#define PR_5_INODE_UNINIT 0x050019 + +/* + * Post-Pass 5 errors + */ + +/* Recreate the journal if E2F_FLAG_JOURNAL_INODE flag is set */ +#define PR_6_RECREATE_JOURNAL 0x060001 + /* * Function declarations */ @@ -656,5 +978,6 @@ void clear_problem_context(struct problem_context *ctx); /* message.c */ void print_e2fsck_message(e2fsck_t ctx, const char *msg, - struct problem_context *pctx, int first); + struct problem_context *pctx, int first, + int recurse);