From patchwork Thu Aug 3 13:24:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 130599 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1152755vqx; Thu, 3 Aug 2023 06:35:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlFZGlouO4kfafjgUlAMmxlwlh9Uhjysze508tTqKgKK2suWu9teuuZ+leU9qsJAFKO+0e67 X-Received: by 2002:a05:6a00:2e11:b0:686:32aa:e72f with SMTP id fc17-20020a056a002e1100b0068632aae72fmr24863298pfb.14.1691069740912; Thu, 03 Aug 2023 06:35:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691069740; cv=none; d=google.com; s=arc-20160816; b=NXZbr2YSe867rwkCj2CG4BO4GF7vWgRbHme82WZpdUtXD7GBXJv1F+7SJOMmImcKUZ nz3erA3dD1FhU4tD3KUs0GUgsqoLHuMts1ezoLsnL0VA1M306OsjD5QhDG8AfXMa3oRK NHNpFd552egVI9ikPy8utU5rEnNaoPuvFguLWg0lemsARJKkcVPA1qSIA/SP9hYdpg+4 v5RiSVzZyJrFPqwXfQ56lbzJEeNHoRIVmNbG7OM00crU9K04qudMLrogr9mWCU7KruGC f0F8yzZ+Cd6tlrZ4urlnehx/zT/vBhZgxoxXGPRRCvUHPZ+YNjnQNviMNITsPWkh+aOl QUUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=vnaq4yZnSsYVikJZdIJ2W+14bEefkjZjzlmgrI/xuYU=; fh=Ktvf84aTmiKPjIiQsnocICsaz7FvZSNYviQ4CE4oKUo=; b=G8Us7PAee0O6H28Nx1L3HPtcxi+k8UM+AGi0ypWVb9KAetVNvhVI6VKz+PFnOMMQWb IyGii1LKJb7Fs3UedAbhkFsNtbC8tYbmBbgUqRdBx0RyPTHSZcOBhikoooufvZW8PGN2 tVwhuUj9pbxCtSNEtOwJ8YIxwbysFKAlYE63pYUwiWzzoMgHyrQnrqmrSJ/gfv/BDmgL vFN7TlWWqug5kVjBLKkHUR7uxt6NRR0VL6DFRf3f9qfHSOTUKfnyA8405B1HgYnmscG/ eloNVZqwCrIzIt4maRgDX7iVuvLajnruCB4Ai5NyD54KMqlLGdKh/kl5j6dpY2dh9klS MQcg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s33-20020a056a0017a100b006871a4b2295si9767405pfg.402.2023.08.03.06.35.26; Thu, 03 Aug 2023 06:35:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234640AbjHCN1s (ORCPT + 99 others); Thu, 3 Aug 2023 09:27:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235461AbjHCN1f (ORCPT ); Thu, 3 Aug 2023 09:27:35 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1216E212B; Thu, 3 Aug 2023 06:27:33 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RGqQS5Rv1z4f46Sg; Thu, 3 Aug 2023 21:27:28 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgCnD7M6q8tk5SrlPQ--.7420S10; Thu, 03 Aug 2023 21:27:29 +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 06/13] md: factor out a helper hot_add_rdev() from remove_and_add_spares() Date: Thu, 3 Aug 2023 21:24:19 +0800 Message-Id: <20230803132426.2688608-7-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 X-CM-TRANSID: gCh0CgCnD7M6q8tk5SrlPQ--.7420S10 X-Coremail-Antispam: 1UD129KBjvJXoW7Kr47Kr4xtr47XF1kZw47urg_yoW8WFWfpa 1SgFy5Kr47ZryfXa1DtF1DGFy5tF1IgrWIkFyak3yfZasxZr98K3WrXFyYq3s8AFZ09F4r Xa15tw4Uu347WF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,KHOP_HELO_FCRDNS, MAY_BE_FORGED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773215144664636071 X-GMAIL-MSGID: 1773215144664636071 From: Yu Kuai There are no functional changes, just to make the code simpler and prepare to refactoer remove_and_add_spares(). Signed-off-by: Yu Kuai --- drivers/md/md.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 74ee31f2706b..77c48f7b605c 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -9196,6 +9196,26 @@ static bool hot_remove_rdev(struct md_rdev *rdev) return true; } +static bool hot_add_rdev(struct md_rdev *rdev) +{ + struct mddev *mddev; + + if (!rdev_addable(rdev)) + return false; + + if (!test_bit(Journal, &rdev->flags)) + rdev->recovery_offset = 0; + + mddev = rdev->mddev; + if (mddev->pers->hot_add_disk(mddev, rdev)) + return false; + + sysfs_link_rdev(mddev, rdev); + md_new_event(); + set_bit(MD_SB_CHANGE_DEVS, &mddev->sb_flags); + return true; +} + static int remove_and_add_spares(struct mddev *mddev, struct md_rdev *this) { @@ -9222,18 +9242,8 @@ static int remove_and_add_spares(struct mddev *mddev, continue; if (rdev_is_spare(rdev)) spares++; - if (!rdev_addable(rdev)) - continue; - if (!test_bit(Journal, &rdev->flags)) - rdev->recovery_offset = 0; - if (mddev->pers->hot_add_disk(mddev, rdev) == 0) { - /* failure here is OK */ - sysfs_link_rdev(mddev, rdev); - if (!test_bit(Journal, &rdev->flags)) - spares++; - md_new_event(); - set_bit(MD_SB_CHANGE_DEVS, &mddev->sb_flags); - } + if (hot_add_rdev(rdev) && !test_bit(Journal, &rdev->flags)) + spares++; } no_add: if (removed)