Merge branch 'maint' into next

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

diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h
index 85f953b2e6e2d219d4aad74c1173b04b6e0f0b54..3f2dc3084c40c95fd314d2d50d32b373d31dc42a 100644 (file)
--- a/e2fsck/e2fsck.h
+++ b/e2fsck/e2fsck.h
@@ -68,6 +68,14 @@
 #endif
 
 #include "support/quotaio.h"
+#if __GNUC_PREREQ (4, 6)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+#include "ext2fs/fast_commit.h"
+#if __GNUC_PREREQ (4, 6)
+#pragma GCC diagnostic pop
+#endif
 
 /*
  * Exit codes used by fsck-type programs
@@ -177,6 +185,7 @@ struct resource_track {
 #define E2F_OPT_ICOUNT_FULLMAP 0x20000 /* use an array for inode counts */
 #define E2F_OPT_UNSHARE_BLOCKS  0x40000
 #define E2F_OPT_CLEAR_UNINIT   0x80000 /* Hack to clear the uninit bit */
+#define E2F_OPT_CHECK_ENCODING  0x100000 /* Force verification of encoded filenames */
 
 /*
  * E2fsck flags
@@ -224,7 +233,32 @@ typedef struct ea_refcount *ext2_refcount_t;
  */
 typedef struct e2fsck_struct *e2fsck_t;
 
-#define MAX_EXTENT_DEPTH_COUNT 5
+#define MAX_EXTENT_DEPTH_COUNT 8
+
+/*
+ * This structure is used to manage the list of extents in a file. Placing
+ * it here since this is used by fast_commit.h.
+ */
+struct extent_list {
+       blk64_t blocks_freed;
+       struct ext2fs_extent *extents;
+       unsigned int count;
+       unsigned int size;
+       unsigned int ext_read;
+       errcode_t retval;
+       ext2_ino_t ino;
+};
+
+/* State structure for fast commit replay */
+struct e2fsck_fc_replay_state {
+       struct extent_list fc_extent_list;
+       int fc_replay_num_tags;
+       int fc_replay_expected_off;
+       enum passtype fc_current_pass;
+       int fc_cur_tag;
+       unsigned int fc_crc;
+       __u16 fc_super_state;
+};
 
 struct e2fsck_struct {
        ext2_filsys fs;
@@ -262,6 +296,7 @@ struct e2fsck_struct {
        ext2fs_inode_bitmap inode_bb_map; /* Inodes which are in bad blocks */
        ext2fs_inode_bitmap inode_imagic_map; /* AFS inodes */
        ext2fs_inode_bitmap inode_reg_map; /* Inodes which are regular files*/
+       ext2fs_inode_bitmap inode_casefold_map; /* Inodes which are casefolded */
 
        ext2fs_block_bitmap block_found_map; /* Blocks which are in use */
        ext2fs_block_bitmap block_dup_map; /* Blks referenced more than once */
@@ -387,6 +422,7 @@ struct e2fsck_struct {
        __u32 fs_fragmented;
        __u32 fs_fragmented_dir;
        __u32 large_files;
+       __u32 large_dirs;
        __u32 fs_ext_attr_inodes;
        __u32 fs_ext_attr_blocks;
        __u32 extent_depth_count[MAX_EXTENT_DEPTH_COUNT];
@@ -397,6 +433,7 @@ struct e2fsck_struct {
        int ext_attr_ver;
        profile_t       profile;
        int blocks_per_page;
+       ext2_u32_list casefolded_dirs;
 
        /* Reserve blocks for root and l+f re-creation */
        blk64_t root_repair_block, lnf_repair_block;
@@ -418,6 +455,9 @@ struct e2fsck_struct {
 
        /* Undo file */
        char *undo_file;
+
+       /* Fast commit replay state */
+       struct e2fsck_fc_replay_state fc_replay_state;
 };
 
 /* Data structures to evaluate whether an extent tree needs rebuilding. */
@@ -536,6 +576,9 @@ errcode_t e2fsck_should_rebuild_extents(e2fsck_t ctx,
                                        struct problem_context *pctx,
                                        struct extent_tree_info *eti,
                                        struct ext2_extent_info *info);
+errcode_t e2fsck_read_extents(e2fsck_t ctx, struct extent_list *extents);
+errcode_t e2fsck_rewrite_extent_tree(e2fsck_t ctx,
+                                    struct extent_list *extents);
 
 /* journal.c */
 extern errcode_t e2fsck_check_ext3_journal(e2fsck_t ctx);
@@ -613,6 +656,7 @@ void sigcatcher_setup(void);
 void check_super_block(e2fsck_t ctx);
 int check_backup_super_block(e2fsck_t ctx);
 void check_resize_inode(e2fsck_t ctx);
+int check_init_orphan_file(e2fsck_t ctx);
 
 /* util.c */
 extern void *e2fsck_allocate_memory(e2fsck_t ctx, unsigned long size,