From patchwork Thu Aug 3 13:29:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 130638 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1169310vqx; Thu, 3 Aug 2023 07:03:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlHgeQ+XylRcat+Rbjj6HqtxBkmD2FwC+ieHyVZvS/PQ2mA59RuOndN0h1H8P8wvZYR8jYAZ X-Received: by 2002:aa7:cb59:0:b0:51e:4439:f476 with SMTP id w25-20020aa7cb59000000b0051e4439f476mr8085878edt.25.1691071434314; Thu, 03 Aug 2023 07:03:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691071434; cv=none; d=google.com; s=arc-20160816; b=eIBZPjCezfK0Kn7dC4rxqTS/iyuEE7Wy1J/esi81PSj5wBL40IV6aLYQMQfHWrqLUU IoJD2N9JJM7Sp3EVBHrQ+FJqMQEyWFP1Q3tz+g1/Prmc/JeEWEZVF+4OUpjCt6ZJvUAI d8h+ZUGxrqSqRWt2+C+rxoL0QtyPJ6kdR3nclipZ/uDWNwvsKCTwADqqxuGrX2gdEu9O JuFEwUJp5ZBeBRPhCMeyhT6GdUcBkKZdRN38yxG/A7BAoDfTZ4k7F38y8PLN0W5EB2gS EE555Jtd9a0DLYKusnueOw9jLrA6eHkmGp6h1OPtV7a7PRYMGBz7zVKwUeRBy+xJ0jw+ RJfg== 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=AWQZoPlNBe6uWLr489Fow42w7amwB6IC4VcV3Hu/Ls4=; fh=Ktvf84aTmiKPjIiQsnocICsaz7FvZSNYviQ4CE4oKUo=; b=fto5/sQ+NN8n6W7Af6GXpw4Wnovox8//N1mwEJrHdstup2vHwj/W0+/cp9ObeLCKeJ qs6Uo8iN/d6LnTi9bNeUawvasyvamojf5ZKXt/KcLIIuuqLwzgchld0rT3RPdecnN8zI biEfoZd8pF9FS+4+lasq3boBkTMvZsXAwPXHH4eVq+JXJ8tRLUJBI76a6cODIjcc/h+c PcEggm8Zp1L8mvFWUjc/A6VJR0UheU+sG4LVGxwlSfYypA9/aXNbzCJpt+9upG+qCQ99 I64lcFyCgdQ44XQAeyEnt3n1xP9+AIWx4ugw0ZhupvuQmxPISNvEac0Bd96ak/eBA47r QWdQ== 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 l1-20020a056402028100b00522def174desi3377712edv.369.2023.08.03.07.03.23; Thu, 03 Aug 2023 07:03:54 -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 S236361AbjHCNev (ORCPT + 99 others); Thu, 3 Aug 2023 09:34:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235889AbjHCNds (ORCPT ); Thu, 3 Aug 2023 09:33:48 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48B2C4C3F; Thu, 3 Aug 2023 06:32:35 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RGqXJ1HM7z4f46Rd; Thu, 3 Aug 2023 21:32:32 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgAHuKtqrMtkWHLlPQ--.49699S18; Thu, 03 Aug 2023 21:32:32 +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 14/29] md/raid5: use new apis to suspend array for raid5_store_skip_copy() Date: Thu, 3 Aug 2023 21:29:15 +0800 Message-Id: <20230803132930.2742286-15-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230803132930.2742286-1-yukuai1@huaweicloud.com> References: <20230803132930.2742286-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHuKtqrMtkWHLlPQ--.49699S18 X-Coremail-Antispam: 1UD129KBjvdXoWrZFWUZF4ftFWrKr4rXrWkJFb_yoWkurc_K3 Z3uFW3JrySgry5Xw15G3WfZr18ta1kWwn7Xa4YyayjvrW5XF1rKr95Xr4rJrs2vFy2grWU Kry0vw4UZr4jgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbf8FF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2 IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28E F7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr 1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0D M2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjx v20xvE14v26r1Y6r17McIj6I8E87Iv67AKxVW8JVWxJwAm72CE4IkC6x0Yz7v_Jr0_Gr1l F7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMx C20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAF wI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20x vE14v26ryj6F1UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UMIIF0xvE42xK8VAv wI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14 v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7VUbeMKtUUUUU== 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: 1773216920447933906 X-GMAIL-MSGID: 1773216920447933906 From: Yu Kuai Convert to use new apis, the old apis will be removed eventually. This is not hot path, so performance is not concerned. Signed-off-by: Yu Kuai --- drivers/md/raid5.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 624899e95b4d..b8dd23357430 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -7151,7 +7151,7 @@ raid5_store_skip_copy(struct mddev *mddev, const char *page, size_t len) return -EINVAL; new = !!new; - err = mddev_lock(mddev); + err = mddev_suspend_and_lock(mddev); if (err) return err; conf = mddev->private; @@ -7160,15 +7160,13 @@ raid5_store_skip_copy(struct mddev *mddev, const char *page, size_t len) else if (new != conf->skip_copy) { struct request_queue *q = mddev->queue; - mddev_suspend(mddev); conf->skip_copy = new; if (new) blk_queue_flag_set(QUEUE_FLAG_STABLE_WRITES, q); else blk_queue_flag_clear(QUEUE_FLAG_STABLE_WRITES, q); - mddev_resume(mddev); } - mddev_unlock(mddev); + mddev_unlock_and_resume(mddev); return err ?: len; }