aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormajianpeng <majianpeng@gmail.com>2012-11-06 17:13:44 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-03 11:37:59 -0800
commitea95b5107c1cdc7774e986d1db421b4b22e979f9 (patch)
tree91b78fc9f248cabfd292be38aedcff8ef6edad69
parent4158b8803e984b5400a1180791e23db4459f662a (diff)
downloadlinux-linaro-stable-ea95b5107c1cdc7774e986d1db421b4b22e979f9.tar.gz
md: Reassigned the parameters if read_seqretry returned true in func md_is_badblock.
commit ab05613a0646dcc11049692d54bae76ca9ffa910 upstream. This bug was introduced by commit(v3.0-rc7-126-g2230dfe). So fix is suitable for 3.0.y thru 3.6.y. Signed-off-by: Jianpeng Ma <majianpeng@gmail.com> Signed-off-by: NeilBrown <neilb@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/md/md.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 308e87b417e0..83ad2f8d1631 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -7907,9 +7907,9 @@ int md_is_badblock(struct badblocks *bb, sector_t s, int sectors,
sector_t *first_bad, int *bad_sectors)
{
int hi;
- int lo = 0;
+ int lo;
u64 *p = bb->page;
- int rv = 0;
+ int rv;
sector_t target = s + sectors;
unsigned seq;
@@ -7924,7 +7924,8 @@ int md_is_badblock(struct badblocks *bb, sector_t s, int sectors,
retry:
seq = read_seqbegin(&bb->lock);
-
+ lo = 0;
+ rv = 0;
hi = bb->count;
/* Binary search between lo and hi for 'target'