e2fsck: mark that we don't care about the return value of e2fsck_lookup()

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

diff --git a/resize/resize2fs.h b/resize/resize2fs.h
index 28d88c1..96a878a 100644 (file)
--- a/resize/resize2fs.h
+++ b/resize/resize2fs.h
@@ -4,8 +4,8 @@
  * Copyright (C) 1997, 1998 by Theodore Ts'o and
  *     PowerQuest, Inc.
  *
- * Copyright (C) 1999, 2000 by Theosore Ts'o
- * 
+ * Copyright (C) 1999, 2000 by Theodore Ts'o
+ *
  * %Begin-Header%
  * This file may be redistributed under the terms of the GNU Public
  * License.
@@ -31,9 +31,11 @@
 #if EXT2_FLAT_INCLUDES
 #include "ext2_fs.h"
 #include "ext2fs.h"
+#include "e2p.h"
 #else
-#include <linux/ext2_fs.h>
+#include "ext2fs/ext2_fs.h"
 #include "ext2fs/ext2fs.h"
+#include "e2p/e2p.h"
 #endif
 
 #ifdef ENABLE_NLS
@@ -45,10 +47,12 @@
 #else
 #define N_(a) (a)
 #endif
-/* FIXME */
+#ifndef NLS_CAT_NAME
 #define NLS_CAT_NAME "e2fsprogs"
+#endif
+#ifndef LOCALEDIR
 #define LOCALEDIR "/usr/share/locale"
-/* FIXME */
+#endif
 #else
 #define _(a) (a)
 #define N_(a) a
@@ -72,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
  */
@@ -88,14 +111,14 @@ struct ext2_resize_struct {
        ext2fs_block_bitmap move_blocks;
        ext2_extent     bmap;
        ext2_extent     imap;
-       int             needed_blocks;
+       blk64_t         needed_blocks;
        int             flags;
        char            *itable_buf;
 
        /*
         * For the block allocator
         */
-       blk_t           new_blk;
+       blk64_t         new_blk;
        int             alloc_state;
 
        /*
@@ -118,21 +141,42 @@ struct ext2_resize_struct {
 
 
 /* prototypes */
-extern errcode_t resize_fs(ext2_filsys fs, blk_t new_size, int flags,
+extern errcode_t resize_fs(ext2_filsys fs, blk64_t *new_size, int flags,
                           errcode_t    (*progress)(ext2_resize_t rfs,
                                            int pass, unsigned long cur,
                                            unsigned long max));
 
+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, int flags);
+extern void adjust_new_size(ext2_filsys fs, blk64_t *sizep);
+
+
 /* extent.c */
 extern errcode_t ext2fs_create_extent_table(ext2_extent *ret_extent,
-                                           int size);
+                                           __u64 size);
 extern void ext2fs_free_extent_table(ext2_extent extent);
 extern errcode_t ext2fs_add_extent_entry(ext2_extent extent,
-                                        __u32 old_loc, __u32 new_loc);
-extern __u32 ext2fs_extent_translate(ext2_extent extent, __u32 old_loc);
+                                        __u64 old_loc, __u64 new_loc);
+extern __u64 ext2fs_extent_translate(ext2_extent extent, __u64 old_loc);
 extern void ext2fs_extent_dump(ext2_extent extent, FILE *out);
-extern errcode_t ext2fs_iterate_extent(ext2_extent extent, __u32 *old_loc,
-                                      __u32 *new_loc, int *size);
+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,