← Back to branch summary

~vorlon/ubuntu/natty/e2fsprogs/multiarch

« back to all changes in this revision

Viewing changes to lib/ext2fs/gen_bitmap.c

  • Committer: Bazaar Package Importer
  • Author(s): Scott James Remnant
  • Date: 2009-08-25 18:34:46 UTC
  • mfrom: (8.2.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090825183446-p2iuz63g8g4ytlf4
Tags: 1.41.9-1ubuntu1
https://launchpad.net/bugs/416648
* Merge from Debian, remaining changes:
  - Do not build-depend on dietlibc-dev, which is universe.
  - Do now allow pkg-create-dbgsym to operate on this package.
  - Use external libblkid and libuuid from util-linux, rather than
    building our own.
  - Do not include /etc/e2fsck.conf and remove on upgrade.

* Included a couple of extra revisions from GIT maint:
  - (ffd8078) e2freefrag: Update manpage to include e2fsprogs version
    and release date
  - (31b5a2b) mke2fs.conf: Use the feature name "extent" instead of
    "extents"
  - (8bafedb) tune2fs: Fix "tune2fs -j <dev>" for extent-enabled
     filesystems.  LP: #416648.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/ext2fs/gen_bitmap.c
355
355
                                                  unsigned int len)
356
356
{
357
357
        size_t start_byte, len_byte = len >> 3;
358
 
        int start_bit, len_bit = len % 8;
 
358
        unsigned int start_bit, len_bit = len % 8;
359
359
        int first_bit = 0;
360
360
        int last_bit  = 0;
361
361
        int mark_count = 0;
425
425
int ext2fs_test_block_bitmap_range(ext2fs_block_bitmap bitmap,
426
426
                                   blk_t block, int num)
427
427
{
428
 
        int     i;
429
 
 
430
428
        EXT2_CHECK_MAGIC(bitmap, EXT2_ET_MAGIC_BLOCK_BITMAP);
431
429
        if ((block < bitmap->start) || (block+num-1 > bitmap->real_end)) {
432
430
                ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_TEST,
440
438
int ext2fs_test_inode_bitmap_range(ext2fs_inode_bitmap bitmap,
441
439
                                   ino_t inode, int num)
442
440
{
443
 
        int     i;
444
 
 
445
441
        EXT2_CHECK_MAGIC(bitmap, EXT2_ET_MAGIC_INODE_BITMAP);
446
442
        if ((inode < bitmap->start) || (inode+num-1 > bitmap->real_end)) {
447
443
                ext2fs_warn_bitmap(EXT2_ET_BAD_INODE_TEST,