ChangeLog, libext2fs.texinfo:
libext2fs.texinfo: Change ino_t to ext2_ino_t
ChangeLog, extent.c, main.c, resize2fs.c:
extent.c, main.c, resize2fs.c: Change ino_t to ext2_ino_t.
ChangeLog, mke2fs.c:
mke2fs.c: Change ino_t to ext2_ino_t.
ChangeLog, test_icount.c, test_rel.c:
test_icount.c, test_rel.c: Change ino_t to ext2_ino_t
diff --git a/doc/ChangeLog b/doc/ChangeLog
index b5ac4a5..a09f915 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-11 <tytso@snap.thunk.org>
+
+ * libext2fs.texinfo: Change ino_t to ext2_ino_t
+
2000-07-13 <tytso@valinux.com>
* Release of E2fsprogs 1.19
diff --git a/doc/libext2fs.texinfo b/doc/libext2fs.texinfo
index fe84d98..f664019 100644
--- a/doc/libext2fs.texinfo
+++ b/doc/libext2fs.texinfo
@@ -416,11 +416,11 @@
@comment node-name, next, previous, up
@subsection Reading and writing inodes
-@deftypefun errcode_t ext2fs_read_inode (ext2_filsys @var{fs}, ino_t @var{ino}, struct ext2_inode *@var{inode})
+@deftypefun errcode_t ext2fs_read_inode (ext2_filsys @var{fs}, ext2_ino_t @var{ino}, struct ext2_inode *@var{inode})
Read the inode number @var{ino} into @var{inode}.
@end deftypefun
-@deftypefun errcode_t ext2fs_write_inode(ext2_filsys @var{fs}, ino_t @var{ino}, struct ext2_inode *@var{inode})
+@deftypefun errcode_t ext2fs_write_inode(ext2_filsys @var{fs}, ext2_ino_t @var{ino}, struct ext2_inode *@var{inode})
Write @var{inode} to inode @var{ino}.
@end deftypefun
@@ -447,7 +447,7 @@
Release the memory associated with @var{scan} and invalidate it.
@end deftypefun
-@deftypefun errcode_t ext2fs_get_next_inode (ext2_inode_scan @var{scan}, ino_t *@var{ino}, struct ext2_inode *@var{inode})
+@deftypefun errcode_t ext2fs_get_next_inode (ext2_inode_scan @var{scan}, ext2_ino_t *@var{ino}, struct ext2_inode *@var{inode})
This function returns the next inode from the filesystem; the inode
number of the inode is stored in @var{ino}, and the inode is stored in
@@ -491,10 +491,10 @@
@comment node-name, next, previous, up
@subsection Iterating over blocks in an inode
-@deftypefun errcode_t ext2fs_block_iterate (ext2_filsys @var{fs}, ino_t @var{ino}, int @var{flags}, char *block_buf, int (*func)(ext2_filsys @var{fs}, blk_t *@var{blocknr}, int @var{blockcnt}, void *@var{private}), void *@var{private})
+@deftypefun errcode_t ext2fs_block_iterate (ext2_filsys @var{fs}, ext2_ino_t @var{ino}, int @var{flags}, char *block_buf, int (*func)(ext2_filsys @var{fs}, blk_t *@var{blocknr}, int @var{blockcnt}, void *@var{private}), void *@var{private})
@end deftypefun
-@deftypefun errcode_t ext2fs_block_iterate2 (ext2_filsys @var{fs}, ino_t @var{ino}, int @var{flags}, char *@var{block}_buf, int (*func)(ext2_filsys @var{fs}, blk_t *@var{blocknr}, e2_blkcnt_t @var{blockcnt}, blk_t @var{ref_blk}, int @var{ref_offset}, void *@var{private}), void *@var{private})
+@deftypefun errcode_t ext2fs_block_iterate2 (ext2_filsys @var{fs}, ext2_ino_t @var{ino}, int @var{flags}, char *@var{block}_buf, int (*func)(ext2_filsys @var{fs}, blk_t *@var{blocknr}, e2_blkcnt_t @var{blockcnt}, blk_t @var{ref_blk}, int @var{ref_offset}, void *@var{private}), void *@var{private})
@end deftypefun
@c ----------------------------------------------------------------------
@@ -503,14 +503,14 @@
@comment node-name, next, previous, up
@subsection Convenience functions for Inodes
-@deftypefun errcode_t ext2fs_get_blocks (ext2_filsys @var{fs}, ino_t @var{ino}, blk_t *@var{blocks})
+@deftypefun errcode_t ext2fs_get_blocks (ext2_filsys @var{fs}, ext2_ino_t @var{ino}, blk_t *@var{blocks})
Returns an array of blocks corresponding to the direct,
indirect, doubly indirect, and triply indirect blocks as stored in the
inode structure.
@end deftypefun
-@deftypefun errcode_t ext2fs_check_directory (ext2_filsys @var{fs}, ino_t @var{ino})
+@deftypefun errcode_t ext2fs_check_directory (ext2_filsys @var{fs}, ext2_ino_t @var{ino})
Returns 0 if @var{ino} is a directory, and @code{ENOTDIR} if it is not.
@end deftypefun
@@ -548,7 +548,7 @@
@deftypefun errcode_t ext2fs_write_dir_block (ext2_filsys @var{fs}, blk_t @var{block}, void *@var{buf})
@end deftypefun
-@deftypefun errcode_t ext2fs_new_dir_block (ext2_filsys @var{fs}, ino_t @var{dir}_ino, ino_t @var{parent_ino}, char **@var{block})
+@deftypefun errcode_t ext2fs_new_dir_block (ext2_filsys @var{fs}, ext2_ino_t @var{dir}_ino, ext2_ino_t @var{parent_ino}, char **@var{block})
@end deftypefun
@c ----------------------------------------------------------------------
@@ -557,7 +557,7 @@
@comment node-name, next, previous, up
@subsection Iterating over a directory
-@deftypefun errcode_t ext2fs_dir_iterate (ext2_filsys @var{fs}, ino_t @var{dir}, int @var{flags}, char *@var{block_buf}, int (*@var{func})(struct ext2_dir_entry *@var{dirent}, int @var{offset}, int @var{blocksize}, char *@var{buf}, void *@var{private}), void *@var{private})
+@deftypefun errcode_t ext2fs_dir_iterate (ext2_filsys @var{fs}, ext2_ino_t @var{dir}, int @var{flags}, char *@var{block_buf}, int (*@var{func})(struct ext2_dir_entry *@var{dirent}, int @var{offset}, int @var{blocksize}, char *@var{buf}, void *@var{private}), void *@var{private})
@end deftypefun
@c ----------------------------------------------------------------------
@@ -566,10 +566,10 @@
@comment node-name, next, previous, up
@subsection Creating and expanding directories
-@deftypefun errcode_t ext2fs_mkdir (ext2_filsys @var{fs}, ino_t @var{parent}, ino_t @var{inum}, const char *@var{name})
+@deftypefun errcode_t ext2fs_mkdir (ext2_filsys @var{fs}, ext2_ino_t @var{parent}, ext2_ino_t @var{inum}, const char *@var{name})
@end deftypefun
-@deftypefun errcode_t ext2fs_expand_dir (ext2_filsys @var{fs}, ino_t @var{dir})
+@deftypefun errcode_t ext2fs_expand_dir (ext2_filsys @var{fs}, ext2_ino_t @var{dir})
@end deftypefun
@c ----------------------------------------------------------------------
@@ -578,10 +578,10 @@
@comment node-name, next, previous, up
@subsection Creating and removing directory entries
-@deftypefun errcode_t ext2fs_link (ext2_filsys @var{fs}, ino_t @var{dir}, const char *@var{name}, ino_t @var{ino}, int flags)
+@deftypefun errcode_t ext2fs_link (ext2_filsys @var{fs}, ext2_ino_t @var{dir}, const char *@var{name}, ext2_ino_t @var{ino}, int flags)
@end deftypefun
-@deftypefun errcode_t ext2fs_unlink (ext2_filsys @var{fs}, ino_t @var{dir}, const char *@var{name}, ino_t @var{ino}, int @var{flags})
+@deftypefun errcode_t ext2fs_unlink (ext2_filsys @var{fs}, ext2_ino_t @var{dir}, const char *@var{name}, ext2_ino_t @var{ino}, int @var{flags})
@end deftypefun
@c ----------------------------------------------------------------------
@@ -590,16 +590,16 @@
@comment node-name, next, previous, up
@subsection Looking up filenames
-@deftypefun errcode_t ext2fs_lookup (ext2_filsys @var{fs}, ino_t @var{dir}, const char *@var{name}, int @var{namelen}, char *@var{buf}, ino_t *@var{inode})
+@deftypefun errcode_t ext2fs_lookup (ext2_filsys @var{fs}, ext2_ino_t @var{dir}, const char *@var{name}, int @var{namelen}, char *@var{buf}, ext2_ino_t *@var{inode})
@end deftypefun
-@deftypefun errcode_t ext2fs_namei (ext2_filsys @var{fs}, ino_t @var{root}, ino_t @var{cwd}, const char *@var{name}, ino_t *@var{inode})
+@deftypefun errcode_t ext2fs_namei (ext2_filsys @var{fs}, ext2_ino_t @var{root}, ext2_ino_t @var{cwd}, const char *@var{name}, ext2_ino_t *@var{inode})
@end deftypefun
-@deftypefun errcode_t ext2fs_namei_follow (ext2_filsys @var{fs}, ino_t @var{root}, ino_t @var{cwd}, const char *@var{name}, ino_t *@var{inode})
+@deftypefun errcode_t ext2fs_namei_follow (ext2_filsys @var{fs}, ext2_ino_t @var{root}, ext2_ino_t @var{cwd}, const char *@var{name}, ext2_ino_t *@var{inode})
@end deftypefun
-@deftypefun errcode_t ext2fs_follow_link (ext2_filsys @var{fs}, ino_t @var{root}, ino_t @var{cwd}, ino_t @var{inode}, ino_t *@var{res}_inode)
+@deftypefun errcode_t ext2fs_follow_link (ext2_filsys @var{fs}, ext2_ino_t @var{root}, ext2_ino_t @var{cwd}, ext2_ino_t @var{inode}, ext2_ino_t *@var{res}_inode)
@end deftypefun
@c ----------------------------------------------------------------------
@@ -608,7 +608,7 @@
@comment node-name, next, previous, up
@subsection Translating inode numbers to filenames
-@deftypefun errcode_t ext2fs_get_pathname (ext2_filsys @var{fs}, ino_t @var{dir}, ino_t @var{ino}, char **@var{name})
+@deftypefun errcode_t ext2fs_get_pathname (ext2_filsys @var{fs}, ext2_ino_t @var{dir}, ext2_ino_t @var{ino}, char **@var{name})
@end deftypefun
@@ -701,11 +701,11 @@
@end deftypefun
-@deftypefun void ext2fs_mark_inode_bitmap (ext2fs_inode_bitmap @var{bitmap}, ino_t @var{inode})
+@deftypefun void ext2fs_mark_inode_bitmap (ext2fs_inode_bitmap @var{bitmap}, ext2_ino_t @var{inode})
-@deftypefunx void ext2fs_unmark_inode_bitmap (ext2fs_inode_bitmap @var{bitmap}, ino_t @var{inode})
+@deftypefunx void ext2fs_unmark_inode_bitmap (ext2fs_inode_bitmap @var{bitmap}, ext2_ino_t @var{inode})
-@deftypefunx int ext2fs_test_inode_bitmap (ext2fs_inode_bitmap @var{bitmap}, ino_t @var{inode})
+@deftypefunx int ext2fs_test_inode_bitmap (ext2fs_inode_bitmap @var{bitmap}, ext2_ino_t @var{inode})
These functions set, clear, and test bits in an inode bitmap @var{bitmap}.
@end deftypefun
@@ -716,11 +716,11 @@
@deftypefunx int ext2fs_fast_test_block_bitmap (ext2fs_block_bitmap @var{bitmap}, blk_t @var{block})
-@deftypefunx void ext2fs_fast_mark_inode_bitmap (ext2fs_inode_bitmap @var{bitmap}, ino_t @var{inode})
+@deftypefunx void ext2fs_fast_mark_inode_bitmap (ext2fs_inode_bitmap @var{bitmap}, ext2_ino_t @var{inode})
-@deftypefunx void ext2fs_fast_unmark_inode_bitmap (ext2fs_inode_bitmap @var{bitmap}, ino_t @var{inode})
+@deftypefunx void ext2fs_fast_unmark_inode_bitmap (ext2fs_inode_bitmap @var{bitmap}, ext2_ino_t @var{inode})
-@deftypefunx int ext2fs_fast_test_inode_bitmap (ext2fs_inode_bitmap @var{bitmap}, ino_t @var{inode})
+@deftypefunx int ext2fs_fast_test_inode_bitmap (ext2fs_inode_bitmap @var{bitmap}, ext2_ino_t @var{inode})
These ``fast'' functions are like their normal counterparts; however,
they are implemented as inline functions and do not perform bounds
@@ -730,12 +730,12 @@
@end deftypefun
@deftypefun blk_t ext2fs_get_block_bitmap_start (ext2fs_block_bitmap @var{bitmap})
-@deftypefunx ino_t ext2fs_get_inode_bitmap_start (ext2fs_inode_bitmap @var{bitmap})
+@deftypefunx ext2_ino_t ext2fs_get_inode_bitmap_start (ext2fs_inode_bitmap @var{bitmap})
Return the first inode or block which is stored in the bitmap.
@end deftypefun
@deftypefun blk_t ext2fs_get_block_bitmap_end (ext2fs_block_bitmap @var{bitmap})
-@deftypefunx ino_t ext2fs_get_inode_bitmap_end (ext2fs_inode_bitmap @var{bitmap})
+@deftypefunx ext2_ino_t ext2fs_get_inode_bitmap_end (ext2fs_inode_bitmap @var{bitmap})
Return the first inode or block which is stored in the bitmap.
@end deftypefun
@@ -760,7 +760,7 @@
@comment node-name, next, previous, up
@subsection Modifying Bitmaps
-@deftypefun errcode_t ext2fs_fudge_inode_bitmap_end (ext2fs_inode_bitmap @var{bitmap}, ino_t @var{end}, ino_t *@var{oend})
+@deftypefun errcode_t ext2fs_fudge_inode_bitmap_end (ext2fs_inode_bitmap @var{bitmap}, ext2_ino_t @var{end}, ext2_ino_t *@var{oend})
@end deftypefun
@deftypefun errcode_t ext2fs_fudge_block_bitmap_end (ext2fs_block_bitmap @var{bitmap}, blk_t @var{end}, blk_t *@var{oend})
@@ -870,14 +870,14 @@
Free a dblist data structure.
@end deftypefun
-@deftypefun errcode_t ext2fs_add_dir_block (ext2_dblist @var{dblist}, ino_t @var{ino}, blk_t @var{blk}, int @var{blockcnt})
+@deftypefun errcode_t ext2fs_add_dir_block (ext2_dblist @var{dblist}, ext2_ino_t @var{ino}, blk_t @var{blk}, int @var{blockcnt})
Add an entry to the dblist data structure. This call records the fact
that block number @var{blockcnt} of directory inode @var{ino} is stored
in block @var{blk}.
@end deftypefun
-@deftypefun errcode_t ext2fs_set_dir_block (ext2_dblist @var{dblist}, ino_t @var{ino}, blk_t @var{blk}, int @var{blockcnt})
+@deftypefun errcode_t ext2fs_set_dir_block (ext2_dblist @var{dblist}, ext2_ino_t @var{ino}, blk_t @var{blk}, int @var{blockcnt})
Change an entry in the dblist data structure; this changes the location
of block number @var{blockcnt} of directory indoe @var{ino} to be block
@@ -889,7 +889,7 @@
This iterator calls @var{func} for every entry in the dblist data structure.
@end deftypefun
-@deftypefun errcode_t ext2fs_dblist_dir_iterate (ext2_dblist @var{dblist}, int flags, char *@var{block_buf}, int (*func)(ino_t @var{dir}, int @var{entry}, struct ext2_dir_entry *@var{dirent}, int @var{offset}, int @var{blocksize}, char *@var{buf}, void *@var{private}), void *@var{private})
+@deftypefun errcode_t ext2fs_dblist_dir_iterate (ext2_dblist @var{dblist}, int flags, char *@var{block_buf}, int (*func)(ext2_ino_t @var{dir}, int @var{entry}, struct ext2_dir_entry *@var{dirent}, int @var{offset}, int @var{blocksize}, char *@var{buf}, void *@var{private}), void *@var{private})
This iterator takes reads in the directory block indicated in each
dblist entry, and calls @var{func} for each directory entry in each
@@ -937,27 +937,27 @@
Frees an icount structure.
@end deftypefun
-@deftypefun errcode_t ext2fs_icount_fetch(ext2_icount_t @var{icount}, ino_t @var{ino}, __u16 *@var{ret})
+@deftypefun errcode_t ext2fs_icount_fetch(ext2_icount_t @var{icount}, ext2_ino_t @var{ino}, __u16 *@var{ret})
Returns in @var{ret} fetches the count for a particular inode @var{ino}.
@end deftypefun
-@deftypefun errcode_t ext2fs_icount_increment(ext2_icount_t @var{icount}, ino_t @var{ino}, __u16 *@var{ret})
+@deftypefun errcode_t ext2fs_icount_increment(ext2_icount_t @var{icount}, ext2_ino_t @var{ino}, __u16 *@var{ret})
Increments the ref count for inode @var{ino}.
@end deftypefun
-@deftypefun errcode_t ext2fs_icount_decrement(ext2_icount_t @var{icount}, ino_t @var{ino}, __u16 *@var{ret})
+@deftypefun errcode_t ext2fs_icount_decrement(ext2_icount_t @var{icount}, ext2_ino_t @var{ino}, __u16 *@var{ret})
Decrements the ref count for inode @var{ino}.
@end deftypefun
-@deftypefun errcode_t ext2fs_icount_store(ext2_icount_t @var{icount}, ino_t @var{ino}, __u16 @var{count})
+@deftypefun errcode_t ext2fs_icount_store(ext2_icount_t @var{icount}, ext2_ino_t @var{ino}, __u16 @var{count})
Sets the reference count for inode @var{ino} to be @var{count}.
@end deftypefun
-@deftypefun ino_t ext2fs_get_icount_size(ext2_icount_t @var{icount})
+@deftypefun ext2_ino_t ext2fs_get_icount_size(ext2_icount_t @var{icount})
Returns the current number of inodes in @var{icount} which has a count
greater than 1.
@@ -997,7 +997,7 @@
@section Other functions
/* alloc.c */
-@deftypefun errcode_t ext2fs_new_inode (ext2_filsys @var{fs}, ino_t @var{dir}, int @var{mode}, ext2fs_inode_bitmap @var{map}, ino_t *@var{ret})
+@deftypefun errcode_t ext2fs_new_inode (ext2_filsys @var{fs}, ext2_ino_t @var{dir}, int @var{mode}, ext2fs_inode_bitmap @var{map}, ext2_ino_t *@var{ret})
@end deftypefun
@deftypefun errcode_t ext2fs_new_block (ext2_filsys @var{fs}, blk_t @var{goal}, ext2fs_block_bitmap @var{map}, blk_t *@var{ret})
@@ -1010,7 +1010,7 @@
@deftypefun errcode_t ext2fs_check_desc (ext2_filsys @var{fs})
@end deftypefun
-@deftypefun errcode_t ext2_get_num_dirs (ext2_filsys @var{fs}, ino_t *@var{ret_num_dirs})
+@deftypefun errcode_t ext2_get_num_dirs (ext2_filsys @var{fs}, ext2_ino_t *@var{ret_num_dirs})
@end deftypefun
@@ -1051,7 +1051,7 @@
@deftypefun int ext2fs_group_of_blk (ext2_filsys @var{fs}, blk_t @var{blk})
@end deftypefun
-@deftypefun int ext2fs_group_of_ino (ext2_filsys @var{fs}, ino_t @var{ino})
+@deftypefun int ext2fs_group_of_ino (ext2_filsys @var{fs}, ext2_ino_t @var{ino})
@end deftypefun
diff --git a/misc/ChangeLog b/misc/ChangeLog
index f352293..d530659 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-11 <tytso@snap.thunk.org>
+
+ * mke2fs.c: Change ino_t to ext2_ino_t.
+
2001-01-08 <tytso@snap.thunk.org>
* Makefile.in, tune2fs.c: Move e2label functionality into tune2fs,
diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 9e90c53..1ba3aaf 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -403,7 +403,7 @@
static void create_lost_and_found(ext2_filsys fs)
{
errcode_t retval;
- ino_t ino;
+ ext2_ino_t ino;
const char *name = "lost+found";
int i;
int lpf_size = 0;
@@ -452,8 +452,8 @@
static void reserve_inodes(ext2_filsys fs)
{
- ino_t i;
- int group;
+ ext2_ino_t i;
+ int group;
for (i = EXT2_ROOT_INO + 1; i < EXT2_FIRST_INODE(fs->super); i++) {
ext2fs_mark_inode_bitmap(fs->inode_map, i);
@@ -634,7 +634,7 @@
int blocksize = 0;
int inode_ratio = 0;
int reserved_ratio = 5;
- ino_t num_inodes = 0;
+ ext2_ino_t num_inodes = 0;
errcode_t retval;
int sparse_option = 1;
char * oldpath = getenv("PATH");
diff --git a/resize/ChangeLog b/resize/ChangeLog
index c53df05..c209164 100644
--- a/resize/ChangeLog
+++ b/resize/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-11 <tytso@snap.thunk.org>
+
+ * extent.c, main.c, resize2fs.c: Change ino_t to ext2_ino_t.
+
2001-01-01 <tytso@snap.thunk.org>
* main.c (main): Replace use of struct ext2fs_sb with struct
diff --git a/resize/extent.c b/resize/extent.c
index 5f5d614..34846fa 100644
--- a/resize/extent.c
+++ b/resize/extent.c
@@ -143,7 +143,7 @@
__u32 ext2fs_extent_translate(ext2_extent extent, __u32 old_loc)
{
int low, high, mid;
- ino_t lowval, highval;
+ __u32 lowval, highval;
float range;
if (!extent->sorted) {
diff --git a/resize/main.c b/resize/main.c
index 726ae3e..c91ddca 100644
--- a/resize/main.c
+++ b/resize/main.c
@@ -27,7 +27,7 @@
char *program_name, *device_name;
-static volatile void usage (char *prog)
+static void usage (char *prog)
{
fprintf (stderr, _("usage: %s [-d debug_flags] [-f] [-F] [-p] device [new-size]\n\n"), prog);
@@ -184,7 +184,7 @@
}
close(fd);
#else
- fprintf(stderr, _("BLKFLSBUF not supported"));
+ fprintf(stderr, _("BLKFLSBUF not supported\n"));
exit(1);
#endif /* BLKFLSBUF */
}
diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index 1e0e0f3..9f5f170 100644
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -173,7 +173,7 @@
int overhead = 0;
int rem, adj = 0;
errcode_t retval;
- ino_t real_end;
+ ext2_ino_t real_end;
blk_t blk, group_block;
unsigned long i, j;
int old_numblocks, numblocks, adjblocks;
@@ -855,7 +855,7 @@
struct process_block_struct {
ext2_resize_t rfs;
- ino_t ino;
+ ext2_ino_t ino;
struct ext2_inode * inode;
errcode_t error;
int is_dir;
@@ -928,13 +928,13 @@
static errcode_t inode_scan_and_fix(ext2_resize_t rfs)
{
struct process_block_struct pb;
- ino_t ino, new_inode;
+ ext2_ino_t ino, new_inode;
struct ext2_inode inode;
ext2_inode_scan scan = NULL;
errcode_t retval;
int group;
char *block_buf = 0;
- ino_t start_to_move;
+ ext2_ino_t start_to_move;
blk_t orig_size;
if ((rfs->old_fs->group_desc_count <=
@@ -1075,12 +1075,12 @@
int num;
};
-static int check_and_change_inodes(ino_t dir, int entry,
+static int check_and_change_inodes(ext2_ino_t dir, int entry,
struct ext2_dir_entry *dirent, int offset,
int blocksize, char *buf, void *priv_data)
{
struct istruct *is = (struct istruct *) priv_data;
- ino_t new_inode;
+ ext2_ino_t new_inode;
if (is->rfs->progress && offset == 0) {
io_channel_flush(is->rfs->old_fs->io);
@@ -1293,12 +1293,12 @@
*/
static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs)
{
- blk_t blk;
- ino_t ino;
- int group = 0;
- int count = 0;
- int total_free = 0;
- int group_free = 0;
+ blk_t blk;
+ ext2_ino_t ino;
+ int group = 0;
+ int count = 0;
+ int total_free = 0;
+ int group_free = 0;
/*
* First calculate the block statistics
diff --git a/tests/progs/ChangeLog b/tests/progs/ChangeLog
index 0b504ad..92a31f4 100644
--- a/tests/progs/ChangeLog
+++ b/tests/progs/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-11 <tytso@snap.thunk.org>
+
+ * test_icount.c, test_rel.c: Change ino_t to ext2_ino_t
+
2000-12-08 <tytso@snap.thunk.org>
* Makefile.in (srcdir): Fix so that top-level "make check" works
diff --git a/tests/progs/test_icount.c b/tests/progs/test_icount.c
index fc5b0a5..0494ba7 100644
--- a/tests/progs/test_icount.c
+++ b/tests/progs/test_icount.c
@@ -48,7 +48,7 @@
* Helper function which parses an inode number.
*/
static int parse_inode(const char *request, const char *desc,
- const char *str, ino_t *ino)
+ const char *str, ext2_ino_t *ino)
{
char *tmp;
@@ -62,10 +62,10 @@
void do_create_icount(int argc, char **argv)
{
- errcode_t retval;
- char *progname;
- int flags = 0;
- ino_t size = 5;
+ errcode_t retval;
+ char *progname;
+ int flags = 0;
+ ext2_ino_t size = 5;
progname = *argv;
argv++; argc --;
@@ -101,10 +101,10 @@
void do_fetch(int argc, char **argv)
{
- const char *usage = "usage: %s inode";
- errcode_t retval;
- ino_t ino;
- __u16 count;
+ const char *usage = "usage: %s inode";
+ errcode_t retval;
+ ext2_ino_t ino;
+ __u16 count;
if (argc < 2) {
printf(usage, argv[0]);
@@ -124,10 +124,10 @@
void do_increment(int argc, char **argv)
{
- const char *usage = "usage: %s inode";
- errcode_t retval;
- ino_t ino;
- __u16 count;
+ const char *usage = "usage: %s inode";
+ errcode_t retval;
+ ext2_ino_t ino;
+ __u16 count;
if (argc < 2) {
printf(usage, argv[0]);
@@ -148,10 +148,10 @@
void do_decrement(int argc, char **argv)
{
- const char *usage = "usage: %s inode";
- errcode_t retval;
- ino_t ino;
- __u16 count;
+ const char *usage = "usage: %s inode";
+ errcode_t retval;
+ ext2_ino_t ino;
+ __u16 count;
if (argc < 2) {
printf(usage, argv[0]);
@@ -172,10 +172,10 @@
void do_store(int argc, char **argv)
{
- const char *usage = "usage: %s inode count";
- errcode_t retval;
- ino_t ino;
- ino_t count;
+ const char *usage = "usage: %s inode count";
+ errcode_t retval;
+ ext2_ino_t ino;
+ ext2_ino_t count;
if (argc < 3) {
printf(usage, argv[0]);
@@ -202,7 +202,7 @@
void do_dump(int argc, char **argv)
{
errcode_t retval;
- ino_t i;
+ ext2_ino_t i;
__u16 count;
if (check_icount(argv[0]))
@@ -235,7 +235,7 @@
void do_get_size(int argc, char **argv)
{
- ino_t size;
+ ext2_ino_t size;
if (check_icount(argv[0]))
return;
diff --git a/tests/progs/test_rel.c b/tests/progs/test_rel.c
index 2dfb473..f5c3c83 100644
--- a/tests/progs/test_rel.c
+++ b/tests/progs/test_rel.c
@@ -37,7 +37,7 @@
* Helper function which parses an inode number.
*/
static int parse_inode(const char *request, const char *desc,
- const char *str, ino_t *ino)
+ const char *str, ext2_ino_t *ino)
{
char *tmp;
@@ -100,7 +100,7 @@
/*
* Helper function which displays an irel entry
*/
-static void display_irel_entry(ino_t old,
+static void display_irel_entry(ext2_ino_t old,
struct ext2_inode_relocate_entry *ent,
int do_refs)
{
@@ -350,9 +350,9 @@
void do_irel_ma_create(int argc, char **argv)
{
- const char *usage = "Usage: %s name max_inode\n";
+ const char *usage = "Usage: %s name max_inode\n";
errcode_t retval;
- ino_t max_ino;
+ ext2_ino_t max_ino;
if (argc < 3) {
printf(usage, argv[0]);
@@ -380,10 +380,10 @@
void do_irel_put(int argc, char **argv)
{
- const char *usage = "%s old new max_refs";
+ const char *usage = "%s old new max_refs";
+ errcode_t retval;
+ ext2_ino_t old, new, max_refs;
struct ext2_inode_relocate_entry ent;
- errcode_t retval;
- ino_t old, new, max_refs;
if (check_irel(argv[0]))
return;
@@ -416,10 +416,10 @@
void do_irel_get(int argc, char **argv)
{
- const char *usage = "%s inode";
+ const char *usage = "%s inode";
+ errcode_t retval;
+ ext2_ino_t old;
struct ext2_inode_relocate_entry ent;
- errcode_t retval;
- ino_t old;
if (check_irel(argv[0]))
return;
@@ -442,10 +442,10 @@
void do_irel_get_by_orig(int argc, char **argv)
{
- const char *usage = "%s orig_inode";
- errcode_t retval;
+ const char *usage = "%s orig_inode";
+ errcode_t retval;
+ ext2_ino_t orig, old;
struct ext2_inode_relocate_entry ent;
- ino_t orig, old;
if (check_irel(argv[0]))
return;
@@ -483,9 +483,9 @@
void do_irel_next(int argc, char **argv)
{
- errcode_t retval;
+ errcode_t retval;
+ ext2_ino_t old;
struct ext2_inode_relocate_entry ent;
- ino_t old;
if (check_irel(argv[0]))
return;
@@ -505,9 +505,9 @@
void do_irel_dump(int argc, char **argv)
{
- errcode_t retval;
+ errcode_t retval;
+ ext2_ino_t ino;
struct ext2_inode_relocate_entry ent;
- ino_t ino;
if (check_irel(argv[0]))
return;
@@ -534,11 +534,11 @@
void do_irel_add_ref(int argc, char **argv)
{
- const char *usage = "%s inode block offset";
- errcode_t retval;
+ const char *usage = "%s inode block offset";
+ errcode_t retval;
+ blk_t block, offset;
+ ext2_ino_t ino;
struct ext2_inode_reference ref;
- blk_t block, offset;
- ino_t ino;
if (check_irel(argv[0]))
@@ -571,9 +571,9 @@
void do_irel_start_iter_ref(int argc, char **argv)
{
- const char *usage = "%s inode";
- errcode_t retval;
- ino_t ino;
+ const char *usage = "%s inode";
+ errcode_t retval;
+ ext2_ino_t ino;
if (check_irel(argv[0]))
return;
@@ -612,9 +612,9 @@
void do_irel_move(int argc, char **argv)
{
- const char *usage = "%s old new";
- errcode_t retval;
- ino_t old, new;
+ const char *usage = "%s old new";
+ errcode_t retval;
+ ext2_ino_t old, new;
if (check_irel(argv[0]))
return;
@@ -638,9 +638,9 @@
void do_irel_delete(int argc, char **argv)
{
- const char *usage = "%s inode";
- errcode_t retval;
- ino_t ino;
+ const char *usage = "%s inode";
+ errcode_t retval;
+ ext2_ino_t ino;
if (check_irel(argv[0]))
return;