~csurbhi/ubuntu/maverick/e2fsprogs/e2fsprogs.fix-505719

Committer: Bazaar Package Importer
Author(s): Steve Langasek
Date: 2008-08-08 20:32:11 UTC
mfrom: (1.1.11 upstream)
Revision ID: james.westby@ubuntu.com-20080808203211-w72lpsd9q7o3bw6x

Tags: 1.41.0-3ubuntu1

* Merge from Debian unstable (LP: #254152, #246461), remaining changes:
- Do not build-depend on dietlibc-dev, which is in universe.

files added:
e2fsck/crc32.c

e2fsck/crc32defs.h

e2fsck/gen_crc32table.c

e2fsck/io

lib/blkid/tests/zfs.img.bz2

lib/blkid/tests/zfs.results

lib/ext2fs/crc16.c

lib/ext2fs/crc16.h

lib/ext2fs/csum.c

lib/ext2fs/extent.c

lib/ext2fs/extent_dbg.ct

lib/ext2fs/i_block.c

lib/ext2fs/tst_csum.c

lib/ext2fs/undo_io.c

misc/e2undo.8.in

misc/e2undo.c

tests/f_ea_checks

tests/f_ea_checks/expect.1

tests/f_ea_checks/expect.2

tests/f_ea_checks/image.gz

tests/f_ea_checks/name

tests/f_extents/expect.1

tests/f_extents/expect.2

tests/f_extents/name

tests/f_extents2

tests/f_extents2/expect.1

tests/f_extents2/expect.2

tests/f_extents2/image.gz

tests/f_extents2/name

tests/f_fast_symlink_extents

tests/f_fast_symlink_extents/expect.1

tests/f_fast_symlink_extents/expect.2

tests/f_fast_symlink_extents/image.gz

tests/f_fast_symlink_extents/name

tests/f_uninit_last_uninit

tests/f_uninit_last_uninit/expect.1

tests/f_uninit_last_uninit/expect.2

tests/f_uninit_last_uninit/name

tests/f_uninit_last_uninit/script

tests/f_unsorted_EAs

tests/f_unsorted_EAs/expect.1

tests/f_unsorted_EAs/expect.2

tests/f_unsorted_EAs/image.gz

tests/f_unsorted_EAs/name

tests/m_uninit

tests/m_uninit/expect.1

tests/m_uninit/script

tests/u_mke2fs

tests/u_mke2fs/script

tests/u_tune2fs

tests/u_tune2fs/script

files removed:
e2fsck/swapfs.c

lib/ext2fs/cmp_bitmaps.c

lib/ext2fs/rs_bitmap.c

tests/f_extents/script

tests/f_swapfs

tests/f_swapfs/debugfs.cmd

tests/f_swapfs/expect

tests/f_swapfs/image

tests/f_swapfs/image.gz

tests/f_swapfs/name

tests/f_swapfs/script

files modified:
.release-checklist

INSTALL

MCONFIG.in

Makefile.in

README

RELEASE-NOTES

config/parse-types.sh

configure

configure.in

debian/changelog

debian/control

debian/e2fsck-static.copyright

debian/e2fslibs.copyright

debian/e2fsprogs.copyright

debian/libuuid1.postinst

debian/rules

debugfs/Makefile.in

debugfs/debugfs.8.in

debugfs/debugfs.c

debugfs/debugfs.h

debugfs/htree.c

debugfs/icheck.c

debugfs/logdump.c

debugfs/ls.c

debugfs/lsdel.c

debugfs/set_fields.c

debugfs/util.c

doc/libext2fs.texinfo

e2fsck/Makefile.in

e2fsck/e2fsck.8.in

e2fsck/e2fsck.h

e2fsck/emptydir.c

e2fsck/jfs_user.h

e2fsck/journal.c

e2fsck/message.c

e2fsck/pass1.c

e2fsck/pass1b.c

e2fsck/pass2.c

e2fsck/pass3.c

e2fsck/pass4.c

e2fsck/pass5.c

e2fsck/problem.c

e2fsck/problem.h

e2fsck/recovery.c

e2fsck/rehash.c

e2fsck/revoke.c

e2fsck/super.c

e2fsck/unix.c

e2fsck/util.c

e2fsprogs.lsm

e2fsprogs.spec

e2fsprogs.spec.in

ext2ed/doc/ext2ed-design.sgml

lib/Makefile.library

lib/blkid/blkid.pc.in

lib/blkid/cache.c

lib/blkid/dev.c

lib/blkid/devname.c

lib/blkid/getsize.c

lib/blkid/probe.c

lib/blkid/save.c

lib/blkid/tag.c

lib/blkid/test_probe.in

lib/e2p/feature.c

lib/e2p/fgetflags.c

lib/e2p/fsetflags.c

lib/e2p/iod.c

lib/e2p/ls.c

lib/e2p/pf.c

lib/et/com_err.texinfo

lib/ext2fs/Makefile.in

lib/ext2fs/alloc.c

lib/ext2fs/alloc_sb.c

lib/ext2fs/alloc_stats.c

lib/ext2fs/alloc_tables.c

lib/ext2fs/bb_inode.c

lib/ext2fs/bitmaps.c

lib/ext2fs/bitops.c

lib/ext2fs/bitops.h

lib/ext2fs/block.c

lib/ext2fs/bmap.c

lib/ext2fs/check_desc.c

lib/ext2fs/closefs.c

lib/ext2fs/dblist.c

lib/ext2fs/dir_iterate.c

lib/ext2fs/dirblock.c

lib/ext2fs/expanddir.c

lib/ext2fs/ext2_err.et.in

lib/ext2fs/ext2_fs.h

lib/ext2fs/ext2_io.h

lib/ext2fs/ext2fs.h

lib/ext2fs/ext3_extents.h

lib/ext2fs/ext_attr.c

lib/ext2fs/freefs.c

lib/ext2fs/gen_bitmap.c

lib/ext2fs/icount.c

lib/ext2fs/imager.c

lib/ext2fs/ind_block.c

lib/ext2fs/initialize.c

lib/ext2fs/inode.c

lib/ext2fs/inode_io.c

lib/ext2fs/ismounted.c

lib/ext2fs/jfs_compat.h

lib/ext2fs/kernel-jbd.h

lib/ext2fs/mkdir.c

lib/ext2fs/mkjournal.c

lib/ext2fs/openfs.c

lib/ext2fs/read_bb.c

lib/ext2fs/res_gdt.c

lib/ext2fs/rw_bitmaps.c

lib/ext2fs/swapfs.c

lib/ext2fs/tdb.c

lib/ext2fs/test_io.c

lib/ext2fs/unix_io.c

lib/ss/Makefile.in

lib/ss/ss.pc.in

lib/ss/test_ss.c

lib/uuid/tst_uuid.c

misc/Makefile.in

misc/badblocks.8.in

misc/badblocks.c

misc/blkid.8.in

misc/blkid.c

misc/chattr.1.in

misc/chattr.c

misc/dumpe2fs.c

misc/e2image.c

misc/fsck.c

misc/fsck.h

misc/ismounted.c

misc/logsave.c

misc/mke2fs.8.in

misc/mke2fs.c

misc/mke2fs.conf

misc/mke2fs.conf.5.in

misc/tune2fs.8.in

misc/tune2fs.c

misc/util.c

misc/util.h

misc/uuidd.c

po/POTFILES.in

po/ca.gmo

po/ca.po

po/cs.gmo

po/cs.po

po/de.gmo

po/de.po

po/e2fsprogs.pot

po/es.gmo

po/es.po

po/fr.gmo

po/fr.po

po/nl.gmo

po/nl.po

po/pl.gmo

po/pl.po

po/vi.gmo

po/vi.po

resize/main.c

resize/online.c

resize/resize2fs.8.in

resize/resize2fs.c

resize/resize2fs.h

resize/test_extent.c

tests/Makefile.in

tests/f_bad_disconnected_inode/expect.1

tests/f_bad_disconnected_inode/expect.2

tests/f_dupfsblks/expect.1

tests/f_resize_inode/expect

tests/filter_dumpe2fs

tests/m_dasd_bs/expect.1

tests/m_large_file/expect.1

tests/m_meta_bg/expect.1

tests/m_no_opt/expect.1

tests/m_raid_opt/expect.1

tests/m_std/expect.1

tests/progs/Makefile.in

tests/progs/test_icount.c

tests/progs/test_rel.c

tests/r_inline_xattr/expect

tests/r_move_itable/expect

tests/r_resize_inode/expect

tests/r_resize_inode/script

tests/test_config

util/all.exclude

util/gen-tarball.in

util/subset.exclude

version.h

Show diffs side-by-side

added added

removed removed

lib/ext2fs/read_bb.c

retval = ext2fs_read_inode(fs, EXT2_BAD_INO, &inode);

if (retval)

return retval;

if (inode.i_blocks < 500)

numblocks = (inode.i_blocks /

(fs->blocksize / 512)) + 20;

else

numblocks = inode.i_blocks;

if (!((fs->super->s_feature_ro_compat &

EXT4_FEATURE_RO_COMPAT_HUGE_FILE) &&

(inode.i_flags & EXT4_HUGE_FILE_FL)))

numblocks = numblocks / (fs->blocksize / 512);

numblocks += 20;

if (numblocks < 50)

numblocks = 50;

if (numblocks > 50000)

numblocks = 500;

retval = ext2fs_badblocks_list_create(bb_list, numblocks);

if (retval)

rb.bb_list = *bb_list;

rb.err = 0;

retval = ext2fs_block_iterate2(fs, EXT2_BAD_INO, 0, 0,

mark_bad_block, &rb);

retval = ext2fs_block_iterate2(fs, EXT2_BAD_INO, BLOCK_FLAG_READ_ONLY,

0, mark_bad_block, &rb);

if (retval)

return retval;

Older »