← Back to branch summary

~ubuntu-branches/ubuntu/edgy/e2fsprogs/edgy-updates

« back to all changes in this revision

Viewing changes to lib/ext2fs/rw_bitmaps.c

  • Committer: Bazaar Package Importer
  • Author(s): Tollef Fog Heen
  • Date: 2005-08-23 10:42:10 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20050823104210-t15igvmgrkzea0dq
Tags: 1.38-2ubuntu1
* Merge with Debian.  (Ubuntu #13757)
* Remove tests/f_bad_disconnected_inode/image.gz to be able to build the
  package.  This will (hopefully) be in the next upstream version and is
  just used for testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/ext2fs/rw_bitmaps.c
186
186
                if (inode_bitmap) {
187
187
                        blk = (fs->image_header->offset_inodemap /
188
188
                               fs->blocksize);
189
 
                        retval = io_channel_read_blk(fs->io, blk,
 
189
                        retval = io_channel_read_blk(fs->image_io, blk,
190
190
                             -(inode_nbytes * fs->group_desc_count),
191
191
                             inode_bitmap);
192
192
                        if (retval)
195
195
                if (block_bitmap) {
196
196
                        blk = (fs->image_header->offset_blockmap /
197
197
                               fs->blocksize);
198
 
                        retval = io_channel_read_blk(fs->io, blk, 
 
198
                        retval = io_channel_read_blk(fs->image_io, blk, 
199
199
                             -(block_nbytes * fs->group_desc_count),
200
200
                             block_bitmap);
201
201
                        if (retval)