Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3036650ybj; Mon, 23 Sep 2019 13:39:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqyYawuRFkn7OaF40+PcoGvNVfWkaTs0EmhCIl1uiTVzMjh+RoJrdx74+RpdljIjsRFneUVW X-Received: by 2002:a17:906:938b:: with SMTP id l11mr1512980ejx.67.1569271193926; Mon, 23 Sep 2019 13:39:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569271193; cv=none; d=google.com; s=arc-20160816; b=mAU9wB+diNAEjrW1ThjG+Zr0bOS1C/Rj0bQbtLG4ipM3MmReZ/yPfUD87Mz6EDMzNh WuPMI2f71rYcqxALy0NruFNtW+wNfNWdFGGUqxu5IVpI6jF21zKavMz/EE2u73TsxPqE PjCAAZ8Ur7cO8y46Zca9n5neloEvxBWO2/QMra70rIzmtlHEg3GPNQALp4PQUrBUB63x 1ooCJHUXK8acVwC7onUv2ozPXhz21gEinZ3bbbXZGGm17xcyT8on4K6iaVx1Qd4PBsva XE03KEiONzsoTSkRonSV+BDRxvwzQgKGAmoRGwEOBFNO/RLsB6u74jaU3xIezekWYn2t KVaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dkw/RSBt6RqvFirfRhvIFCN1VJXi6aB5UXX0lDAQiSg=; b=FiuBt9QPPslC1UQ1TTU+NhT8aXHwPq5oX0GicOgTCH70kG0GVO9Z/WTZTSmijHFeZe OkEYW6dxJVQC9suAervDw0s+wlMq3KHbWTsVi0H49sWofqhFs0NxujgipR/ycoUdaVwA NQ2iZxkPcIa1KZZMjJzJthglRGw1qyEK8n4qdhE+eyb1pZb9znAbPupt30MWFxTgAo96 oU0yKXzQTPhGi7q8qM7tatJ4LcZkDweM9gENYdahLe8Ytt2QmDHgRv6xNVVXQQbmYOSs 3mWsoUJqHn0Jd+9L/keCce3jqSFwc9eUyJrQBgESuJrnE7AFTIKON1VB+VCDCLRLKXQ4 xgsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ViMI0aGE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w5si7442359eds.179.2019.09.23.13.39.30; Mon, 23 Sep 2019 13:39:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ViMI0aGE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389581AbfIVSpq (ORCPT + 99 others); Sun, 22 Sep 2019 14:45:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:41432 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389547AbfIVSpn (ORCPT ); Sun, 22 Sep 2019 14:45:43 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1101D2196E; Sun, 22 Sep 2019 18:45:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177942; bh=c0HS9vBTQOn2wgK3HorCqLxirZgXOoitDmt8CKIkcZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ViMI0aGE88mihPcGM+NypivROnrHv0YwbayqhUv7FAQbKgCBLqNqeBlRhhDchsRi9 Uj+DONrqmVxeL0DKaYG+0WZMcVvQucVR3gPAee9VdFXviIK7Cd69TuKxAQArBw1HRS O5oqBS+aBLzs4vEGF9PEZer5D6+YxBuPMaqcl18M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Guoqing Jiang , Guoqing Jiang , Song Liu , Sasha Levin , linux-raid@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 051/203] md: don't call spare_active in md_reap_sync_thread if all member devices can't work Date: Sun, 22 Sep 2019 14:41:17 -0400 Message-Id: <20190922184350.30563-51-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guoqing Jiang [ Upstream commit 0d8ed0e9bf9643f27f4816dca61081784dedb38d ] When add one disk to array, the md_reap_sync_thread is responsible to activate the spare and set In_sync flag for the new member in spare_active(). But if raid1 has one member disk A, and disk B is added to the array. Then we offline A before all the datas are synchronized from A to B, obviously B doesn't have the latest data as A, but B is still marked with In_sync flag. So let's not call spare_active under the condition, otherwise B is still showed with 'U' state which is not correct. Signed-off-by: Guoqing Jiang Signed-off-by: Song Liu Signed-off-by: Sasha Levin --- drivers/md/md.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 24638ccedce42..fd62be3ca2871 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -9043,7 +9043,8 @@ void md_reap_sync_thread(struct mddev *mddev) /* resync has finished, collect result */ md_unregister_thread(&mddev->sync_thread); if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery) && - !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)) { + !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery) && + mddev->degraded != mddev->raid_disks) { /* success...*/ /* activate any spares */ if (mddev->pers->spare_active(mddev)) { -- 2.20.1