From patchwork Sat Jul 8 09:21:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 117429 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3843178vqx; Sat, 8 Jul 2023 03:53:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlHkyg/kn7+jZor6EDU8qThPBd9sTzkbKnByt/Kn60JdCYEITGj49KCMGZVu/khDlQSZQmKH X-Received: by 2002:a05:6a00:39a1:b0:666:eaaf:a2af with SMTP id fi33-20020a056a0039a100b00666eaafa2afmr11234335pfb.14.1688813589890; Sat, 08 Jul 2023 03:53:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688813589; cv=none; d=google.com; s=arc-20160816; b=AZ7p51XzR02am38odL6/yhb3M8QFtnBgWcmi9bQ6PJUb6sZLrKmwMPga2Xw8Q4+lRP G+QxLRPC7h9RzK5TfET3Xb/YH5aJA0srLOfdsMt73Vkonl4lLI8ucfC/l2LSytSvmhBU 56RGmoaRrEacSYBjPsOpn0++R/JNfe5l1sVmwUAs+C9NIhvuEleHd6xoEtFx2PT/Vfpo GXoQjPmmi0JRtql5Nyg46LooLzczNCfv5OQSCUXSqEIpTuksMo220nQNQqn722nXwGIA zGaYNGHRo3DdwwdZIdkYscQG5tapGe0ynmm66jPWe4iFYKNQt6ytmU9OBOItbFSIxVD+ VGSA== 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=4gu7b1L0Ym49N8hq5MloEJOzC3JyMVQ5k2szJfHHOME=; fh=0iVuClMjosl55fra1fWIpVkNpY+he3hRsXHe6vRQ37o=; b=uStWzVRcwjoJj1X9I5mddtwkqVC6zEKHjJ7Gd64/G3GT2bS7kK6JJdgTDVYWyJ/pQe gqfc6IB/6Cs69TnkKDd/D7lVGP+6et3OB/C3EN6K7aEZCfnbu/675ezhxHfO0TuQUCya B9kaf1Z0/UT276rZTNZXBGX40QCLa0A/u7rxbfDm2feTnXMrpFWb/3PuBeEhJ5FBDdMl O4FFmAeNeRt4GAC371aoXIh0wQjFETnQVcmPjFZ9WbFjjLzZHMobCdUAEcWuEsC6TeHB 8zezKE1Cs+T9df/L+rYZg0KYIVb3Y5NopRtz7/PINlgHrZ/ipF7UqGAU23gPL5MfkuOX f8Vg== 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 fj10-20020a056a003a0a00b0067a39a4c158si5763612pfb.2.2023.07.08.03.52.57; Sat, 08 Jul 2023 03:53:09 -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 S231565AbjGHJXa (ORCPT + 99 others); Sat, 8 Jul 2023 05:23:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230039AbjGHJX1 (ORCPT ); Sat, 8 Jul 2023 05:23:27 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B55D1BF5; Sat, 8 Jul 2023 02:23:25 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4QylDn3GgGz4f3pFv; Sat, 8 Jul 2023 17:23:21 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgAHuKsHK6lkCfLwNQ--.65417S6; Sat, 08 Jul 2023 17:23:22 +0800 (CST) From: Yu Kuai To: pmenzel@molgen.mpg.de, agk@redhat.com, snitzer@kernel.org, dm-devel@redhat.com, song@kernel.org, heinzm@redhat.com, neilb@suse.de, jbrassow@redhat.com Cc: linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH -next v2 2/3] md/dm-raid: clean up four equivalent goto tags in raid_ctr() Date: Sat, 8 Jul 2023 17:21:52 +0800 Message-Id: <20230708092153.1418570-3-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230708092153.1418570-1-yukuai1@huaweicloud.com> References: <20230708092153.1418570-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHuKsHK6lkCfLwNQ--.65417S6 X-Coremail-Antispam: 1UD129KBjvJXoW7WrykCrWrtw4fGw1fury5XFb_yoW5Jr18pF 4aga9Ikr18X39IgF48Kr4kWFy5Ka4FqryUKrs3CFWrZan09r4agw18GF1UXryUJFyfGa4D AF1UAr4DWay0kaUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPj14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2 x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628vn2kIc2 xKxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8Jw CI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfUFrcTDUUU U X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,KHOP_HELO_FCRDNS, 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770849398618618489?= X-GMAIL-MSGID: =?utf-8?q?1770849398618618489?= From: Yu Kuai There are four equivalent goto tags in raid_ctr(), clean them up to use just one. There is no functional change and is a preparartion to fix an unprotected md_stop(). Signed-off-by: Yu Kuai --- drivers/md/dm-raid.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 4c819d5f93fd..33742f5e7ee5 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c @@ -3251,8 +3251,7 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv) r = md_start(&rs->md); if (r) { ti->error = "Failed to start raid array"; - mddev_unlock(&rs->md); - goto bad_md_start; + goto bad_unlock; } /* If raid4/5/6 journal mode explicitly requested (only possible with journal dev) -> set it */ @@ -3260,8 +3259,7 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv) r = r5c_journal_mode_set(&rs->md, rs->journal_dev.mode); if (r) { ti->error = "Failed to set raid4/5/6 journal mode"; - mddev_unlock(&rs->md); - goto bad_journal_mode_set; + goto bad_unlock; } } @@ -3271,19 +3269,15 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv) /* Try to adjust the raid4/5/6 stripe cache size to the stripe size */ if (rs_is_raid456(rs)) { r = rs_set_raid456_stripe_cache(rs); - if (r) { - mddev_unlock(&rs->md); - goto bad_stripe_cache; - } + if (r) + goto bad_unlock; } /* Now do an early reshape check */ if (test_bit(RT_FLAG_RESHAPE_RS, &rs->runtime_flags)) { r = rs_check_reshape(rs); - if (r) { - mddev_unlock(&rs->md); - goto bad_check_reshape; - } + if (r) + goto bad_unlock; /* Restore new, ctr requested layout to perform check */ rs_config_restore(rs, &rs_layout); @@ -3292,8 +3286,7 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv) r = rs->md.pers->check_reshape(&rs->md); if (r) { ti->error = "Reshape check failed"; - mddev_unlock(&rs->md); - goto bad_check_reshape; + goto bad_unlock; } } } @@ -3304,10 +3297,8 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv) mddev_unlock(&rs->md); return 0; -bad_md_start: -bad_journal_mode_set: -bad_stripe_cache: -bad_check_reshape: +bad_unlock: + mddev_unlock(&rs->md); md_stop(&rs->md); bad: raid_set_free(rs);