aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ext2fs/badblocks.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/badblocks.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/badblocks.c')
-rw-r--r--lib/ext2fs/badblocks.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ext2fs/badblocks.c b/lib/ext2fs/badblocks.c
index 4312e190..5eb28b78 100644
--- a/lib/ext2fs/badblocks.c
+++ b/lib/ext2fs/badblocks.c
@@ -177,7 +177,7 @@ int ext2fs_u32_list_find(ext2_u32_list bb, __u32 blk)
return high;
while (low < high) {
- mid = ((unsigned)low + (unsigned)high)/2;
+ mid = (low+high)/2;
if (mid == low || mid == high)
break;
if (blk == bb->list[mid])