From nobody Tue Feb 10 16:21:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AAECBEB64DD for ; Thu, 3 Aug 2023 13:28:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236242AbjHCN16 (ORCPT ); Thu, 3 Aug 2023 09:27:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235788AbjHCN1l (ORCPT ); Thu, 3 Aug 2023 09:27:41 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA6F52737; Thu, 3 Aug 2023 06:27:34 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RGqQT2fspz4f3l1p; Thu, 3 Aug 2023 21:27:29 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgCnD7M6q8tk5SrlPQ--.7420S13; Thu, 03 Aug 2023 21:27:30 +0800 (CST) From: Yu Kuai To: song@kernel.org, xni@redhat.com Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH -next 09/13] md: convert to use hot_add_rdev() to hot add one rdev Date: Thu, 3 Aug 2023 21:24:22 +0800 Message-Id: <20230803132426.2688608-10-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230803132426.2688608-1-yukuai1@huaweicloud.com> References: <20230803132426.2688608-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgCnD7M6q8tk5SrlPQ--.7420S13 X-Coremail-Antispam: 1UD129KBjvJXoW7CrWDWw4xWFWfXF1rKw1Utrb_yoW8GF1fp3 yfJasIvrW7Zr43Aa17GFyDWFW5Aw10qrWUtFZxu393X3Wrtr4Fkw15KFyUJ34qyr93XF4r tr15Jr4DCw18CF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9K14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCF04k20xvY0x0EwIxGrw CFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE 14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2 IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMIIF0xvE42xK8VAv wI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14 v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfUOBTYUUUUU X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Yu Kuai Replace remove_and_add_spares() with hot_add_rdev() in check_sb_changes(), also handle the case that hot add rdev failed. Signed-off-by: Yu Kuai --- drivers/md/md.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index de7399769c8d..1dc26bb1e096 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -9773,13 +9773,20 @@ static void check_sb_changes(struct mddev *mddev, s= truct md_rdev *rdev) !(le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE)) { rdev2->saved_raid_disk =3D role; - ret =3D remove_and_add_spares(mddev, rdev2); - pr_info("Activated spare: %pg\n", - rdev2->bdev); - /* wakeup mddev->thread here, so array could - * perform resync with the new activated disk */ - set_bit(MD_RECOVERY_NEEDED, &mddev->recovery); - md_wakeup_thread(mddev->thread); + if (!test_bit(MD_RECOVERY_RUNNING, + &mddev->recovery) && + hot_add_rdev(rdev2)) { + pr_info("Activated spare: %pg\n", + rdev2->bdev); + /* + * wakeup mddev->thread here, so array + * could perform resync with the new + * activated disk. + */ + set_bit(MD_RECOVERY_NEEDED, + &mddev->recovery); + md_wakeup_thread(mddev->thread); + } } /* device faulty * We just want to do the minimum to mark the disk --=20 2.39.2