libext2fs: don't hang in ext2fs_new_block2() on a full bigalloc file system

[tools/e2fsprogs.git] / lib / ext2fs / ext2fsP.h

diff --git a/lib/ext2fs/ext2fsP.h b/lib/ext2fs/ext2fsP.h
index 8b1e54e..b182d7f 100644 (file)
--- a/lib/ext2fs/ext2fsP.h
+++ b/lib/ext2fs/ext2fsP.h
@@ -4,8 +4,8 @@
  * Copyright (C) 1997 Theodore Ts'o.
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
  * %End-Header%
  */
 
@@ -35,10 +35,10 @@ struct ext2_struct_u32_iterate {
 struct ext2_struct_dblist {
        int                     magic;
        ext2_filsys             fs;
-       ext2_ino_t              size;
-       ext2_ino_t              count;
+       unsigned long long      size;
+       unsigned long long      count;
        int                     sorted;
-       struct ext2_db_entry *  list;
+       struct ext2_db_entry2 * list;
 };
 
 /*
@@ -79,9 +79,9 @@ struct ext2_inode_cache_ent {
 /* Function prototypes */
 
 extern int ext2fs_process_dir_block(ext2_filsys        fs,
-                                   blk_t               *blocknr,
+                                   blk64_t             *blocknr,
                                    e2_blkcnt_t         blockcnt,
-                                   blk_t               ref_block,
+                                   blk64_t             ref_block,
                                    int                 ref_offset,
                                    void                *priv_data);
 
@@ -138,6 +138,6 @@ extern errcode_t ext2fs_set_generic_bmap_range(ext2fs_generic_bitmap bitmap,
 extern errcode_t ext2fs_get_generic_bmap_range(ext2fs_generic_bitmap bitmap,
                                               __u64 start, unsigned int num,
                                               void *out);
-extern int ext2fs_warn_bitmap32(ext2fs_generic_bitmap bitmap, const char *func);
+extern void ext2fs_warn_bitmap32(ext2fs_generic_bitmap bitmap,const char *func);
 
 extern int ext2fs_mem_is_zero(const char *mem, size_t len);