From patchwork Mon Feb 26 03:14:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Nan X-Patchwork-Id: 206197 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1846118dyb; Sun, 25 Feb 2024 19:21:35 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVKu/xtH+dB/LTwTEIBvl/kJ3gpA9b+Sa6fihULLoVcLBZY5+lxJlwsDyzqF17V1MybNJLqeF/C6lsAa/HSK7hG1J0+Mg== X-Google-Smtp-Source: AGHT+IFx8mHbPwVFvFdYGjQ6Oq8HDS29zO9ISpnHsAMCExSMcshOMEDL74jfh/ZI5K3qbLZHPU+5 X-Received: by 2002:a17:906:c35a:b0:a40:75e8:388b with SMTP id ci26-20020a170906c35a00b00a4075e8388bmr3903299ejb.7.1708917695161; Sun, 25 Feb 2024 19:21:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708917695; cv=pass; d=google.com; s=arc-20160816; b=YdHoVctvO8+0CLJM4dO8Iwv7czFLp728MtULYNgwyo5h7f4iyldg3ALvgyOquwzO8z /weOZcop4eWFpO/8/Qg4mnr7eGA4GFdRHD8fmtdNXnFSgVzCjIxmllJ/DVPGku9tC7vx qqzXIqKsD7u6bCB2/vbRWueJG9Iikk3/TB5Rjye4SIwTZp9PaH2Et2IutSomSDSQ1XK6 XIe3AeQ5o9lAUSHmSJvkxCvKa5F8187qDHGkzmoePORQ2CUf02ZlvDMbagVDCVGguO27 NyPch0uwmOp96VIwWNwGEN5cK/AyHLgsl3dwE1OoDSU222B5J9d2eHSNxv3y8J5S++3Y 6t3g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=k5Gkhyfv5gbVA2QB5BVZoZTyVzf0PKa7OnoPycChN04=; fh=0dNtsen0Y4Fayp56GvNYBSuoU/QTeuYBQcKGxWKzWhY=; b=PqjiTIhHdUoutqj5FiaffYPP5Kw+RjTSSpl/vudHQvkEwkwVzav5D18FTcFgoMcj8n oTZgiLneUA0OP2+wO2OORK5tzkPmDWzfx5gWatvfuR7QPnP8UUYsjHwlWySTaCYnEuKs lavxi54gudp/dPMxieJ9JlbLbsBD+DKa8EqF4FRBmrLutBYinLjisyHCBejRFbayR7di Md4mdOn+DDBu6Aa43pjNZKiBEzAhn7IEdtPJAtyrQpSj8MJbL85sD1iy4WnKcgNIXPbP 77Wkw+6x5iBuwYvEm7RCpkJCBtSP2LfyPW4jv5sH6TDuuMUW2v3S7gWUe2v/YOCKpFhg LBNA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=huaweicloud.com); spf=pass (google.com: domain of linux-kernel+bounces-80458-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80458-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id lj9-20020a170906f9c900b00a436ce1df88si139514ejb.278.2024.02.25.19.21.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 19:21:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80458-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=huaweicloud.com); spf=pass (google.com: domain of linux-kernel+bounces-80458-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80458-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id C42FF1F21805 for ; Mon, 26 Feb 2024 03:21:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 34DE51BC5C; Mon, 26 Feb 2024 03:20:43 +0000 (UTC) Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F24CFC01; Mon, 26 Feb 2024 03:20:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708917641; cv=none; b=iOE8HzHyItl+6C7dDMG8kXkNeZQqDRALQeMZ3i6SY/ecWtci82hCIHCDjpzU/FPjYPRGnJEUs9sCxXKfohjOY0kWXeV/UtI5fBTMavTVNS3q8eKVTCF2xhUelh6eHA4NDWZ7VLyXaLvOhr0Qf/tPrkI+a46MIxKTOUDwMnPkmJY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708917641; c=relaxed/simple; bh=1bQJKUbAUkdTVO2ljkK0W4IJmvN3PSmZ03oQs3equl4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JzxbHt9M5wD1lQ02uNi/N+ni+/AgAsEorx+rVqP4wxBnKl1vQBQ2aWMRbZ3tIDkgGsLj759yJJ8QRO211nRY9hXRlH6ikGWqm0GwjTQmXIRq9Y4CmXIyFMH9RvBx7vW/9sfzgYJmUJ9ScQqxuCyQpxRj12tHK55mIcH+ToCtwwc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Tjm8X3s6Dz4f3mHk; Mon, 26 Feb 2024 11:20:28 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id C8F501A0175; Mon, 26 Feb 2024 11:20:35 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP1 (Coremail) with SMTP id cCh0CgAX5g5_A9xl7gKzFA--.13921S8; Mon, 26 Feb 2024 11:20:35 +0800 (CST) From: linan666@huaweicloud.com To: song@kernel.org, shli@fb.com, neilb@suse.com Cc: mariusz.tkaczyk@linux.intel.com, linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, linan666@huaweicloud.com, yukuai3@huawei.com, yi.zhang@huawei.com, houtao1@huawei.com, yangerkun@huawei.com Subject: [PATCH v7 4/9] md: return directly before setting did_set_md_closing Date: Mon, 26 Feb 2024 11:14:39 +0800 Message-Id: <20240226031444.3606764-5-linan666@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240226031444.3606764-1-linan666@huaweicloud.com> References: <20240226031444.3606764-1-linan666@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: cCh0CgAX5g5_A9xl7gKzFA--.13921S8 X-Coremail-Antispam: 1UD129KBjvJXoW7tFWfXw43AF4xGw15Jw4UXFb_yoW8Aw4UpF ZagF9xtrWUJr95Kr1UJa9YvFyYqw12kFZ2kryxGFyUZFy7ArsxZr1Fg3yFqr95u34kArW5 t3W7Ja1rWa4xWrUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUQY14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAac4AC62xK8xCEY4vEwIxC4wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErc IFxwACI402YVCY1x02628vn2kIc2xKxwAKzVCY07xG64k0F24l42xK82IYc2Ij64vIr41l 4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67 AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8I cVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwCI42IY6xAIw20EY4 v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AK xVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUbxR67UUUUU== X-CM-SenderInfo: polqt0awwwqx5xdzvxpfor3voofrz/ X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791930081398806589 X-GMAIL-MSGID: 1791930081398806589 From: Li Nan There is nothing to do at 'out' before setting 'did_set_md_closing' in md_ioctl(). Return directly, and it will help us to remove 'did_set_md_closing' later. Signed-off-by: Li Nan --- drivers/md/md.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 6432bdbddb1c..08b0f80274c0 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -7625,26 +7625,19 @@ static int md_ioctl(struct block_device *bdev, blk_mode_t mode, switch (cmd) { case GET_ARRAY_INFO: if (!mddev->raid_disks && !mddev->external) - err = -ENODEV; - else - err = get_array_info(mddev, argp); - goto out; + return -ENODEV; + return get_array_info(mddev, argp); case GET_DISK_INFO: if (!mddev->raid_disks && !mddev->external) - err = -ENODEV; - else - err = get_disk_info(mddev, argp); - goto out; + return -ENODEV; + return get_disk_info(mddev, argp); case SET_DISK_FAULTY: - err = set_disk_faulty(mddev, new_decode_dev(arg)); - goto out; + return set_disk_faulty(mddev, new_decode_dev(arg)); case GET_BITMAP_FILE: - err = get_bitmap_file(mddev, argp); - goto out; - + return get_bitmap_file(mddev, argp); } if (cmd == HOT_REMOVE_DISK) @@ -7660,13 +7653,11 @@ static int md_ioctl(struct block_device *bdev, blk_mode_t mode, mutex_lock(&mddev->open_mutex); if (mddev->pers && atomic_read(&mddev->openers) > 1) { mutex_unlock(&mddev->open_mutex); - err = -EBUSY; - goto out; + return -EBUSY; } if (test_and_set_bit(MD_CLOSING, &mddev->flags)) { mutex_unlock(&mddev->open_mutex); - err = -EBUSY; - goto out; + return -EBUSY; } did_set_md_closing = true; mutex_unlock(&mddev->open_mutex);