aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaohua Li <shli@fb.com>2017-05-01 12:15:07 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-03-24 10:58:45 +0100
commit0f4e3e9a7d3b50235740c6161d6ac1d9d7d16bbd (patch)
tree5301ce80c885e3437dd2a16d5359e36cc5323f2f
parente0da44317fe27a6c255ac31987982a15592a9a20 (diff)
downloadlinux-linaro-stable-0f4e3e9a7d3b50235740c6161d6ac1d9d7d16bbd.tar.gz
md/raid10: skip spare disk as 'first' disk
[ Upstream commit b506335e5d2b4ec687dde392a3bdbf7601778f1d ] Commit 6f287ca(md/raid10: reset the 'first' at the end of loop) ignores a case in reshape, the first rdev could be a spare disk, which shouldn't be accounted as the first disk since it doesn't include the offset info. Fix: 6f287ca(md/raid10: reset the 'first' at the end of loop) Cc: Guoqing Jiang <gqjiang@suse.com> Cc: NeilBrown <neilb@suse.com> Signed-off-by: Shaohua Li <shli@fb.com> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/md/raid10.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 05548af8df6f..3a0d557146c7 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -4044,6 +4044,7 @@ static int raid10_start_reshape(struct mddev *mddev)
diff = 0;
if (first || diff < min_offset_diff)
min_offset_diff = diff;
+ first = 0;
}
}