md/raid10: reset the 'first' at the end of loop

GuoqingJiang · shligit · commit 6f287ca6046e · 2017-04-10T10:41:50.000-07:00
We need to set "first = 0' at the end of rdev_for_each
loop, so we can get the array's min_offset_diff correctly
otherwise min_offset_diff just means the last rdev's
offset diff.

Suggested-by: NeilBrown &lt;neilb@suse.com&gt;
Signed-off-by: Guoqing Jiang &lt;gqjiang@suse.com&gt;
Reviewed-by: NeilBrown &lt;neilb@suse.com&gt;
Signed-off-by: Shaohua Li &lt;shli@fb.com&gt;
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
@@ -3769,6 +3769,7 @@ static int raid10_run(struct mddev *mddev)
 
 		if (blk_queue_discard(bdev_get_queue(rdev->bdev)))
 			discard_supported = true;
+		first = 0;
 	}
 
 	if (mddev->queue) {
@@ -4172,6 +4173,7 @@ static int raid10_start_reshape(struct mddev *mddev)
 			if (first || diff < min_offset_diff)
 				min_offset_diff = diff;
 		}
+		first = 0;
 	}
 
 	if (max(before_length, after_length) > min_offset_diff)

Original file line number	Diff line number	Diff line change
`@@ -3769,6 +3769,7 @@ static int raid10_run(struct mddev *mddev)`
`3769`	`3769`
`3770`	`3770`	`if (blk_queue_discard(bdev_get_queue(rdev->bdev)))`
`3771`	`3771`	`discard_supported = true;`
	`3772`	`+ first = 0;`
`3772`	`3773`	`}`
`3773`	`3774`
`3774`	`3775`	`if (mddev->queue) {`
`@@ -4172,6 +4173,7 @@ static int raid10_start_reshape(struct mddev *mddev)`
`4172`	`4173`	`if (first \|\| diff < min_offset_diff)`
`4173`	`4174`	`min_offset_diff = diff;`
`4174`	`4175`	`}`
	`4176`	`+ first = 0;`
`4175`	`4177`	`}`
`4176`	`4178`
`4177`	`4179`	`if (max(before_length, after_length) > min_offset_diff)`