From patchwork Sun Aug 20 09:09:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 136270 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp2529166vqi; Sun, 20 Aug 2023 08:26:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFPjvdK3qWFIZbqZOctSayzG2TzoBq0oG5K8zF51iLKJklsiJVO3GBxiDWNmxz/7Uyx8P8z X-Received: by 2002:a05:6a20:3d0e:b0:13e:2080:aba2 with SMTP id y14-20020a056a203d0e00b0013e2080aba2mr3504054pzi.38.1692545202839; Sun, 20 Aug 2023 08:26:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692545202; cv=none; d=google.com; s=arc-20160816; b=ZYOiGiyuV00nA5rU0+gj+ZnS4WKVvN2xc7pik167VLZa+f+EzbM6TSYgFfeee62YQr vYNj6hjCktMsacFgJ5YdU7WygwfT+uKFXM2yH/FnUTImji3BoiGHQ25t+PoZMedWSdSa TBcrJKYClQPCbU34BoXYv8bOQkRGFBhCfjpSVpxA1573r2K8aoCerIvqsH7sciZK6Sse QrCKlIovgIxOnyOPe7RntvDEx78myquHKrqz1+3HjtkWBkEUGIymgiQEuPxsIvJMFu7h WzJXLdKy6eiT0OWUxK/9iNc4GfNdqrnwAq0sv/0e3mrotiaTjpspHMA2ImGyExXw/sMg ETpA== 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=k+z+3vk7oFXLeNB976o3HCRRM+8HfAcQSRFXYqHvJnE=; fh=wYpPkfz5NmnUk5+Qk0ITITcjVIikaKAb2203DIB6KT8=; b=Uny/DbRq5hV1m8mN2c3CrNqq5o7RM4Ptw64oZv7q3rPGZoLggwSMxeDiBqIvqnVW1C HyZcuD7YrbjdjknlkiOJ+6HNDEp5ENWmMX4lhLu98jeJcZCbTw3QA6wK5DucRmo2fSmr +6WfQUd+OLcExoqkXM2KSzxScHy3paUaNLAWQ3vpQZUJQ6Kli9Di0zkb55NGK1o6Ocve K8jgVtFeJiCRttqRhs3GfoxP8EHo6DDFhYjmSDiKvgQCGWTTWYcrlpq0s1pVejfU6YF7 yzpHOS1fXh6edPpH0PbfZZhz6fBqUdXKRJ6dFvPtEvTLdL3t2+ema4UbNpRIDHimPIwj t5VQ== 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 u10-20020a170902e5ca00b001b6680bc871si5660460plf.445.2023.08.20.08.26.29; Sun, 20 Aug 2023 08:26:42 -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 S230224AbjHTJQe (ORCPT + 99 others); Sun, 20 Aug 2023 05:16:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230200AbjHTJQ2 (ORCPT ); Sun, 20 Aug 2023 05:16:28 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 322BD49F8; Sun, 20 Aug 2023 02:13:51 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4RT8zs1FVRz4f3tCp; Sun, 20 Aug 2023 17:13:45 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgAnBahH2eFkmXibBA--.44158S9; Sun, 20 Aug 2023 17:13:48 +0800 (CST) From: Yu Kuai To: song@kernel.org, xni@redhat.com, mariusz.tkaczyk@linux.intel.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 v3 5/7] md: factor out a helper rdev_is_spare() from remove_and_add_spares() Date: Sun, 20 Aug 2023 17:09:47 +0800 Message-Id: <20230820090949.2874537-6-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230820090949.2874537-1-yukuai1@huaweicloud.com> References: <20230820090949.2874537-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAnBahH2eFkmXibBA--.44158S9 X-Coremail-Antispam: 1UD129KBjvJXoW7Kr47Kr4xtr13KF4fCF1fCrg_yoW8GF17pa ySgFWYkw4UZa4jga1qgryUGa43Ka10g3yIkFyfCa4fZas8Jry5Kw4rCF90qwn8AFWFvF4Y vF4Utw4kC3WFgF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 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, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE 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: 1774762278971924867 X-GMAIL-MSGID: 1774762278971924867 From: Yu Kuai There are no functional changes, just to make the code simpler and prepare to delay remove_and_add_spares() to md_start_sync(). Signed-off-by: Yu Kuai --- drivers/md/md.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index ceace5ffadd6..11d27c934fdd 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -9169,6 +9169,14 @@ static bool rdev_removeable(struct md_rdev *rdev) return true; } +static bool rdev_is_spare(struct md_rdev *rdev) +{ + return !test_bit(Candidate, &rdev->flags) && rdev->raid_disk >= 0 && + !test_bit(In_sync, &rdev->flags) && + !test_bit(Journal, &rdev->flags) && + !test_bit(Faulty, &rdev->flags); +} + static int remove_and_add_spares(struct mddev *mddev, struct md_rdev *this) { @@ -9217,13 +9225,10 @@ static int remove_and_add_spares(struct mddev *mddev, rdev_for_each(rdev, mddev) { if (this && this != rdev) continue; + if (rdev_is_spare(rdev)) + spares++; if (test_bit(Candidate, &rdev->flags)) continue; - if (rdev->raid_disk >= 0 && - !test_bit(In_sync, &rdev->flags) && - !test_bit(Journal, &rdev->flags) && - !test_bit(Faulty, &rdev->flags)) - spares++; if (rdev->raid_disk >= 0) continue; if (test_bit(Faulty, &rdev->flags))