diff options
| author | Valerie Aurora Henson <vaurora@redhat.com> | 2010-06-13 11:00:00 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2010-06-13 11:00:00 -0400 |
| commit | 6d8b37fa7661484ca50a4951cffbf531ab1bccbb (patch) | |
| tree | 713cea901e4426f6f0683abcf0812cbdb6680796 /lib/ext2fs/expanddir.c | |
| parent | ab13b5a9795a8c20f1d6da8fe1da340f545ec0e0 (diff) | |
| download | android_external_e2fsprogs-6d8b37fa7661484ca50a4951cffbf531ab1bccbb.tar.gz android_external_e2fsprogs-6d8b37fa7661484ca50a4951cffbf531ab1bccbb.tar.bz2 android_external_e2fsprogs-6d8b37fa7661484ca50a4951cffbf531ab1bccbb.zip | |
libext2fs: More random 64-bit fixes, lots of block_iterate3
Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'lib/ext2fs/expanddir.c')
| -rw-r--r-- | lib/ext2fs/expanddir.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/ext2fs/expanddir.c b/lib/ext2fs/expanddir.c index d41d95ef..7673a3bd 100644 --- a/lib/ext2fs/expanddir.c +++ b/lib/ext2fs/expanddir.c @@ -25,15 +25,15 @@ struct expand_dir_struct { }; static int expand_dir_proc(ext2_filsys fs, - blk_t *blocknr, + blk64_t *blocknr, e2_blkcnt_t blockcnt, - blk_t ref_block EXT2FS_ATTR((unused)), + blk64_t ref_block EXT2FS_ATTR((unused)), int ref_offset EXT2FS_ATTR((unused)), void *priv_data) { struct expand_dir_struct *es = (struct expand_dir_struct *) priv_data; - blk_t new_blk; - static blk_t last_blk = 0; + blk64_t new_blk; + static blk64_t last_blk = 0; char *block; errcode_t retval; @@ -41,7 +41,7 @@ static int expand_dir_proc(ext2_filsys fs, last_blk = *blocknr; return 0; } - retval = ext2fs_new_block(fs, last_blk, 0, &new_blk); + retval = ext2fs_new_block2(fs, last_blk, 0, &new_blk); if (retval) { es->err = retval; return BLOCK_ABORT; @@ -100,7 +100,7 @@ errcode_t ext2fs_expand_dir(ext2_filsys fs, ext2_ino_t dir) es.err = 0; es.newblocks = 0; - retval = ext2fs_block_iterate2(fs, dir, BLOCK_FLAG_APPEND, + retval = ext2fs_block_iterate3(fs, dir, BLOCK_FLAG_APPEND, 0, expand_dir_proc, &es); if (es.err) |