diff options
| author | JP Abgrall <jpa@google.com> | 2014-03-06 13:50:20 -0800 |
|---|---|---|
| committer | JP Abgrall <jpa@google.com> | 2014-03-06 13:50:20 -0800 |
| commit | 65f0aab98b20b5994a726ab90d355248bcddfffd (patch) | |
| tree | 2b7c0cf831d8255e3b0d1bab367609100a7e0f18 /debugfs/unused.c | |
| parent | 66b7b06812cc7ae835e0c0ed2656d1a27580c5ed (diff) | |
| download | android_external_e2fsprogs-65f0aab98b20b5994a726ab90d355248bcddfffd.tar.gz android_external_e2fsprogs-65f0aab98b20b5994a726ab90d355248bcddfffd.tar.bz2 android_external_e2fsprogs-65f0aab98b20b5994a726ab90d355248bcddfffd.zip | |
Revert changes that moved from 1.41.14 to 1.42.9
Revert "e2fsck: Don't use e2fsck_global_ctx unless HAVE_SIGNAL_H"
commit e80e74c41d85ff93f3d212ba6512340f48054a93.
Revert "Merge remote-tracking branch 'linaro/linaro-1.42.9' into aosp_master"
This reverts commit e97b2b6fc82f840e84dfc631b87f21be44ff2421, reversing
changes made to 7e2fb9d09c245eba70ee008b78007315e9c0f1df.
Revert "Prepare for upstream 1.42.9"
This reverts commit 7e2fb9d09c245eba70ee008b78007315e9c0f1df.
Bug: 13340735
Change-Id: If48b153a95ef5f69f7cdccb00e23524abff3c5a8
Signed-off-by: JP Abgrall <jpa@google.com>
Diffstat (limited to 'debugfs/unused.c')
| -rw-r--r-- | debugfs/unused.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/debugfs/unused.c b/debugfs/unused.c index b78d70b8..818fef13 100644 --- a/debugfs/unused.c +++ b/debugfs/unused.c @@ -26,8 +26,8 @@ extern char *optarg; void do_dump_unused(int argc EXT2FS_ATTR((unused)), char **argv) { - blk64_t blk; - unsigned char buf[EXT2_MAX_BLOCK_SIZE]; + unsigned long blk; + unsigned char buf[EXT2_MAX_BLOCK_SIZE]; unsigned int i; errcode_t retval; @@ -36,10 +36,10 @@ void do_dump_unused(int argc EXT2FS_ATTR((unused)), char **argv) return; for (blk=current_fs->super->s_first_data_block; - blk < ext2fs_blocks_count(current_fs->super); blk++) { - if (ext2fs_test_block_bitmap2(current_fs->block_map,blk)) + blk < current_fs->super->s_blocks_count; blk++) { + if (ext2fs_test_block_bitmap(current_fs->block_map,blk)) continue; - retval = io_channel_read_blk64(current_fs->io, blk, 1, buf); + retval = io_channel_read_blk(current_fs->io, blk, 1, buf); if (retval) { com_err(argv[0], retval, "While reading block\n"); return; @@ -49,7 +49,7 @@ void do_dump_unused(int argc EXT2FS_ATTR((unused)), char **argv) break; if (i >= current_fs->blocksize) continue; - printf("\nUnused block %llu contains non-zero data:\n\n", + printf("\nUnused block %lu contains non-zero data:\n\n", blk); for (i=0; i < current_fs->blocksize; i++) fputc(buf[i], stdout); |