AOSP: build mke2fs for windows using android mingw library

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

diff --git a/lib/ext2fs/brel.h b/lib/ext2fs/brel.h
index 22089c3..9fdddd4 100644 (file)
--- a/lib/ext2fs/brel.h
+++ b/lib/ext2fs/brel.h
@@ -1,21 +1,21 @@
 /*
  * brel.h
- * 
+ *
  * Copyright (C) 1996, 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%
  */
 
 struct ext2_block_relocate_entry {
-       blk_t   new;
+       blk64_t new;
        __s16   offset;
        __u16   flags;
        union {
-               blk_t   block_ref;
-               ino_t   inode_ref;
+               blk64_t         block_ref;
+               ext2_ino_t      inode_ref;
        } owner;
 };
 
@@ -28,43 +28,43 @@ typedef struct ext2_block_relocation_table *ext2_brel;
 struct ext2_block_relocation_table {
        __u32   magic;
        char    *name;
-       blk_t   current;
-       void    *private;
+       blk64_t current;
+       void    *priv_data;
 
        /*
         * Add a block relocation entry.
         */
-       errcode_t (*put)(ext2_brel brel, blk_t old,
+       errcode_t (*put)(ext2_brel brel, blk64_t old,
                              struct ext2_block_relocate_entry *ent);
 
        /*
         * Get a block relocation entry.
         */
-       errcode_t (*get)(ext2_brel brel, blk_t old,
+       errcode_t (*get)(ext2_brel brel, blk64_t old,
                              struct ext2_block_relocate_entry *ent);
 
        /*
         * Initialize for iterating over the block relocation entries.
         */
        errcode_t (*start_iter)(ext2_brel brel);
-       
+
        /*
         * The iterator function for the inode relocation entries.
         * Returns an inode number of 0 when out of entries.
         */
-       errcode_t (*next)(ext2_brel brel, blk_t *old,
+       errcode_t (*next)(ext2_brel brel, blk64_t *old,
                          struct ext2_block_relocate_entry *ent);
 
        /*
         * Move the inode relocation table from one block number to
         * another.
         */
-       errcode_t (*move)(ext2_brel brel, blk_t old, blk_t new);
+       errcode_t (*move)(ext2_brel brel, blk64_t old, blk_t new);
 
        /*
         * Remove a block relocation entry.
         */
-       errcode_t (*delete)(ext2_brel brel, blk_t old);
+       errcode_t (*delete)(ext2_brel brel, blk64_t old);
 
 
        /*
@@ -73,7 +73,7 @@ struct ext2_block_relocation_table {
        errcode_t (*free)(ext2_brel brel);
 };
 
-errcode_t ext2fs_brel_memarray_create(char *name, blk_t max_block,
+errcode_t ext2fs_brel_memarray_create(char *name, blk64_t max_block,
                                    ext2_brel *brel);
 
 #define ext2fs_brel_put(brel, old, ent) ((brel)->put((brel), old, ent))