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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 B6553C2BB48 for ; Tue, 15 Dec 2020 03:06:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 67DF3224B1 for ; Tue, 15 Dec 2020 03:06:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 67DF3224B1 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id EE7768D0001; Mon, 14 Dec 2020 22:06:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E96C66B008A; Mon, 14 Dec 2020 22:06:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DD3E88D0001; Mon, 14 Dec 2020 22:06:06 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0203.hostedemail.com [216.40.44.203]) by kanga.kvack.org (Postfix) with ESMTP id C1F6E6B0089 for ; Mon, 14 Dec 2020 22:06:06 -0500 (EST) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 8D713180AD830 for ; Tue, 15 Dec 2020 03:06:06 +0000 (UTC) X-FDA: 77594027532.08.fifth64_5b16dbc27420 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin08.hostedemail.com (Postfix) with ESMTP id 74C4D1819E624 for ; Tue, 15 Dec 2020 03:06:06 +0000 (UTC) X-HE-Tag: fifth64_5b16dbc27420 X-Filterd-Recvd-Size: 2345 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf27.hostedemail.com (Postfix) with ESMTP for ; Tue, 15 Dec 2020 03:06:06 +0000 (UTC) Date: Mon, 14 Dec 2020 19:06:04 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1608001565; bh=7v+RgTZuyJW/bBR4UK8MH4Xg43pMdhA95ijDeiW7Rgg=; h=From:To:Subject:In-Reply-To:From; b=XfIYv4P+0nX4LOvyhbhLkqJwG3QRnag8wiBxSkOCwwoRB7vegP03ChK09ZdjaJu1P D6sFfdIUnNrduSR81AMLjiFvAvjkQpfN9hZPtHBp2MyefxmxuHa/p2lMGEDTTxgRuj L8Sui7+03f9XjGz1Y3F+Zyq8MuiNkIdYlBEX0M60= From: Andrew Morton To: akpm@linux-foundation.org, linmiaohe@huawei.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 050/200] mm/swapfile.c: remove unnecessary out label in __swap_duplicate() Message-ID: <20201215030604.qIS1-P8T6%akpm@linux-foundation.org> In-Reply-To: <20201214190237.a17b70ae14f129e2dca3d204@linux-foundation.org> User-Agent: s-nail v14.8.16 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: From: Miaohe Lin Subject: mm/swapfile.c: remove unnecessary out label in __swap_duplicate() When the code went to the out label, it must have p == 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 so on. Link: https://lkml.kernel.org/r/20201009130337.29698-1-linmiaohe@huawei.com Signed-off-by: Miaohe Lin Reviewed-by: Andrew Morton Signed-off-by: Andrew Morton --- mm/swapfile.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- a/mm/swapfile.c~mm-swapfilec-remove-unnecessary-out-label-in-__swap_duplicate +++ a/mm/swapfile.c @@ -3445,11 +3445,11 @@ static int __swap_duplicate(swp_entry_t unsigned long offset; unsigned char count; unsigned char has_cache; - int err = -EINVAL; + int err; p = get_swap_device(entry); if (!p) - goto out; + return -EINVAL; offset = swp_offset(entry); ci = lock_cluster_or_swap_info(p, offset); @@ -3496,7 +3496,6 @@ static int __swap_duplicate(swp_entry_t unlock_out: unlock_cluster_or_swap_info(p, ci); -out: if (p) put_swap_device(p); return err; _