aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ext2fs/read_bb.c
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2014-03-06 13:50:20 -0800
committerJP Abgrall <jpa@google.com>2014-03-06 13:50:20 -0800
commit65f0aab98b20b5994a726ab90d355248bcddfffd (patch)
tree2b7c0cf831d8255e3b0d1bab367609100a7e0f18 /lib/ext2fs/read_bb.c
parent66b7b06812cc7ae835e0c0ed2656d1a27580c5ed (diff)
downloadandroid_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 'lib/ext2fs/read_bb.c')
-rw-r--r--lib/ext2fs/read_bb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ext2fs/read_bb.c b/lib/ext2fs/read_bb.c
index e5d63227..33167840 100644
--- a/lib/ext2fs/read_bb.c
+++ b/lib/ext2fs/read_bb.c
@@ -49,7 +49,7 @@ static int mark_bad_block(ext2_filsys fs, blk_t *block_nr,
return 0;
if ((*block_nr < fs->super->s_first_data_block) ||
- (*block_nr >= ext2fs_blocks_count(fs->super)))
+ (*block_nr >= fs->super->s_blocks_count))
return 0; /* Ignore illegal blocks */
rb->err = ext2fs_badblocks_list_add(rb->bb_list, *block_nr);