From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04269C3A5A2 for ; Sun, 22 Sep 2019 19:28:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CDA9D206C2 for ; Sun, 22 Sep 2019 19:28:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569180488; bh=cJprQ2OblI9iEzh9eo9uHXgZQJr/iyLO55MZ5AYFf+Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zImSSz4XINatDCAokluduyKzWHyCGjuAAk16lHN+QIN4RhMEwaA9VNaIs1O1Gd7m9 DllEiaSYcezz7+yhOJffnvk4bjxCtm+ZVBJHJ5l+zDb6HFqlhlswSKOHd2+JJs5vGd H2S6Qq/hJ2PnwNiAI+ra/TJQ5r2nXQ/+OLldc1+E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404708AbfIVT2I (ORCPT ); Sun, 22 Sep 2019 15:28:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:48236 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404153AbfIVSux (ORCPT ); Sun, 22 Sep 2019 14:50:53 -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 DF363208C2; Sun, 22 Sep 2019 18:50:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178252; bh=cJprQ2OblI9iEzh9eo9uHXgZQJr/iyLO55MZ5AYFf+Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iERvYUZn2BEIzyzhFhKWs9m5qB1Q3wsKGMjuxs3XfDpnZAzHcQ1SEZbJWMAjrF8/I 25DCPRDp4GwAaBksbz8LLivghRaL9VKB9fUFocjPU8Sy5FkJiKyec3cQz2VEKMGFFK obyuPiY0Wrk3Kcyif4joaIYJS0rCx6Tbzdo6boKs= 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.2 044/185] md: don't set In_sync if array is frozen Date: Sun, 22 Sep 2019 14:47:02 -0400 Message-Id: <20190922184924.32534-44-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184924.32534-1-sashal@kernel.org> References: <20190922184924.32534-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Guoqing Jiang [ Upstream commit 062f5b2ae12a153644c765e7ba3b0f825427be1d ] When a disk is added to array, the following path is called in mdadm. Manage_subdevs -> sysfs_freeze_array -> Manage_add -> sysfs_set_str(&info, NULL, "sync_action","idle") Then from kernel side, Manage_add invokes the path (add_new_disk -> validate_super = super_1_validate) to set In_sync flag. Since In_sync means "device is in_sync with rest of array", and the new added disk need to resync thread to help the synchronization of data. And md_reap_sync_thread would call spare_active to set In_sync for the new added disk finally. So don't set In_sync if array is in frozen. Signed-off-by: Guoqing Jiang Signed-off-by: Song Liu Signed-off-by: Sasha Levin --- drivers/md/md.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 5e885b6c4240d..b3bfac5f2bdb6 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -1754,8 +1754,15 @@ static int super_1_validate(struct mddev *mddev, struct md_rdev *rdev) if (!(le32_to_cpu(sb->feature_map) & MD_FEATURE_RECOVERY_BITMAP)) rdev->saved_raid_disk = -1; - } else - set_bit(In_sync, &rdev->flags); + } else { + /* + * If the array is FROZEN, then the device can't + * be in_sync with rest of array. + */ + if (!test_bit(MD_RECOVERY_FROZEN, + &mddev->recovery)) + set_bit(In_sync, &rdev->flags); + } rdev->raid_disk = role; break; } -- 2.20.1