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.7 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 68A2EC433DF for ; Fri, 9 Oct 2020 13:04:23 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B3864222D5 for ; Fri, 9 Oct 2020 13:04:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B3864222D5 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 223F3900003; Fri, 9 Oct 2020 09:04:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1AC63900002; Fri, 9 Oct 2020 09:04:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 09D54900003; Fri, 9 Oct 2020 09:04:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0208.hostedemail.com [216.40.44.208]) by kanga.kvack.org (Postfix) with ESMTP id CBA6E900002 for ; Fri, 9 Oct 2020 09:04:21 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 52E351EE6 for ; Fri, 9 Oct 2020 13:04:21 +0000 (UTC) X-FDA: 77352405522.16.kiss33_50018c8271e0 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin16.hostedemail.com (Postfix) with ESMTP id 362C310041652 for ; Fri, 9 Oct 2020 13:04:21 +0000 (UTC) X-HE-Tag: kiss33_50018c8271e0 X-Filterd-Recvd-Size: 2107 Received: from huawei.com (szxga06-in.huawei.com [45.249.212.32]) by imf37.hostedemail.com (Postfix) with ESMTP for ; Fri, 9 Oct 2020 13:04:20 +0000 (UTC) Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 388E0FBD45FB23536C0D; Fri, 9 Oct 2020 21:04:15 +0800 (CST) Received: from huawei.com (10.175.104.175) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Fri, 9 Oct 2020 21:03:46 +0800 From: Miaohe Lin To: CC: , , Subject: [PATCH] mm/swapfile.c: remove unnecessary out label in __swap_duplicate() Date: Fri, 9 Oct 2020 09:03:37 -0400 Message-ID: <20201009130337.29698-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: When the code went to the out label, it must have p =3D=3D NULL. So what = out label really does is redundant if check and return err. We should Remove this unnecessary out label because it does not handle resource free and s= o on. Signed-off-by: Miaohe Lin --- mm/swapfile.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 06984de4cb9a..22c63beb10da 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3441,11 +3441,11 @@ static int __swap_duplicate(swp_entry_t entry, un= signed char usage) unsigned long offset; unsigned char count; unsigned char has_cache; - int err =3D -EINVAL; + int err; =20 p =3D get_swap_device(entry); if (!p) - goto out; + return -EINVAL; =20 offset =3D swp_offset(entry); ci =3D lock_cluster_or_swap_info(p, offset); @@ -3492,7 +3492,6 @@ static int __swap_duplicate(swp_entry_t entry, unsi= gned char usage) =20 unlock_out: unlock_cluster_or_swap_info(p, ci); -out: if (p) put_swap_device(p); return err; --=20 2.19.1