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 X-Spam-Level: X-Spam-Status: No, score=-12.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F222C4346E for ; Sun, 27 Sep 2020 12:42:13 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9A93423718 for ; Sun, 27 Sep 2020 12:42:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9A93423718 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id D15978E0001; Sun, 27 Sep 2020 08:42:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C770D6B005D; Sun, 27 Sep 2020 08:42:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B9D1D8E0001; Sun, 27 Sep 2020 08:42:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0064.hostedemail.com [216.40.44.64]) by kanga.kvack.org (Postfix) with ESMTP id A3A526B005C for ; Sun, 27 Sep 2020 08:42:11 -0400 (EDT) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 567EA181AE869 for ; Sun, 27 Sep 2020 12:42:11 +0000 (UTC) X-FDA: 77308804062.19.body25_32127f027179 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin19.hostedemail.com (Postfix) with ESMTP id 3D49F1ACEA2 for ; Sun, 27 Sep 2020 12:42:11 +0000 (UTC) X-HE-Tag: body25_32127f027179 X-Filterd-Recvd-Size: 2178 Received: from huawei.com (szxga04-in.huawei.com [45.249.212.190]) by imf38.hostedemail.com (Postfix) with ESMTP for ; Sun, 27 Sep 2020 12:42:10 +0000 (UTC) Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 12B14D26EE607A6A0263; Sun, 27 Sep 2020 20:42:03 +0800 (CST) Received: from huawei.com (10.175.104.175) by DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id 14.3.487.0; Sun, 27 Sep 2020 20:41:54 +0800 From: Miaohe Lin To: CC: , , Subject: [PATCH] mm: Remove useless out label in __swap_writepage() Date: Sun, 27 Sep 2020 08:40:32 -0400 Message-ID: <20200927124032.22521-1-linmiaohe@huawei.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.104.175] X-CFilter-Loop: Reflected Content-Transfer-Encoding: quoted-printable 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: The out label is only used in one place and return ret directly without something like resource cleanup or lock release and so on. So we should remove this jump label and do some cleanup. Signed-off-by: Miaohe Lin --- mm/page_io.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index ae33d0b77dc9..35eac34cbd93 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -359,13 +359,11 @@ int __swap_writepage(struct page *page, struct writ= eback_control *wbc, return 0; } =20 - ret =3D 0; bio =3D get_swap_bio(GFP_NOIO, page, end_write_func); if (bio =3D=3D NULL) { set_page_dirty(page); unlock_page(page); - ret =3D -ENOMEM; - goto out; + return -ENOMEM; } bio->bi_opf =3D REQ_OP_WRITE | REQ_SWAP | wbc_to_write_flags(wbc); bio_associate_blkg_from_page(bio, page); @@ -373,8 +371,8 @@ int __swap_writepage(struct page *page, struct writeb= ack_control *wbc, set_page_writeback(page); unlock_page(page); submit_bio(bio); -out: - return ret; + + return 0; } =20 int swap_readpage(struct page *page, bool synchronous) --=20 2.19.1