aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/ext2fs/bb_inode.c2
-rw-r--r--lib/ext2fs/bmove.c4
-rw-r--r--lib/ext2fs/closefs.c8
-rw-r--r--lib/ext2fs/dirblock.c2
-rw-r--r--lib/ext2fs/expanddir.c2
-rw-r--r--lib/ext2fs/extent.c7
-rw-r--r--lib/ext2fs/imager.c4
-rw-r--r--lib/ext2fs/inode.c8
-rw-r--r--lib/ext2fs/mkjournal.c7
-rw-r--r--lib/ext2fs/openfs.c2
-rw-r--r--lib/ext2fs/rw_bitmaps.c14
-rw-r--r--lib/ext2fs/undo_io.c2
12 files changed, 32 insertions, 30 deletions
diff --git a/lib/ext2fs/bb_inode.c b/lib/ext2fs/bb_inode.c
index 53122b5d..bbebf6f0 100644
--- a/lib/ext2fs/bb_inode.c
+++ b/lib/ext2fs/bb_inode.c
@@ -244,7 +244,7 @@ static int set_bad_block_proc(ext2_filsys fs, blk_t *block_nr,
return BLOCK_ABORT;
}
}
- retval = io_channel_write_blk(fs->io, blk, 1, rec->block_buf);
+ retval = io_channel_write_blk64(fs->io, blk, 1, rec->block_buf);
if (retval) {
rec->err = retval;
return BLOCK_ABORT;
diff --git a/lib/ext2fs/bmove.c b/lib/ext2fs/bmove.c
index e56411c0..49839c63 100644
--- a/lib/ext2fs/bmove.c
+++ b/lib/ext2fs/bmove.c
@@ -59,12 +59,12 @@ static int process_block(ext2_filsys fs, blk_t *block_nr,
} while (ext2fs_test_block_bitmap2(pb->reserve, block) ||
ext2fs_test_block_bitmap2(pb->alloc_map, block));
- retval = io_channel_read_blk(fs->io, orig, 1, pb->buf);
+ retval = io_channel_read_blk64(fs->io, orig, 1, pb->buf);
if (retval) {
pb->error = retval;
return BLOCK_ABORT;
}
- retval = io_channel_write_blk(fs->io, block, 1, pb->buf);
+ retval = io_channel_write_blk64(fs->io, block, 1, pb->buf);
if (retval) {
pb->error = retval;
return BLOCK_ABORT;
diff --git a/lib/ext2fs/closefs.c b/lib/ext2fs/closefs.c
index e3520922..2cf8a8bb 100644
--- a/lib/ext2fs/closefs.c
+++ b/lib/ext2fs/closefs.c
@@ -194,7 +194,7 @@ static errcode_t write_primary_superblock(ext2_filsys fs,
if (!fs->io->manager->write_byte || !fs->orig_super) {
io_channel_set_blksize(fs->io, SUPERBLOCK_OFFSET);
- retval = io_channel_write_blk(fs->io, 1, -SUPERBLOCK_SIZE,
+ retval = io_channel_write_blk64(fs->io, 1, -SUPERBLOCK_SIZE,
super);
io_channel_set_blksize(fs->io, fs->blocksize);
return retval;
@@ -257,7 +257,7 @@ static errcode_t write_backup_super(ext2_filsys fs, dgrp_t group,
fs->super->s_block_group_nr = sgrp;
#endif
- return io_channel_write_blk(fs->io, group_block, -SUPERBLOCK_SIZE,
+ return io_channel_write_blk64(fs->io, group_block, -SUPERBLOCK_SIZE,
super_shadow);
}
@@ -353,7 +353,7 @@ errcode_t ext2fs_flush(ext2_filsys fs)
continue;
if ((old_desc_blk) &&
(!(fs->flags & EXT2_FLAG_MASTER_SB_ONLY) || (i == 0))) {
- retval = io_channel_write_blk(fs->io,
+ retval = io_channel_write_blk64(fs->io,
old_desc_blk, old_desc_blocks, group_ptr);
if (retval)
goto errout;
@@ -361,7 +361,7 @@ errcode_t ext2fs_flush(ext2_filsys fs)
if (new_desc_blk) {
int meta_bg = i / EXT2_DESC_PER_BLOCK(fs->super);
- retval = io_channel_write_blk(fs->io, new_desc_blk,
+ retval = io_channel_write_blk64(fs->io, new_desc_blk,
1, group_ptr + (meta_bg*fs->blocksize));
if (retval)
goto errout;
diff --git a/lib/ext2fs/dirblock.c b/lib/ext2fs/dirblock.c
index c8dfce66..122319a8 100644
--- a/lib/ext2fs/dirblock.c
+++ b/lib/ext2fs/dirblock.c
@@ -108,7 +108,7 @@ errcode_t ext2fs_write_dir_block3(ext2_filsys fs, blk64_t block,
ext2fs_free_mem(&buf);
return retval;
#else
- return io_channel_write_blk(fs->io, block, 1, (char *) inbuf);
+ return io_channel_write_blk64(fs->io, block, 1, (char *) inbuf);
#endif
}
diff --git a/lib/ext2fs/expanddir.c b/lib/ext2fs/expanddir.c
index 934eaf12..613f7bc3 100644
--- a/lib/ext2fs/expanddir.c
+++ b/lib/ext2fs/expanddir.c
@@ -61,7 +61,7 @@ static int expand_dir_proc(ext2_filsys fs,
return BLOCK_ABORT;
}
memset(block, 0, fs->blocksize);
- retval = io_channel_write_blk(fs->io, new_blk, 1, block);
+ retval = io_channel_write_blk64(fs->io, new_blk, 1, block);
}
if (retval) {
es->err = retval;
diff --git a/lib/ext2fs/extent.c b/lib/ext2fs/extent.c
index 1505447d..0b3b60c3 100644
--- a/lib/ext2fs/extent.c
+++ b/lib/ext2fs/extent.c
@@ -443,7 +443,7 @@ retry:
(handle->fs->io != handle->fs->image_io))
memset(newpath->buf, 0, handle->fs->blocksize);
else {
- retval = io_channel_read_blk(handle->fs->io,
+ retval = io_channel_read_blk64(handle->fs->io,
blk, 1, newpath->buf);
if (retval)
return retval;
@@ -553,7 +553,7 @@ static errcode_t update_path(ext2_extent_handle_t handle)
blk = ext2fs_le32_to_cpu(ix->ei_leaf) +
((__u64) ext2fs_le16_to_cpu(ix->ei_leaf_hi) << 32);
- retval = io_channel_write_blk(handle->fs->io,
+ retval = io_channel_write_blk64(handle->fs->io,
blk, 1, handle->path[handle->level].buf);
}
return retval;
@@ -962,7 +962,8 @@ static errcode_t extent_node_split(ext2_extent_handle_t handle)
new_node_start = ext2fs_le32_to_cpu(EXT_FIRST_INDEX(neweh)->ei_block);
/* ...and write the new node block out to disk. */
- retval = io_channel_write_blk(handle->fs->io, new_node_pblk, 1, block_buf);
+ retval = io_channel_write_blk64(handle->fs->io, new_node_pblk, 1,
+ block_buf);
if (retval)
goto done;
diff --git a/lib/ext2fs/imager.c b/lib/ext2fs/imager.c
index c0c10f02..948b1ac2 100644
--- a/lib/ext2fs/imager.c
+++ b/lib/ext2fs/imager.c
@@ -81,7 +81,7 @@ errcode_t ext2fs_image_inode_write(ext2_filsys fs, int fd, int flags)
c = BUF_BLOCKS;
if (c > left)
c = left;
- retval = io_channel_read_blk(fs->io, blk, c, buf);
+ retval = io_channel_read_blk64(fs->io, blk, c, buf);
if (retval)
goto errout;
cp = buf;
@@ -164,7 +164,7 @@ errcode_t ext2fs_image_inode_read(ext2_filsys fs, int fd,
retval = EXT2_ET_SHORT_READ;
goto errout;
}
- retval = io_channel_write_blk(fs->io, blk, c, buf);
+ retval = io_channel_write_blk64(fs->io, blk, c, buf);
if (retval)
goto errout;
diff --git a/lib/ext2fs/inode.c b/lib/ext2fs/inode.c
index f9cc43c1..365d8c8e 100644
--- a/lib/ext2fs/inode.c
+++ b/lib/ext2fs/inode.c
@@ -365,7 +365,7 @@ static errcode_t get_next_blocks(ext2_inode_scan scan)
memset(scan->inode_buffer, 0,
(size_t) num_blocks * scan->fs->blocksize);
} else {
- retval = io_channel_read_blk(scan->fs->io,
+ retval = io_channel_read_blk64(scan->fs->io,
scan->current_block,
(int) num_blocks,
scan->inode_buffer);
@@ -588,7 +588,7 @@ errcode_t ext2fs_read_inode_full(ext2_filsys fs, ext2_ino_t ino,
clen = fs->blocksize - offset;
if (block_nr != fs->icache->buffer_blk) {
- retval = io_channel_read_blk(io, block_nr, 1,
+ retval = io_channel_read_blk64(io, block_nr, 1,
fs->icache->buffer);
if (retval)
return retval;
@@ -708,7 +708,7 @@ errcode_t ext2fs_write_inode_full(ext2_filsys fs, ext2_ino_t ino,
clen = fs->blocksize - offset;
if (fs->icache->buffer_blk != block_nr) {
- retval = io_channel_read_blk(fs->io, block_nr, 1,
+ retval = io_channel_read_blk64(fs->io, block_nr, 1,
fs->icache->buffer);
if (retval)
goto errout;
@@ -719,7 +719,7 @@ errcode_t ext2fs_write_inode_full(ext2_filsys fs, ext2_ino_t ino,
memcpy((char *) fs->icache->buffer + (unsigned) offset,
ptr, clen);
- retval = io_channel_write_blk(fs->io, block_nr, 1,
+ retval = io_channel_write_blk64(fs->io, block_nr, 1,
fs->icache->buffer);
if (retval)
goto errout;
diff --git a/lib/ext2fs/mkjournal.c b/lib/ext2fs/mkjournal.c
index 2f58466f..7c5668de 100644
--- a/lib/ext2fs/mkjournal.c
+++ b/lib/ext2fs/mkjournal.c
@@ -243,7 +243,7 @@ static int mkjournal_proc(ext2_filsys fs,
es->newblocks++;
retval = 0;
if (blockcnt <= 0)
- retval = io_channel_write_blk(fs->io, new_blk, 1, es->buf);
+ retval = io_channel_write_blk64(fs->io, new_blk, 1, es->buf);
else {
if (es->zero_count) {
if ((es->blk_to_zero + es->zero_count == new_blk) &&
@@ -423,7 +423,8 @@ errcode_t ext2fs_add_journal_device(ext2_filsys fs, ext2_filsys journal_dev)
start = 1;
if (journal_dev->blocksize == 1024)
start++;
- if ((retval = io_channel_read_blk(journal_dev->io, start, -1024, buf)))
+ if ((retval = io_channel_read_blk64(journal_dev->io, start, -1024,
+ buf)))
return retval;
jsb = (journal_superblock_t *) buf;
@@ -448,7 +449,7 @@ errcode_t ext2fs_add_journal_device(ext2_filsys fs, ext2_filsys journal_dev)
}
/* Writeback the journal superblock */
- if ((retval = io_channel_write_blk(journal_dev->io, start, -1024, buf)))
+ if ((retval = io_channel_write_blk64(journal_dev->io, start, -1024, buf)))
return retval;
fs->super->s_journal_inum = 0;
diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c
index 71cf7e88..3c0563aa 100644
--- a/lib/ext2fs/openfs.c
+++ b/lib/ext2fs/openfs.c
@@ -328,7 +328,7 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
}
for (i=first_meta_bg ; i < fs->desc_blocks; i++) {
blk = ext2fs_descriptor_block_loc(fs, group_block, i);
- retval = io_channel_read_blk(fs->io, blk, 1, dest);
+ retval = io_channel_read_blk64(fs->io, blk, 1, dest);
if (retval)
goto cleanup;
#ifdef WORDS_BIGENDIAN
diff --git a/lib/ext2fs/rw_bitmaps.c b/lib/ext2fs/rw_bitmaps.c
index 05f8fed1..0792c5b3 100644
--- a/lib/ext2fs/rw_bitmaps.c
+++ b/lib/ext2fs/rw_bitmaps.c
@@ -90,8 +90,8 @@ static errcode_t write_bitmaps(ext2_filsys fs, int do_inode, int do_block)
}
blk = fs->group_desc[i].bg_block_bitmap;
if (blk) {
- retval = io_channel_write_blk(fs->io, blk, 1,
- block_buf);
+ retval = io_channel_write_blk64(fs->io, blk, 1,
+ block_buf);
if (retval)
return EXT2_ET_BLOCK_BITMAP_WRITE;
}
@@ -113,7 +113,7 @@ static errcode_t write_bitmaps(ext2_filsys fs, int do_inode, int do_block)
blk = fs->group_desc[i].bg_inode_bitmap;
if (blk) {
- retval = io_channel_write_blk(fs->io, blk, 1,
+ retval = io_channel_write_blk64(fs->io, blk, 1,
inode_buf);
if (retval)
return EXT2_ET_INODE_BITMAP_WRITE;
@@ -195,7 +195,7 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
blk = (fs->image_header->offset_inodemap / fs->blocksize);
ino_cnt = fs->super->s_inodes_count;
while (inode_nbytes > 0) {
- retval = io_channel_read_blk(fs->image_io, blk++,
+ retval = io_channel_read_blk64(fs->image_io, blk++,
1, inode_bitmap);
if (retval)
goto cleanup;
@@ -215,7 +215,7 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
blk_cnt = EXT2_BLOCKS_PER_GROUP(fs->super) *
fs->group_desc_count;
while (block_nbytes > 0) {
- retval = io_channel_read_blk(fs->image_io, blk++,
+ retval = io_channel_read_blk64(fs->image_io, blk++,
1, block_bitmap);
if (retval)
goto cleanup;
@@ -241,7 +241,7 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
ext2fs_group_desc_csum_verify(fs, i))
blk = 0;
if (blk) {
- retval = io_channel_read_blk(fs->io, blk,
+ retval = io_channel_read_blk64(fs->io, blk,
-block_nbytes, block_bitmap);
if (retval) {
retval = EXT2_ET_BLOCK_BITMAP_READ;
@@ -263,7 +263,7 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
ext2fs_group_desc_csum_verify(fs, i))
blk = 0;
if (blk) {
- retval = io_channel_read_blk(fs->io, blk,
+ retval = io_channel_read_blk64(fs->io, blk,
-inode_nbytes, inode_bitmap);
if (retval) {
retval = EXT2_ET_INODE_BITMAP_READ;
diff --git a/lib/ext2fs/undo_io.c b/lib/ext2fs/undo_io.c
index 45bcad7d..5efeeff4 100644
--- a/lib/ext2fs/undo_io.c
+++ b/lib/ext2fs/undo_io.c
@@ -148,7 +148,7 @@ static errcode_t write_file_system_identity(io_channel undo_channel,
block_size = channel->block_size;
io_channel_set_blksize(channel, SUPERBLOCK_OFFSET);
- retval = io_channel_read_blk(channel, 1, -SUPERBLOCK_SIZE, &super);
+ retval = io_channel_read_blk64(channel, 1, -SUPERBLOCK_SIZE, &super);
if (retval)
goto err_out;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 09:27:13 +0000