← Back to branch summary

~daniel-mehrmann/e2fsprogs/master

« back to all changes in this revision

Viewing changes to lib/ext2fs/rw_bitmaps.c

  • Committer: Package Import Robot
  • Author(s): Michael Vogt
  • Date: 2014-10-27 09:44:27 UTC
  • mfrom: (8.4.29 sid)
  • Revision ID: package-import@ubuntu.com-20141027094427-g56dce6sg7pasdgm
Tags: 1.42.12-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - debian/rules:
      Block pkg-create-dbgsym from operating on this package.
      Build without dietlibc-dev, which is in universe 
      Use the autotools-dev dh addon to update config.guess/config.sub for new
      ports.
  - debian/control:
      Regenerate with ./debian/rules debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/ext2fs/rw_bitmaps.c
262
262
                }
263
263
                blk = (fs->image_header->offset_blockmap /
264
264
                       fs->blocksize);
265
 
                blk_cnt = (blk64_t)EXT2_CLUSTERS_PER_GROUP(fs->super) *
266
 
                        fs->group_desc_count;
 
265
                blk_cnt = EXT2_GROUPS_TO_CLUSTERS(fs->super,
 
266
                                                  fs->group_desc_count);
267
267
                while (block_nbytes > 0) {
268
268
                        retval = io_channel_read_blk64(fs->image_io, blk++,
269
269
                                                     1, block_bitmap);