e2fsck: wait fix thread finish before checking

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

diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h
index 8c0a8b9..8fe0f91 100644 (file)
--- a/e2fsck/e2fsck.h
+++ b/e2fsck/e2fsck.h
@@ -211,6 +211,7 @@ struct resource_track {
 #define E2F_FLAG_TIME_INSANE   0x2000 /* Time is insane */
 #define E2F_FLAG_PROBLEMS_FIXED        0x4000 /* At least one problem was fixed */
 #define E2F_FLAG_ALLOC_OK      0x8000 /* Can we allocate blocks? */
+#define E2F_FLAG_DUP_BLOCK     0x20000 /* dup block found during pass1 */
 
 #define E2F_RESET_FLAGS (E2F_FLAG_TIME_INSANE | E2F_FLAG_PROBLEMS_FIXED)
 
@@ -334,6 +335,7 @@ struct e2fsck_struct {
 
        ext2_refcount_t refcount;
        ext2_refcount_t refcount_extra;
+       ext2_refcount_t refcount_orig;
 
        /*
         * Quota blocks and inodes to be charged for each ea block.
@@ -487,6 +489,14 @@ struct e2fsck_struct {
 
        /* Fast commit replay state */
        struct e2fsck_fc_replay_state fc_replay_state;
+#ifdef HAVE_PTHREAD
+       __u32                    fs_num_threads;
+       int                      fs_need_locking;
+       /* serialize fix operation for multiple threads */
+       pthread_rwlock_t         fs_fix_rwlock;
+       /* protect block_found_map, block_dup_map */
+       pthread_rwlock_t         fs_block_map_rwlock;
+#endif
 };
 
 #ifdef HAVE_PTHREAD
@@ -545,6 +555,8 @@ extern int e2fsck_strnlen(const char * s, int count);
 
 extern void e2fsck_pass1(e2fsck_t ctx);
 extern void e2fsck_pass1_dupblocks(e2fsck_t ctx, char *block_buf);
+extern void e2fsck_pass1_check_lock(e2fsck_t ctx);
+extern void e2fsck_pass1_check_unlock(e2fsck_t ctx);
 extern void e2fsck_pass2(e2fsck_t ctx);
 extern void e2fsck_pass3(e2fsck_t ctx);
 extern void e2fsck_pass4(e2fsck_t ctx);
@@ -719,6 +731,7 @@ int check_backup_super_block(e2fsck_t ctx);
 void check_resize_inode(e2fsck_t ctx);
 
 /* util.c */
+#define E2FSCK_MAX_THREADS     (65536)
 extern void *e2fsck_allocate_memory(e2fsck_t ctx, unsigned long size,
                                    const char *description);
 extern int ask(e2fsck_t ctx, const char * string, int def);
@@ -787,6 +800,12 @@ extern errcode_t e2fsck_allocate_subcluster_bitmap(ext2_filsys fs,
                                                   const char *profile_name,
                                                   ext2fs_block_bitmap *ret);
 unsigned long long get_memory_size(void);
+extern void e2fsck_pass1_fix_lock(e2fsck_t ctx);
+extern void e2fsck_pass1_fix_unlock(e2fsck_t ctx);
+extern void e2fsck_pass1_block_map_w_lock(e2fsck_t ctx);
+extern void e2fsck_pass1_block_map_w_unlock(e2fsck_t ctx);
+extern void e2fsck_pass1_block_map_r_lock(e2fsck_t ctx);
+extern void e2fsck_pass1_block_map_r_unlock(e2fsck_t ctx);
 
 /* unix.c */
 extern void e2fsck_clear_progbar(e2fsck_t ctx);