Merge branch 'maint'

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

diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h
index 5af82d5..9ccffd8 100644 (file)
--- a/e2fsck/e2fsck.h
+++ b/e2fsck/e2fsck.h
@@ -135,6 +135,8 @@ struct resource_track {
        struct timeval user_start;
        struct timeval system_start;
        void    *brk_start;
+       unsigned long long bytes_read;
+       unsigned long long bytes_written;
 };
 #endif
 
@@ -456,9 +458,6 @@ void e2fsck_rehash_directories(e2fsck_t ctx);
 void check_super_block(e2fsck_t ctx);
 int check_backup_super_block(e2fsck_t ctx);
 
-/* swapfs.c */
-void swap_filesys(e2fsck_t ctx);
-
 /* util.c */
 extern void *e2fsck_allocate_memory(e2fsck_t ctx, unsigned int size,
                                    const char *description);
@@ -471,8 +470,10 @@ extern void preenhalt(e2fsck_t ctx);
 extern char *string_copy(e2fsck_t ctx, const char *str, int len);
 #ifdef RESOURCE_TRACK
 extern void print_resource_track(const char *desc,
-                                struct resource_track *track);
-extern void init_resource_track(struct resource_track *track);
+                                struct resource_track *track,
+                                io_channel channel);
+extern void init_resource_track(struct resource_track *track,
+                               io_channel channel);
 #endif
 extern int inode_has_valid_blocks(struct ext2_inode *inode);
 extern void e2fsck_read_inode(e2fsck_t ctx, unsigned long ino,