Merge branch 'maint' into next

[thirdparty/e2fsprogs.git] / resize / resize2fs.h

diff --git a/resize/resize2fs.h b/resize/resize2fs.h
index 21847593673170f6a1cfe813435d9920559e8bbf..829fcd8ea8e164fddebd2fb2d4d2c9fe254df8e0 100644 (file)
--- a/resize/resize2fs.h
+++ b/resize/resize2fs.h
@@ -76,10 +76,29 @@ typedef struct ext2_sim_progress *ext2_sim_progmeter;
 #define RESIZE_DEBUG_BMOVE             0x0002
 #define RESIZE_DEBUG_INODEMAP          0x0004
 #define RESIZE_DEBUG_ITABLEMOVE                0x0008
+#define RESIZE_DEBUG_RTRACK            0x0010
+#define RESIZE_DEBUG_MIN_CALC          0x0020
 
 #define RESIZE_PERCENT_COMPLETE                0x0100
 #define RESIZE_VERBOSE                 0x0200
 
+#define RESIZE_ENABLE_64BIT            0x0400
+#define RESIZE_DISABLE_64BIT           0x0800
+
+/*
+ * This structure is used for keeping track of how much resources have
+ * been used for a particular resize2fs pass.
+ */
+struct resource_track {
+       const char *desc;
+       struct timeval time_start;
+       struct timeval user_start;
+       struct timeval system_start;
+       void    *brk_start;
+       unsigned long long bytes_read;
+       unsigned long long bytes_written;
+};
+
 /*
  * The core state structure for the ext2 resizer
  */
@@ -130,7 +149,7 @@ extern errcode_t resize_fs(ext2_filsys fs, blk64_t *new_size, int flags,
 extern errcode_t adjust_fs_info(ext2_filsys fs, ext2_filsys old_fs,
                                ext2fs_block_bitmap reserve_blocks,
                                blk64_t new_size);
-extern blk64_t calculate_minimum_resize_size(ext2_filsys fs);
+extern blk64_t calculate_minimum_resize_size(ext2_filsys fs, int flags);
 
 
 /* extent.c */
@@ -144,10 +163,20 @@ extern void ext2fs_extent_dump(ext2_extent extent, FILE *out);
 extern errcode_t ext2fs_iterate_extent(ext2_extent extent, __u64 *old_loc,
                                       __u64 *new_loc, __u64 *size);
 
+/* main.c */
+extern char *program_name;
+
 /* online.c */
 extern errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt,
                                  blk64_t *new_size, int flags);
 
+/* resource_track.c */
+extern void init_resource_track(struct resource_track *track, const char *desc,
+                               io_channel channel);
+extern void print_resource_track(ext2_resize_t rfs,
+                                struct resource_track *track,
+                                io_channel channel);
+
 /* sim_progress.c */
 extern errcode_t ext2fs_progress_init(ext2_sim_progmeter *ret_prog,
                                      const char *label,