aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ext2fs/dir_iterate.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2010-06-13 10:00:00 -0400
committerTheodore Ts'o <tytso@mit.edu>2010-06-13 10:00:00 -0400
commitab13b5a9795a8c20f1d6da8fe1da340f545ec0e0 (patch)
treec5200060143a652d042aef593d9081bf2861e0d1 /lib/ext2fs/dir_iterate.c
parentda3fc25bce5880c5d036d97727299ab09b415219 (diff)
downloadandroid_external_e2fsprogs-ab13b5a9795a8c20f1d6da8fe1da340f545ec0e0.tar.gz
android_external_e2fsprogs-ab13b5a9795a8c20f1d6da8fe1da340f545ec0e0.tar.bz2
android_external_e2fsprogs-ab13b5a9795a8c20f1d6da8fe1da340f545ec0e0.zip
libext2fs: Create 64-bit dblist functions
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'lib/ext2fs/dir_iterate.c')
-rw-r--r--lib/ext2fs/dir_iterate.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/ext2fs/dir_iterate.c b/lib/ext2fs/dir_iterate.c
index 3b9c57c4..afe0f1a2 100644
--- a/lib/ext2fs/dir_iterate.c
+++ b/lib/ext2fs/dir_iterate.c
@@ -120,7 +120,7 @@ errcode_t ext2fs_dir_iterate2(ext2_filsys fs,
ctx.func = func;
ctx.priv_data = priv_data;
ctx.errcode = 0;
- retval = ext2fs_block_iterate2(fs, dir, BLOCK_FLAG_READ_ONLY, 0,
+ retval = ext2fs_block_iterate3(fs, dir, BLOCK_FLAG_READ_ONLY, 0,
ext2fs_process_dir_block, &ctx);
if (!block_buf)
ext2fs_free_mem(&ctx.buf);
@@ -174,9 +174,9 @@ extern errcode_t ext2fs_dir_iterate(ext2_filsys fs,
* ext2fs_dir_iterate() and ext2fs_dblist_dir_iterate()
*/
int ext2fs_process_dir_block(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)
{
@@ -195,7 +195,7 @@ int ext2fs_process_dir_block(ext2_filsys fs,
entry = blockcnt ? DIRENT_OTHER_FILE : DIRENT_DOT_FILE;
- ctx->errcode = ext2fs_read_dir_block(fs, *blocknr, ctx->buf);
+ ctx->errcode = ext2fs_read_dir_block3(fs, *blocknr, ctx->buf, 0);
if (ctx->errcode)
return BLOCK_ABORT;
@@ -256,7 +256,8 @@ next:
}
if (changed) {
- ctx->errcode = ext2fs_write_dir_block(fs, *blocknr, ctx->buf);
+ ctx->errcode = ext2fs_write_dir_block3(fs, *blocknr, ctx->buf,
+ 0);
if (ctx->errcode)
return BLOCK_ABORT;
}