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 536E7C5B552 for ; Tue, 10 Jun 2025 05:50:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 386A86B008A; Tue, 10 Jun 2025 01:50:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 336C86B008C; Tue, 10 Jun 2025 01:50:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 163D26B0092; Tue, 10 Jun 2025 01:50:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id E4F726B008A for ; Tue, 10 Jun 2025 01:50:13 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 5E8951A110E for ; Tue, 10 Jun 2025 05:50:13 +0000 (UTC) X-FDA: 83538415506.10.058E68C Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf19.hostedemail.com (Postfix) with ESMTP id B13011A0006 for ; Tue, 10 Jun 2025 05:50:11 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=IyN9QXAi; spf=none (imf19.hostedemail.com: domain of BATV+631296521f62fa6b3e9f+7961+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+631296521f62fa6b3e9f+7961+infradead.org+hch@bombadil.srs.infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=lst.de (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749534611; 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:dkim-signature; bh=EWfztysoS9q0Ohe4ZbDKYOGyK03Dn0jHTk9wrcmOdwg=; b=tnxdZkhNWS3K/HVM2PPqtTVDEsiOHUmkOg8Q/eSOiXJKZXnHw86XK996ID8KYtlN+0+pf9 q9MbUezE5oTijyYVXh+O3BvBnfYO9wfEYU1hb3OFalHJkd3V2fB4R1OcToD0paTzTxK7z4 t49ytJ3KiUYnA95VYC9vHk+/SgBNAUs= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=IyN9QXAi; spf=none (imf19.hostedemail.com: domain of BATV+631296521f62fa6b3e9f+7961+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+631296521f62fa6b3e9f+7961+infradead.org+hch@bombadil.srs.infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=lst.de (policy=none) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749534611; a=rsa-sha256; cv=none; b=NPuAAigCfJ74YGZNTWYt2jjBXn6O7RiCV4bmhAuE1qTIys7nSQsJcmto3lk5UTpJ4T/LP4 IskguwMsp7NLTvo+SkfCEY/CYQ8N06QlnwOWgF9xM7dur1AVyDOyAgy3QVwPJq0I6GI9Ys +IflU+bGFNN65simljh4oA2yGKc3rXM= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=EWfztysoS9q0Ohe4ZbDKYOGyK03Dn0jHTk9wrcmOdwg=; b=IyN9QXAiovsWQVhKqfd8w+N4fx Bu9NUb/sabVLYEFJcBrZwMX3st68ku7fLbd9zybiwhg1lxgdaNGc6tgiLOnWOJmlcPGxBRQNLlT3q +5c8NKrRwFCkuq3oQtJwIxfmsekKWNavVYFzBR6UJUVyTAGvXdjkBzm2IwFAAebSpbUTIDqlvZ6Ng mil0N8GbfVgOIoHUhnPG2vuuVno7JFqWWItqRkbVmOFknvcaKOgmJl5c9x1MXKOA1W8of+ykHoHIS cssDmNBUf0xfQYtIjBPnvi2NuCUfAs69NetfqPaFQzBG8nkeSuF/3inkZThCahoV1SLQrz9r2KSxo wJiRHgTQ==; Received: from 2a02-8389-2341-5b80-d601-7564-c2e0-491c.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:d601:7564:c2e0:491c] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98.2 #2 (Red Hat Linux)) id 1uOrs9-00000005s10-1sOo; Tue, 10 Jun 2025 05:50:09 +0000 From: Christoph Hellwig To: Andrew Morton , Hugh Dickins , Johannes Weiner , Yosry Ahmed , Nhat Pham Cc: Matthew Wilcox , Chengming Zhou , Baolin Wang , linux-mm@kvack.org Subject: [PATCH 3/6] mm: tidy up swap_writeout Date: Tue, 10 Jun 2025 07:49:39 +0200 Message-ID: <20250610054959.2057526-4-hch@lst.de> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250610054959.2057526-1-hch@lst.de> References: <20250610054959.2057526-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Rspam-User: X-Stat-Signature: ht7oemrb3dti3d9m5pwq8girhriostkw X-Rspamd-Queue-Id: B13011A0006 X-Rspamd-Server: rspam11 X-HE-Tag: 1749534611-9664 X-HE-Meta: U2FsdGVkX185Oo4feHHinci5hERLwpFt1fhb1OviM4o1Y6Wxb4gPEIbQhcQ2dy6DSG08ZoMjQspToaz7Q66C5a/nznuec4xKsWEdjqz+5y2r762WF85NjlfRLUVTJtIGpNYzZaBaJ+ZptVdhF4uJ4lKhcwl92vkWGh+82If061rOlUMPEwfByCgEBgztHtCdlRvlBAbHZj1W2ulfnYb5nZ9+SmhcGs/yO6Pzcrres/FUdcYlwRHHGsn0l8D66R4M2y/WNWesceYv/8QyUQYdJgegcN06xyBPtoo2Zfg4jkCWujoyWuBbHXhm0MoJgTPqzIQNX8fLSELvi1NvwSCERRtyGW0qe0wQiQFYkzWBqHkdStoTQG/JHhEwVIbcBBWJ83kpa6yZiSrkxXHLVFiCW35pa8YIv+FU/l9v91GeVy5EYkRE47hn8vJfPypGOj5A6YnfHjRCFl59NBcm+46GrGJduNup1atEhcZSr9QCe4yUyw9AHzflYCYAn+7QXiY1U8ZGSVe1QKJ9GDAKjS6wjIY+BlYLgwamrgSRZI57ww3/25SLMNEtGGnAvOjRU8eJ2B0hvEYcB8SBEKe8hnyx1xP/sSZFEV/lwn+LTmca3yx1GW2H3xCbDR+v1seC0byBzIsNLOHfb8H7mSdlaTyGXgeuh+PM7f4lMQguTSn52AIhWBUgPeZdhapaWNBsI9/SKaLl2FbdoZZ69Xt4qwdC4rJyXpNxd/soGqYTa7cliOu2Mvm57jaz2r2+jF+wTEJF6NRaslLkPyBdlYiViIyeT0+f14HPqJVd/TC9cIOoerZ7gGaZFezDSUXBAIUDrFo4NEXRzhlsePBy1wpiFqrdnuaN+gWuznq2BuaFxg2z7mARtIrZPwApwBVXadojArzAygoIiaJCISPD54etKNTQq0iupkfByC7Xz44q5dGo1nyIyT052JKg7YnEYKJAm6iy8F1G+WUPERCveKdZDXf j6sQLk4m 2NR/E0yGgSv8FiVaxjBImXr6n92LMnYTXhZiVDUVbrAZFOHSCWpeCpDJuBUcfqHq3okvpeW2VSbSnGEKoQIoTNCwPJsAu+poZcNu64GlGRBk1nn2h99HY8mv4y2wgd9F6+Ow7GDjMMp0qAAuJ0FMVYKcNEt69ttHdQMbBN1ak0zhcs8zYgfC8qJmqFsLddd71ARqcYWJzuQU3EqRaE2jV1HYnakz2BOw+ieyrd3VPoJytLnbumoB//sCa9yixmRsfjS/15xN5SLYwiVZmIEUSx7QFn8qyLxKA2ZWh8Na/rZrFUtItvB3H9QrjBkT5Z9x8310IBAgQOL68WdMZNnHHJCvS8IokWDphAsXlOvpzMXGWyDAhAUHFublmjDioK8AnAq/pUqifz42BSaa2i5oB4iv7MbAInn6ikzHZOOI3rOriG+/z7uxjZ0RKm7bdFCz2nN6n3zzpdnxxR1vTFak6tNMs9mYkDgh3+ZBJ4PlLcBF2Bp6qJebNFJnNkjWuOYWOdWV4OBCpcGufS3tNHPl1lJAwgkNQ0vilBec2FX/c9OTIn8nhfl186haM5hFoHzGoCkUxcoBLc2PWUV28nG+BmReqAUIh0AwgEsYn 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: Use a goto label to consolidate the unlock folio and return pattern and don't bother with an else after a return / goto. Signed-off-by: Christoph Hellwig --- mm/page_io.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index f7716b6569fa..c420b0aa0f22 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -239,12 +239,11 @@ static void swap_zeromap_folio_clear(struct folio *folio) */ int swap_writeout(struct folio *folio, struct writeback_control *wbc) { - int ret; + int ret = 0; + + if (folio_free_swap(folio)) + goto out_unlock; - if (folio_free_swap(folio)) { - folio_unlock(folio); - return 0; - } /* * Arch code may have to preserve more data than just the page * contents, e.g. memory tags. @@ -252,8 +251,7 @@ int swap_writeout(struct folio *folio, struct writeback_control *wbc) ret = arch_prepare_to_swap(folio); if (ret) { folio_mark_dirty(folio); - folio_unlock(folio); - return ret; + goto out_unlock; } /* @@ -264,20 +262,19 @@ int swap_writeout(struct folio *folio, struct writeback_control *wbc) */ if (is_folio_zero_filled(folio)) { swap_zeromap_folio_set(folio); - folio_unlock(folio); - return 0; - } else { - /* - * Clear bits this folio occupies in the zeromap to prevent - * zero data being read in from any previous zero writes that - * occupied the same swap entries. - */ - swap_zeromap_folio_clear(folio); + goto out_unlock; } + + /* + * Clear bits this folio occupies in the zeromap to prevent zero data + * being read in from any previous zero writes that occupied the same + * swap entries. + */ + swap_zeromap_folio_clear(folio); + if (zswap_store(folio)) { count_mthp_stat(folio_order(folio), MTHP_STAT_ZSWPOUT); - folio_unlock(folio); - return 0; + goto out_unlock; } if (!mem_cgroup_zswap_writeback_enabled(folio_memcg(folio))) { folio_mark_dirty(folio); @@ -286,6 +283,9 @@ int swap_writeout(struct folio *folio, struct writeback_control *wbc) __swap_writepage(folio, wbc); return 0; +out_unlock: + folio_unlock(folio); + return ret; } static inline void count_swpout_vm_event(struct folio *folio) -- 2.47.2