From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 242D8C5B543 for ; Thu, 5 Jun 2025 13:17:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7FD136B009D; Thu, 5 Jun 2025 09:17:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 781BF6B0500; Thu, 5 Jun 2025 09:17:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 57BA66B04EE; Thu, 5 Jun 2025 09:17:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 2A4A26B00A3 for ; Thu, 5 Jun 2025 09:17:08 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id CC7891003E0 for ; Thu, 5 Jun 2025 13:17:07 +0000 (UTC) X-FDA: 83521397694.08.8373F47 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf22.hostedemail.com (Postfix) with ESMTP id C163BC0003 for ; Thu, 5 Jun 2025 13:17:02 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; spf=pass (imf22.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749129426; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=15hvTRpON7kjoJTolFnIwxmEh7lOAOqXgZzAA0S5Cm8=; b=QHd9t9NCYaGEv9gwZUiFJnOCLyaaFBvOH5POVN7GxM5Avsd2JSfE8dmY6czl36ev/NefWQ BN7PDy2tDPmSdMO3qQEzwMUGvLYvZZfZeamU9gYOYFqIlYZrgVLV/XU3Sh8ZnndwaHibas wWBAjqdEepuQ1OgmAlZH1imQIBdIo94= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; spf=pass (imf22.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749129426; a=rsa-sha256; cv=none; b=wyV1W+gmfKkm+mV+hVCJS/N04cNfMT8oyQEJsYLbnFtQYc4AMZ7p4kT2DrSNo90lkERYcS C8qvFNh0sA/DGxvzjS1Nr7j15YGClzTR5+sMlZrxT0DvYwyVBE7KzD1OTLKjrGhovH2swa tzJSXrqRJ3Zdi/OSO58Cyzjk70lYyw0= Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTPS id 4bClNF02HFzKHNDJ for ; Thu, 5 Jun 2025 21:17:01 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id 617851A0848 for ; Thu, 5 Jun 2025 21:16:59 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP1 (Coremail) with SMTP id cCh0CgDnTH3HmEFobD9lOQ--.29489S8; Thu, 05 Jun 2025 21:16:59 +0800 (CST) From: Kemeng Shi To: hughd@google.com, baolin.wang@linux.alibaba.com, willy@infradead.org, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 6/7] mm: shmem: simplify error flow in thpsize_shmem_enabled_store() Date: Fri, 6 Jun 2025 06:10:36 +0800 Message-Id: <20250605221037.7872-7-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250605221037.7872-1-shikemeng@huaweicloud.com> References: <20250605221037.7872-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:cCh0CgDnTH3HmEFobD9lOQ--.29489S8 X-Coremail-Antispam: 1UD129KBjvdXoW7XF4fKrWkJF4UWw1Dtr1UJrb_yoWDtFc_CF yjqF9rWr47Ww4kKF1Ykw42qr9YgFWDuryqgry8tFWak34DXrZ7Jr4DXrWYvryxXayrWF95 Canavasagw1DWjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbqkYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY1x0262kKe7 AKxVWUAVWUtwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02 F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw 1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7Cj xVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r 1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07ja g4hUUUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: C163BC0003 X-Stat-Signature: bms1e7ddn6pfzw5trq37bmbazcsci63n X-Rspam-User: X-HE-Tag: 1749129422-586768 X-HE-Meta: U2FsdGVkX1/nzUJEsUO/WMznDxfY7aOCt1EFfKGgSLKgLpY4scodcP9cZJsf6lxRN8S5Q8V2mUGd/6EiqoK+3+RLMdCQitzM7OyQD1RwLQGQbfpgxfmugKL51AnNFoKNS+dO44cf0wAdHp6Ep4WgD5bXwg0NSXKzKhC1MuAWIDRoXaay/mHg0Hx+26aMjM64Rfet45EugNGNCo4YDi9dsY0tPg3VO8IdjVWkSL+0dxORMI4SN2KNrRiYgvcjfqAtACShN51meQQ9w3ZZ17WwJXrgcJBqntAWCjpCqxM1kEPyl6J6Dd7FHRsdKoHzuabU2GrSTI59TorNtiTa5WcSeJgGowtxFrwghS0VjQJvvXs8seyV+cMdalgH3fZ51KY/osFhg8YMPt3pgvXWiRSRdAtoaD3MPDxW2OW8RpFaR/p5XpInns7sLjf+Eb4em2SOus6zZS9xR45c7Ji3DHPIHqJmlTLBO1U3Ev9U4nIDVM5H57f3oNuYYdQfEfonH0sf+XdxUEvgznBCjW1HL1eYpT1ANigcB+p48UkJa2Z6zi66phnMJ5zC/wsI1Xg/QEMyocTlmmSyc64v+s2k3A+mT8ruO76T7+rBv0CX14Ko2ZIRFAiPZZU/1ONKa70g7LKYTPXsvnpmSmD9hP7WlT5uYKIu99VeqV3dYqtF0R1Du+V9fAPK++Q7+WeC54rKnK5sPJ3x+QxIZCJPPxCQViAUddF8Fdwo2vew+5RdjmRn/JQ/eMEd9kCLMl/B9CaQNmYHYqb369Ka+IQbzwWvMA8pz25axDOhGhfuc5ysZOFUpMpMrpi+AWpOY6FN3uIJ9pSeo9i6YZkteP6yoxFAdHdmNWvwqBCLTwrDcE31wblQWeFgu9jV3wsiBPmgtyfw48dw4A1HdjBesYyI04YhnHsemINbTo+ARjrEbV1jZ5ShEwhyqgZp6GZkTnVPsdkQlqOnwj9I3baykbrN/9pK/NN JMhdG+mV K2xgOKFZZa4+AiTBOmuZWAhbHkSlf41889INsG+7kB/7YuaHKpi0eIA744nw7MUr7EnZiDf8p7dnofqc+Z2zounW/HACwWm6q6KUTf5Iy4zI8gK/Ta+9953dLuOjpjPSyV/c8lkJvBU7Poy5Ml7sd+hsA3eTWKljz7QBj1lSoFLYNZ3xtV94CeyeJhBhx69Nu90kWIx9A4X3zc+6MrDHC16kAbA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Simplify error flow in thpsize_shmem_enabled_store(). Signed-off-by: Kemeng Shi --- mm/shmem.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index e3e05bbb6db2..c6ea45d542d2 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -5601,7 +5601,7 @@ static ssize_t thpsize_shmem_enabled_store(struct kobject *kobj, const char *buf, size_t count) { int order = to_thpsize(kobj)->order; - ssize_t ret = count; + int err; if (sysfs_streq(buf, "always")) { spin_lock(&huge_shmem_orders_lock); @@ -5644,16 +5644,14 @@ static ssize_t thpsize_shmem_enabled_store(struct kobject *kobj, clear_bit(order, &huge_shmem_orders_madvise); spin_unlock(&huge_shmem_orders_lock); } else { - ret = -EINVAL; + return -EINVAL; } - if (ret > 0) { - int err = start_stop_khugepaged(); + err = start_stop_khugepaged(); + if (err) + return err; - if (err) - ret = err; - } - return ret; + return count; } struct kobj_attribute thpsize_shmem_enabled_attr = -- 2.30.0