Many files:

  dirinfo.c, e2fsck.h, emptydir.c, iscan.c, jfs_user.h, journal.c,
  	message.c, pass1.c, pass1b.c, pass2.c, pass3.c, pass4.c, pass5.c,
  	problem.h, scantest.c, super.c, swapfs.c: Change ino_t to ext2_ino_t.

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 4b230c7cd5448ac1202cb3d46d025f13577fcae7..9fe5d3efcc4e5c602251783b5e5d9ba4f0bae5e5 100644 (file)
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-11    <tytso@snap.thunk.org>
+
+       * dirinfo.c, e2fsck.h, emptydir.c, iscan.c, jfs_user.h, journal.c,
+               message.c, pass1.c, pass1b.c, pass2.c, pass3.c, pass4.c,
+               pass5.c, problem.h, scantest.c, super.c, swapfs.c: Change
+               ino_t to ext2_ino_t.
+
 2001-01-09    <tytso@snap.thunk.org>
 
        * problem.c: Fix another broken @F vs @f problem.

diff --git a/e2fsck/dirinfo.c b/e2fsck/dirinfo.c
index fe8155fb6680267adb618b2af5a6c534a8992fbb..b3289c434315ce1f938b0a29a5c8c660ad6db580 100644 (file)
--- a/e2fsck/dirinfo.c
+++ b/e2fsck/dirinfo.c
@@ -12,11 +12,11 @@
  * entry.  During pass1, the passed-in parent is 0; it will get filled
  * in during pass2.  
  */
-void e2fsck_add_dir_info(e2fsck_t ctx, ino_t ino, ino_t parent)
+void e2fsck_add_dir_info(e2fsck_t ctx, ext2_ino_t ino, ext2_ino_t parent)
 {
        struct dir_info *dir;
        int             i, j;
-       ino_t           num_dirs;
+       ext2_ino_t      num_dirs;
        errcode_t       retval;
        unsigned long   old_size;
 
@@ -77,7 +77,7 @@ void e2fsck_add_dir_info(e2fsck_t ctx, ino_t ino, ino_t parent)
  * get_dir_info() --- given an inode number, try to find the directory
  * information entry for it.
  */
-struct dir_info *e2fsck_get_dir_info(e2fsck_t ctx, ino_t ino)
+struct dir_info *e2fsck_get_dir_info(e2fsck_t ctx, ext2_ino_t ino)
 {
        int     low, high, mid;
 

diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h
index 31c0a03d148810164d05748415a74235f2d233af..5ffcd590a6a03e072858286948bccfb2bb46a5f9 100644 (file)
--- a/e2fsck/e2fsck.h
+++ b/e2fsck/e2fsck.h
@@ -80,9 +80,9 @@
  * directory information.
  */
 struct dir_info {
-       ino_t                   ino;    /* Inode number */
-       ino_t                   dotdot; /* Parent according to '..' */
-       ino_t                   parent; /* Parent according to treewalk */
+       ext2_ino_t              ino;    /* Inode number */
+       ext2_ino_t              dotdot; /* Parent according to '..' */
+       ext2_ino_t              parent; /* Parent according to treewalk */
 };
 
 #ifdef RESOURCE_TRACK
@@ -190,7 +190,7 @@ struct e2fsck_struct {
        /*
         * For pass1_check_directory and pass1_get_blocks
         */
-       ino_t stashed_ino;
+       ext2_ino_t stashed_ino;
        struct ext2_inode *stashed_inode;
 
        /*
@@ -271,8 +271,8 @@ extern void read_bad_blocks_file(e2fsck_t ctx, const char *bad_blocks_file,
 extern void test_disk(e2fsck_t ctx);
 
 /* dirinfo.c */
-extern void e2fsck_add_dir_info(e2fsck_t ctx, ino_t ino, ino_t parent);
-extern struct dir_info *e2fsck_get_dir_info(e2fsck_t ctx, ino_t ino);
+extern void e2fsck_add_dir_info(e2fsck_t ctx, ext2_ino_t ino, ext2_ino_t parent);
+extern struct dir_info *e2fsck_get_dir_info(e2fsck_t ctx, ext2_ino_t ino);
 extern void e2fsck_free_dir_info(e2fsck_t ctx);
 extern int e2fsck_get_num_dirs(e2fsck_t ctx);
 extern int e2fsck_get_num_dirinfo(e2fsck_t ctx);
@@ -291,10 +291,10 @@ extern void e2fsck_use_inode_shortcuts(e2fsck_t ctx, int bool);
 extern int e2fsck_pass1_check_device_inode(struct ext2_inode *inode);
 
 /* pass2.c */
-extern int e2fsck_process_bad_inode(e2fsck_t ctx, ino_t dir, ino_t ino);
+extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, ext2_ino_t ino);
 
 /* pass3.c */
-extern int e2fsck_reconnect_file(e2fsck_t ctx, ino_t inode);
+extern int e2fsck_reconnect_file(e2fsck_t ctx, ext2_ino_t inode);
 
 /* super.c */
 void check_super_block(e2fsck_t ctx);

diff --git a/e2fsck/emptydir.c b/e2fsck/emptydir.c
index 04278297474cc0e0e45e8a90b2936622eb5c5583..3ee3413bd17b9224723eb1abf5ac72392d87cb58 100644 (file)
--- a/e2fsck/emptydir.c
+++ b/e2fsck/emptydir.c
@@ -23,7 +23,7 @@ struct empty_dir_info_struct {
        ext2fs_block_bitmap empty_dir_blocks;
        ext2fs_inode_bitmap dir_map;
        char *block_buf;
-       ino_t   ino;
+       ext2_ino_t ino;
        struct ext2_inode inode;
        blk_t   logblk;
        blk_t   freed_blocks;

diff --git a/e2fsck/iscan.c b/e2fsck/iscan.c
index 16fb59115d6ffdbce6dea0684671037ff03c895a..5869d6df993e09a899d4235e8493231576e22b3a 100644 (file)
--- a/e2fsck/iscan.c
+++ b/e2fsck/iscan.c
@@ -104,7 +104,7 @@ int main (int argc, char *argv[])
        errcode_t       retval = 0;
        int             exit_value = FSCK_OK;
        ext2_filsys     fs;
-       ino_t   ino;
+       ext2_ino_t      ino;
        int     num_inodes = 0;
        struct ext2_inode inode;
        ext2_inode_scan scan;

diff --git a/e2fsck/jfs_user.h b/e2fsck/jfs_user.h
index 64d1c3c2f4ba926042f21ab52712593ea8d6d268..a16222e638305d1b981ddefca5939771d00768d7 100644 (file)
--- a/e2fsck/jfs_user.h
+++ b/e2fsck/jfs_user.h
@@ -26,8 +26,8 @@ struct buffer_head {
 };
 
 struct inode {
-       e2fsck_t i_ctx;
-       ino_t    i_ino;
+       e2fsck_t        i_ctx;
+       ext2_ino_t      i_ino;
        struct ext2_inode i_ext2;
 };
 

diff --git a/e2fsck/journal.c b/e2fsck/journal.c
index 960bfb47f18f6392526e7e867d28533bbcf8e06b..d350c0ccef0a61e4c35a3a652282ac1defaed7fe 100644 (file)
--- a/e2fsck/journal.c
+++ b/e2fsck/journal.c
@@ -149,14 +149,15 @@ static void e2fsck_clear_recover(e2fsck_t ctx, int error)
 
 static int e2fsck_journal_init_inode(e2fsck_t ctx,
                                     struct ext2_super_block *s,
-                                    ino_t journal_inum, journal_t **journal)
+                                    ext2_ino_t journal_inum,
+                                    journal_t **journal)
 {
        struct inode *inode;
        struct buffer_head *bh;
        blk_t start;
        int retval;
 
-       jfs_debug(1, "Using journal inode %lu\n", journal_inum);
+       jfs_debug(1, "Using journal inode %u\n", journal_inum);
        *journal = e2fsck_allocate_memory(ctx, sizeof(journal_t), "journal");
        if (!*journal) {
                return EXT2_ET_NO_MEMORY;

diff --git a/e2fsck/message.c b/e2fsck/message.c
index 00956e24819afeb9f775c02e83e8073bf77adf40..0bb666a53eba6a0177d5c1f6c70b36eb74f9c17b 100644 (file)
--- a/e2fsck/message.c
+++ b/e2fsck/message.c
@@ -172,7 +172,7 @@ static void safe_print(const char *cp, int len)
  * This function prints a pathname, using the ext2fs_get_pathname
  * function
  */
-static void print_pathname(ext2_filsys fs, ino_t dir, ino_t ino)
+static void print_pathname(ext2_filsys fs, ext2_ino_t dir, ext2_ino_t ino)
 {
        errcode_t       retval;
        char            *path;
@@ -355,16 +355,16 @@ static _INLINE_ void expand_percent_expression(ext2_filsys fs, char ch,
                printf("%u", ctx->blk2);
                break;
        case 'd':
-               printf("%lu", ctx->dir);
+               printf("%u", ctx->dir);
                break;
        case 'g':
                printf("%d", ctx->group);
                break;
        case 'i':
-               printf("%lu", ctx->ino);
+               printf("%u", ctx->ino);
                break;
        case 'j':
-               printf("%lu", ctx->ino2);
+               printf("%u", ctx->ino2);
                break;
        case 'm':
                printf("%s", error_message(ctx->errcode));

diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index 8fce3f3401f98c1c494875822cbe3856c5c238f1..cb4e583c16705334c7e8b443daf321a9b515a073 100644 (file)
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -71,7 +71,7 @@ static errcode_t scan_callback(ext2_filsys fs, ext2_inode_scan scan,
 /* static char *describe_illegal_block(ext2_filsys fs, blk_t block); */
 
 struct process_block_struct {
-       ino_t           ino;
+       ext2_ino_t      ino;
        int             is_dir:1, clear:1, suppress:1,
                                fragmented:1, compressed:1;
        blk_t           num_blocks;
@@ -84,7 +84,7 @@ struct process_block_struct {
 };
 
 struct process_inode_block {
-       ino_t   ino;
+       ext2_ino_t ino;
        struct ext2_inode inode;
 };
 
@@ -186,7 +186,7 @@ void e2fsck_pass1(e2fsck_t ctx)
        int     i;
        __u64   max_sizes;
        ext2_filsys fs = ctx->fs;
-       ino_t   ino;
+       ext2_ino_t      ino;
        struct ext2_inode inode;
        ext2_inode_scan scan;
        char            *block_buf;
@@ -672,7 +672,7 @@ static void process_inodes(e2fsck_t ctx, char *block_buf)
 {
        int                     i;
        struct ext2_inode       *old_stashed_inode;
-       ino_t                   old_stashed_ino;
+       ext2_ino_t              old_stashed_ino;
        const char              *old_operation;
        char                    buf[80];
        struct problem_context  pctx;
@@ -695,7 +695,7 @@ static void process_inodes(e2fsck_t ctx, char *block_buf)
 #if 0
                printf("%u ", pctx.ino);
 #endif
-               sprintf(buf, _("reading indirect blocks of inode %lu"),
+               sprintf(buf, _("reading indirect blocks of inode %u"),
                        pctx.ino);
                ehandler_operation(buf);
                check_blocks(ctx, &pctx, block_buf);
@@ -824,7 +824,7 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx,
 {
        ext2_filsys fs = ctx->fs;
        struct process_block_struct pb;
-       ino_t           ino = pctx->ino;
+       ext2_ino_t      ino = pctx->ino;
        struct ext2_inode *inode = pctx->inode;
        int             bad_size = 0;
        __u64           size;
@@ -1475,7 +1475,8 @@ static void mark_table_blocks(e2fsck_t ctx)
  * structure, so there's no point in letting the ext2fs library read
  * the inode again.
  */
-static errcode_t pass1_get_blocks(ext2_filsys fs, ino_t ino, blk_t *blocks)
+static errcode_t pass1_get_blocks(ext2_filsys fs, ext2_ino_t ino,
+                                 blk_t *blocks)
 {
        e2fsck_t ctx = (e2fsck_t) fs->priv_data;
        int     i;
@@ -1488,7 +1489,7 @@ static errcode_t pass1_get_blocks(ext2_filsys fs, ino_t ino, blk_t *blocks)
        return 0;
 }
 
-static errcode_t pass1_read_inode(ext2_filsys fs, ino_t ino,
+static errcode_t pass1_read_inode(ext2_filsys fs, ext2_ino_t ino,
                                  struct ext2_inode *inode)
 {
        e2fsck_t ctx = (e2fsck_t) fs->priv_data;
@@ -1499,7 +1500,7 @@ static errcode_t pass1_read_inode(ext2_filsys fs, ino_t ino,
        return 0;
 }
 
-static errcode_t pass1_write_inode(ext2_filsys fs, ino_t ino,
+static errcode_t pass1_write_inode(ext2_filsys fs, ext2_ino_t ino,
                            struct ext2_inode *inode)
 {
        e2fsck_t ctx = (e2fsck_t) fs->priv_data;
@@ -1509,7 +1510,7 @@ static errcode_t pass1_write_inode(ext2_filsys fs, ino_t ino,
        return EXT2_ET_CALLBACK_NOTHANDLED;
 }
 
-static errcode_t pass1_check_directory(ext2_filsys fs, ino_t ino)
+static errcode_t pass1_check_directory(ext2_filsys fs, ext2_ino_t ino)
 {
        e2fsck_t ctx = (e2fsck_t) fs->priv_data;
 

diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c
index 11cad6306c0f9c7762494ce97e74f88e0d3da40c..5aab10905d98c606de2e2b0c7ce8a2f81a780bc8 100644 (file)
--- a/e2fsck/pass1b.c
+++ b/e2fsck/pass1b.c
@@ -65,7 +65,7 @@
  */
 struct dup_block {
        blk_t           block;          /* Block number */
-       ino_t           ino;            /* Inode number */
+       ext2_ino_t      ino;            /* Inode number */
        int             num_bad;
        /* Pointer to next dup record with different block */
        struct dup_block *next_block;
@@ -81,7 +81,7 @@ struct dup_block {
  * of multiply-claimed blocks.
  */
 struct dup_inode {
-       ino_t                   ino, dir;
+       ext2_ino_t              ino, dir;
        int                     num_dupblocks;
        struct ext2_inode       inode;
        struct dup_inode        *next;
@@ -152,16 +152,16 @@ void e2fsck_pass1_dupblocks(e2fsck_t ctx, char *block_buf)
  * Scan the inodes looking for inodes that contain duplicate blocks.
  */
 struct process_block_struct {
-       ino_t   ino;
-       int     dup_blocks;
-       e2fsck_t ctx;
+       ext2_ino_t      ino;
+       int             dup_blocks;
+       e2fsck_t        ctx;
        struct problem_context *pctx;
 };
 
 static void pass1b(e2fsck_t ctx, char *block_buf)
 {
        ext2_filsys fs = ctx->fs;
-       ino_t   ino;
+       ext2_ino_t ino;
        struct ext2_inode inode;
        ext2_inode_scan scan;
        struct process_block_struct pb;
@@ -295,11 +295,11 @@ static int process_pass1b_block(ext2_filsys fs,
  */
 struct search_dir_struct {
        int             count;
-       ino_t           first_inode;
-       ino_t           max_inode;
+       ext2_ino_t      first_inode;
+       ext2_ino_t      max_inode;
 };
 
-static int search_dirent_proc(ino_t dir, int entry,
+static int search_dirent_proc(ext2_ino_t dir, int entry,
                              struct ext2_dir_entry *dirent,
                              int offset, int blocksize,
                              char *buf, void *priv_data)
@@ -372,7 +372,7 @@ static void pass1d(e2fsck_t ctx, char *block_buf)
        ext2_filsys fs = ctx->fs;
        struct dup_inode        *p, *s;
        struct dup_block        *q, *r;
-       ino_t   *shared;
+       ext2_ino_t              *shared;
        int     shared_len;
        int     i;
        int     file_ok;
@@ -386,8 +386,8 @@ static void pass1d(e2fsck_t ctx, char *block_buf)
 
        pctx.num = dup_inode_count;
        fix_problem(ctx, PR_1D_NUM_DUP_INODES, &pctx);
-       shared = (ino_t *) e2fsck_allocate_memory(ctx,
-                               sizeof(ino_t) * dup_inode_count,
+       shared = (ext2_ino_t *) e2fsck_allocate_memory(ctx,
+                               sizeof(ext2_ino_t) * dup_inode_count,
                                "Shared inode list");
        for (p = dup_ino; p; p = p->next) {
                shared_len = 0;
@@ -552,7 +552,7 @@ static void delete_file(e2fsck_t ctx, struct dup_inode *dp, char* block_buf)
 
 struct clone_struct {
        errcode_t       errcode;
-       ino_t           dir;
+       ext2_ino_t      dir;
        char    *buf;
        e2fsck_t ctx;
 };

diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c
index 0aca7ccbb296dbffd8604c29f92a690877fc2961..efb2822627c02d2abefd645c4fbd7906e4c03366 100644 (file)
--- a/e2fsck/pass2.c
+++ b/e2fsck/pass2.c
@@ -53,7 +53,7 @@
 /*
  * Keeps track of how many times an inode is referenced.
  */
-static void deallocate_inode(e2fsck_t ctx, ino_t ino,
+static void deallocate_inode(e2fsck_t ctx, ext2_ino_t ino,
                             char* block_buf);
 static int check_dir_block(ext2_filsys fs,
                           struct ext2_db_entry *dir_blocks_info,
@@ -161,7 +161,7 @@ void e2fsck_pass2(e2fsck_t ctx)
  */
 static int check_dot(e2fsck_t ctx,
                     struct ext2_dir_entry *dirent,
-                    ino_t ino, struct problem_context *pctx)
+                    ext2_ino_t ino, struct problem_context *pctx)
 {
        struct ext2_dir_entry *nextdir;
        int     status = 0;
@@ -261,7 +261,7 @@ static int check_dotdot(e2fsck_t ctx,
  */
 static int check_name(e2fsck_t ctx,
                      struct ext2_dir_entry *dirent,
-                     ino_t dir_ino, struct problem_context *pctx)
+                     ext2_ino_t dir_ino, struct problem_context *pctx)
 {
        int     i;
        int     fixup = -1;
@@ -286,7 +286,7 @@ static int check_name(e2fsck_t ctx,
  */
 static _INLINE_ int check_filetype(e2fsck_t ctx,
                      struct ext2_dir_entry *dirent,
-                     ino_t dir_ino, struct problem_context *pctx)
+                     ext2_ino_t dir_ino, struct problem_context *pctx)
 {
        int     filetype = dirent->name_len >> 8;
        int     should_be = EXT2_FT_UNKNOWN;
@@ -338,7 +338,7 @@ static int check_dir_block(ext2_filsys fs,
        int                     dir_modified = 0;
        int                     dot_state;
        blk_t                   block_nr = db->blk;
-       ino_t                   ino = db->ino;
+       ext2_ino_t              ino = db->ino;
        __u16                   links;
        struct check_dir_struct *cd;
        char                    *buf;
@@ -619,7 +619,7 @@ static int deallocate_inode_block(ext2_filsys fs,
 /*
  * This fuction deallocates an inode
  */
-static void deallocate_inode(e2fsck_t ctx, ino_t ino,
+static void deallocate_inode(e2fsck_t ctx, ext2_ino_t ino,
                             char* block_buf)
 {
        ext2_filsys fs = ctx->fs;
@@ -658,7 +658,8 @@ static void deallocate_inode(e2fsck_t ctx, ino_t ino,
        }
 }
 
-extern int e2fsck_process_bad_inode(e2fsck_t ctx, ino_t dir, ino_t ino)
+extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir,
+                                   ext2_ino_t ino)
 {
        ext2_filsys fs = ctx->fs;
        struct ext2_inode       inode;

diff --git a/e2fsck/pass3.c b/e2fsck/pass3.c
index 32005a910f2ae5cb3416a23e7258cfe15e90c723..bebd67f278cd419d68336bcd79edff50f3b5ea8b 100644 (file)
--- a/e2fsck/pass3.c
+++ b/e2fsck/pass3.c
@@ -44,12 +44,12 @@
 static void check_root(e2fsck_t ctx);
 static int check_directory(e2fsck_t ctx, struct dir_info *dir,
                           struct problem_context *pctx);
-static ino_t get_lost_and_found(e2fsck_t ctx);
-static void fix_dotdot(e2fsck_t ctx, struct dir_info *dir, ino_t parent);
-static errcode_t adjust_inode_count(e2fsck_t ctx, ino_t ino, int adj);
-static errcode_t expand_directory(e2fsck_t ctx, ino_t dir);
+static ext2_ino_t get_lost_and_found(e2fsck_t ctx);
+static void fix_dotdot(e2fsck_t ctx, struct dir_info *dir, ext2_ino_t parent);
+static errcode_t adjust_inode_count(e2fsck_t ctx, ext2_ino_t ino, int adj);
+static errcode_t expand_directory(e2fsck_t ctx, ext2_ino_t dir);
 
-static ino_t lost_and_found = 0;
+static ext2_ino_t lost_and_found = 0;
 static int bad_lost_and_found = 0;
 
 static ext2fs_inode_bitmap inode_loop_detect = 0;
@@ -359,10 +359,10 @@ static int check_directory(e2fsck_t ctx, struct dir_info *dir,
  * This routine gets the lost_and_found inode, making it a directory
  * if necessary
  */
-static ino_t get_lost_and_found(e2fsck_t ctx)
+static ext2_ino_t get_lost_and_found(e2fsck_t ctx)
 {
        ext2_filsys fs = ctx->fs;
-       ino_t                   ino;
+       ext2_ino_t                      ino;
        blk_t                   blk;
        errcode_t               retval;
        struct ext2_inode       inode;
@@ -499,7 +499,7 @@ static ino_t get_lost_and_found(e2fsck_t ctx)
 /*
  * This routine will connect a file to lost+found
  */
-int e2fsck_reconnect_file(e2fsck_t ctx, ino_t ino)
+int e2fsck_reconnect_file(e2fsck_t ctx, ext2_ino_t ino)
 {
        ext2_filsys fs = ctx->fs;
        errcode_t       retval;
@@ -521,7 +521,7 @@ int e2fsck_reconnect_file(e2fsck_t ctx, ino_t ino)
                return 1;
        }
        
-       sprintf(name, "#%lu", ino);
+       sprintf(name, "#%u", ino);
        if (ext2fs_read_inode(fs, ino, &inode) == 0)
                file_type = ext2_file_type(inode.i_mode);
        retval = ext2fs_link(fs, lost_and_found, name, ino, file_type);
@@ -549,7 +549,7 @@ int e2fsck_reconnect_file(e2fsck_t ctx, ino_t ino)
 /*
  * Utility routine to adjust the inode counts on an inode.
  */
-static errcode_t adjust_inode_count(e2fsck_t ctx, ino_t ino, int adj)
+static errcode_t adjust_inode_count(e2fsck_t ctx, ext2_ino_t ino, int adj)
 {
        ext2_filsys fs = ctx->fs;
        errcode_t               retval;
@@ -597,7 +597,7 @@ static errcode_t adjust_inode_count(e2fsck_t ctx, ino_t ino, int adj)
  */
 struct fix_dotdot_struct {
        ext2_filsys     fs;
-       ino_t           parent;
+       ext2_ino_t      parent;
        int             done;
        e2fsck_t        ctx;
 };
@@ -635,7 +635,7 @@ static int fix_dotdot_proc(struct ext2_dir_entry *dirent,
        return DIRENT_ABORT | DIRENT_CHANGED;
 }
 
-static void fix_dotdot(e2fsck_t ctx, struct dir_info *dir, ino_t parent)
+static void fix_dotdot(e2fsck_t ctx, struct dir_info *dir, ext2_ino_t parent)
 {
        ext2_filsys fs = ctx->fs;
        errcode_t       retval;
@@ -738,7 +738,7 @@ static int expand_dir_proc(ext2_filsys fs,
                return BLOCK_CHANGED;
 }
 
-static errcode_t expand_directory(e2fsck_t ctx, ino_t dir)
+static errcode_t expand_directory(e2fsck_t ctx, ext2_ino_t dir)
 {
        ext2_filsys fs = ctx->fs;
        errcode_t       retval;

diff --git a/e2fsck/pass4.c b/e2fsck/pass4.c
index 8f70f058ff4250596c6c43cf172b1e5a76a966c0..40bc20be02c2a4148ffabbd718019314e9c6eff7 100644 (file)
--- a/e2fsck/pass4.c
+++ b/e2fsck/pass4.c
@@ -23,7 +23,7 @@
  * This subroutine returns 1 then the caller shouldn't bother with the
  * rest of the pass 4 tests.
  */
-static int disconnect_inode(e2fsck_t ctx, ino_t i)
+static int disconnect_inode(e2fsck_t ctx, ext2_ino_t i)
 {
        ext2_filsys fs = ctx->fs;
        struct ext2_inode       inode;
@@ -79,7 +79,7 @@ static int disconnect_inode(e2fsck_t ctx, ino_t i)
 void e2fsck_pass4(e2fsck_t ctx)
 {
        ext2_filsys fs = ctx->fs;
-       ino_t   i;
+       ext2_ino_t      i;
        struct ext2_inode       inode;
 #ifdef RESOURCE_TRACK
        struct resource_track   rtrack;

diff --git a/e2fsck/pass5.c b/e2fsck/pass5.c
index 790517d0a15649e45e2dcfa12898b6a937a205cc..e5964e669cf2b735bdc2b2daabb99d9f49a62c03 100644 (file)
--- a/e2fsck/pass5.c
+++ b/e2fsck/pass5.c
@@ -223,7 +223,7 @@ redo_counts:
 static void check_inode_bitmaps(e2fsck_t ctx)
 {
        ext2_filsys fs = ctx->fs;
-       ino_t   i;
+       ext2_ino_t      i;
        int     free_inodes = 0;
        int     group_free = 0;
        int     dirs_count = 0;
@@ -392,7 +392,7 @@ do_counts:
 static void check_inode_end(e2fsck_t ctx)
 {
        ext2_filsys fs = ctx->fs;
-       ino_t   end, save_inodes_count, i;
+       ext2_ino_t      end, save_inodes_count, i;
        struct problem_context  pctx;
 
        clear_problem_context(&pctx);

diff --git a/e2fsck/problem.h b/e2fsck/problem.h
index 424f6452e79ac0d38409455c718022c5b9a9f9d2..280b22a32f7d2d190d3c512b1c825947811f411c 100644 (file)
--- a/e2fsck/problem.h
+++ b/e2fsck/problem.h
@@ -13,7 +13,7 @@ typedef __u32 problem_t;
 
 struct problem_context {
        errcode_t       errcode;
-       ino_t ino, ino2, dir;
+       ext2_ino_t ino, ino2, dir;
        struct ext2_inode *inode;
        struct ext2_dir_entry *dirent;
        blk_t   blk, blk2;

diff --git a/e2fsck/scantest.c b/e2fsck/scantest.c
index 47acfff59443d01caec569dc9e12bd6e49ab8998..370947641d31ea59cdbf17081f5ff7493b1029ff 100644 (file)
--- a/e2fsck/scantest.c
+++ b/e2fsck/scantest.c
@@ -93,7 +93,7 @@ int main (int argc, char *argv[])
        int             i;
        ext2_filsys     fs;
        ext2_inode_scan scan;
-       ino_t   ino;
+       ext2_ino_t      ino;
        struct ext2_inode inode;
 
        printf(_("size of inode=%d\n"), sizeof(inode));

diff --git a/e2fsck/super.c b/e2fsck/super.c
index 23a6ddd52bfebf2304ac95072bed21ab6b16a8dd..1cc9f7b97dad6b2f85a0a5334310fbee84e67a75 100644 (file)
--- a/e2fsck/super.c
+++ b/e2fsck/super.c
@@ -164,7 +164,7 @@ static int release_inode_block(ext2_filsys fs,
  * found.  If the inode has a link count, then it is being truncated and
  * not deleted.
  */
-static int release_inode_blocks(e2fsck_t ctx, ino_t ino,
+static int release_inode_blocks(e2fsck_t ctx, ext2_ino_t ino,
                                struct ext2_inode *inode, char* block_buf,
                                struct problem_context *pctx)
 {
@@ -220,7 +220,7 @@ static int release_orphan_inodes(e2fsck_t ctx)
 {
        ext2_filsys fs = ctx->fs;
        int group;
-       ino_t   ino, next_ino;
+       ext2_ino_t      ino, next_ino;
        struct ext2_inode inode;
        struct problem_context pctx;
        char *block_buf;

diff --git a/e2fsck/swapfs.c b/e2fsck/swapfs.c
index b251e9e742dcb27cd087e3ec5254577aa6460c8d..620dacc9d8e27bceb82a31b815c48a0209437dc1 100644 (file)
--- a/e2fsck/swapfs.c
+++ b/e2fsck/swapfs.c
@@ -17,7 +17,7 @@
 #include "e2fsck.h"
 
 struct swap_block_struct {
-       ino_t           ino;
+       ext2_ino_t      ino;
        int             isdir;
        errcode_t       errcode;
        char            *dir_buf;
@@ -75,7 +75,7 @@ static int swap_block(ext2_filsys fs, blk_t *block_nr, int blockcnt,
  * This function is responsible for byte-swapping all of the indirect,
  * block pointers.  It is also responsible for byte-swapping directories.
  */
-static void swap_inode_blocks(e2fsck_t ctx, ino_t ino, char *block_buf,
+static void swap_inode_blocks(e2fsck_t ctx, ext2_ino_t ino, char *block_buf,
                              struct ext2_inode *inode)
 {
        errcode_t                       retval;
@@ -109,7 +109,7 @@ static void swap_inodes(e2fsck_t ctx)
 {
        ext2_filsys fs = ctx->fs;
        int                     i, group;
-       ino_t                   ino = 1;
+       ext2_ino_t              ino = 1;
        char                    *buf, *block_buf;
        errcode_t               retval;
        struct ext2_inode *     inode;