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

[tools/e2fsprogs.git] / resize / extent.c

diff --git a/resize/extent.c b/resize/extent.c
index ca2c68c..82f69ca 100644 (file)
--- a/resize/extent.c
+++ b/resize/extent.c
@@ -8,37 +8,38 @@
  * 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.
  * %End-Header%
  */
 
+#include "config.h"
 #include "resize2fs.h"
 
 struct ext2_extent_entry {
-       __u32   old_loc, new_loc;
-       int     size;
+       __u64   old_loc, new_loc;
+       __u64   size;
 };
 
 struct _ext2_extent {
        struct ext2_extent_entry *list;
-       int     cursor;
-       int     size;
-       int     num;
-       int     sorted;
+       __u64   cursor;
+       __u64   size;
+       __u64   num;
+       __u64   sorted;
 };
 
 /*
  * Create an extent table
  */
-errcode_t ext2fs_create_extent_table(ext2_extent *ret_extent, int size) 
+errcode_t ext2fs_create_extent_table(ext2_extent *ret_extent, __u64 size)
 {
        ext2_extent     extent;
        errcode_t       retval;
-       
+
        retval = ext2fs_get_mem(sizeof(struct _ext2_extent), &extent);
        if (retval)
                return retval;
@@ -49,14 +50,12 @@ errcode_t ext2fs_create_extent_table(ext2_extent *ret_extent, int size)
        extent->num = 0;
        extent->sorted = 1;
 
-       retval = ext2fs_get_array(sizeof(struct ext2_extent_entry),
+       retval = ext2fs_get_arrayzero(sizeof(struct ext2_extent_entry),
                                extent->size, &extent->list);
        if (retval) {
                ext2fs_free_mem(&extent);
                return retval;
        }
-       memset(extent->list, 0,
-              sizeof(struct ext2_extent_entry) * extent->size);
        *ret_extent = extent;
        return 0;
 }
@@ -77,18 +76,18 @@ void ext2fs_free_extent_table(ext2_extent extent)
 /*
  * Add an entry to the extent table
  */
-errcode_t ext2fs_add_extent_entry(ext2_extent extent, __u32 old_loc, __u32 new_loc)
+errcode_t ext2fs_add_extent_entry(ext2_extent extent, __u64 old_loc, __u64 new_loc)
 {
        struct  ext2_extent_entry       *ent;
        errcode_t                       retval;
-       int                             newsize;
-       int                             curr;
+       __u64                           newsize;
+       __u64                           curr;
 
        if (extent->num >= extent->size) {
                newsize = extent->size + 100;
-               retval = ext2fs_resize_mem(sizeof(struct ext2_extent_entry) * 
-                                          extent->size, 
-                                          sizeof(struct ext2_extent_entry) * 
+               retval = ext2fs_resize_mem(sizeof(struct ext2_extent_entry) *
+                                          extent->size,
+                                          sizeof(struct ext2_extent_entry) *
                                           newsize, &extent->list);
                if (retval)
                        return retval;
@@ -128,21 +127,21 @@ static EXT2_QSORT_TYPE extent_cmp(const void *a, const void *b)
 {
        const struct ext2_extent_entry *db_a;
        const struct ext2_extent_entry *db_b;
-       
+
        db_a = (const struct ext2_extent_entry *) a;
        db_b = (const struct ext2_extent_entry *) b;
-       
+
        return (db_a->old_loc - db_b->old_loc);
-}      
+}
 
 /*
  * Given an inode map and inode number, look up the old inode number
  * and return the new inode number.
  */
-__u32 ext2fs_extent_translate(ext2_extent extent, __u32 old_loc)
+__u64 ext2fs_extent_translate(ext2_extent extent, __u64 old_loc)
 {
-       int     low, high, mid;
-       __u32   lowval, highval;
+       __s64   low, high, mid;
+       __u64   lowval, highval;
        float   range;
 
        if (!extent->sorted) {
@@ -167,10 +166,15 @@ __u32 ext2fs_extent_translate(ext2_extent extent, __u32 old_loc)
                                range = 0;
                        else if (old_loc > highval)
                                range = 1;
-                       else 
+                       else {
                                range = ((float) (old_loc - lowval)) /
                                        (highval - lowval);
-                       mid = low + ((int) (range * (high-low)));
+                               if (range > 0.9)
+                                       range = 0.9;
+                               if (range < 0.1)
+                                       range = 0.1;
+                       }
+                       mid = low + ((__u64) (range * (high-low)));
                }
 #endif
                if ((old_loc >= extent->list[mid].old_loc) &&
@@ -190,26 +194,31 @@ __u32 ext2fs_extent_translate(ext2_extent extent, __u32 old_loc)
  */
 void ext2fs_extent_dump(ext2_extent extent, FILE *out)
 {
-       int     i;
+       __u64   i;
        struct ext2_extent_entry *ent;
-       
+
        fputs(_("# Extent dump:\n"), out);
-       fprintf(out, _("#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"),
-              extent->num, extent->size, extent->cursor, extent->sorted);
+       fprintf(out, _("#\tNum=%llu, Size=%llu, Cursor=%llu, Sorted=%llu\n"),
+              (unsigned long long) extent->num,
+               (unsigned long long) extent->size,
+               (unsigned long long) extent->cursor,
+               (unsigned long long) extent->sorted);
        for (i=0, ent=extent->list; i < extent->num; i++, ent++) {
-               fprintf(out, _("#\t\t %u -> %u (%d)\n"), ent->old_loc,
-                       ent->new_loc, ent->size);
+               fprintf(out, "#\t\t %llu -> %llu (%llu)\n",
+                       (unsigned long long) ent->old_loc,
+                       (unsigned long long) ent->new_loc,
+                       (unsigned long long) ent->size);
        }
 }
 
 /*
  * Iterate over the contents of the extent table
  */
-errcode_t ext2fs_iterate_extent(ext2_extent extent, __u32 *old_loc,
-                               __u32 *new_loc, int *size)
+errcode_t ext2fs_iterate_extent(ext2_extent extent, __u64 *old_loc,
+                               __u64 *new_loc, __u64 *size)
 {
        struct ext2_extent_entry *ent;
-       
+
        if (!old_loc) {
                extent->cursor = 0;
                return 0;
@@ -229,7 +238,7 @@ errcode_t ext2fs_iterate_extent(ext2_extent extent, __u32 *old_loc,
        *size = ent->size;
        return 0;
 }
-       
-       
-               
-              
+
+
+
+