From 319158f9bd1d49ae0f697cfa9910d67ba5be8627 Mon Sep 17 00:00:00 2001 From: "Jose R. Santos" Date: Mon, 1 Jun 2009 16:15:40 -0400 Subject: [PATCH] Use blk64_t for blocks in struct ext2_file The ext2_file structure is never exposed through the libext2fs API so it is safe to use 64-bit blocks for blockno and physclock without breaking the ABI. Signed-off-by: Jose R. Santos Signed-off-by: "Theodore Ts'o" --- lib/ext2fs/fileio.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/ext2fs/fileio.c b/lib/ext2fs/fileio.c index 70325a8..2c599c8 100644 --- a/lib/ext2fs/fileio.c +++ b/lib/ext2fs/fileio.c @@ -25,8 +25,8 @@ struct ext2_file { struct ext2_inode inode; int flags; __u64 pos; - blk_t blockno; - blk_t physblock; + blk64_t blockno; + blk64_t physblock; char *buf; }; @@ -116,9 +116,9 @@ errcode_t ext2fs_file_flush(ext2_file_t file) * Allocate it. */ if (!file->physblock) { - retval = ext2fs_bmap(fs, file->ino, &file->inode, + retval = ext2fs_bmap2(fs, file->ino, &file->inode, BMAP_BUFFER, file->ino ? BMAP_ALLOC : 0, - file->blockno, &file->physblock); + file->blockno, 0, &file->physblock); if (retval) return retval; } @@ -168,8 +168,8 @@ static errcode_t load_buffer(ext2_file_t file, int dontfill) errcode_t retval; if (!(file->flags & EXT2_FILE_BUF_VALID)) { - retval = ext2fs_bmap(fs, file->ino, &file->inode, - BMAP_BUFFER, 0, file->blockno, + retval = ext2fs_bmap2(fs, file->ino, &file->inode, + BMAP_BUFFER, 0, file->blockno, 0, &file->physblock); if (retval) return retval; -- 1.8.3.1