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,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 8FCF2C64E7B for ; Wed, 2 Dec 2020 15:47:40 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AFE9C20B1F for ; Wed, 2 Dec 2020 15:47:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AFE9C20B1F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=163.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 052038D0002; Wed, 2 Dec 2020 10:47:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F1CC88D0001; Wed, 2 Dec 2020 10:47:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DE4258D0002; Wed, 2 Dec 2020 10:47:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0247.hostedemail.com [216.40.44.247]) by kanga.kvack.org (Postfix) with ESMTP id C35018D0001 for ; Wed, 2 Dec 2020 10:47:36 -0500 (EST) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 7C127181AC212 for ; Wed, 2 Dec 2020 15:47:36 +0000 (UTC) X-FDA: 77548772112.11.burn47_2415dd2273b4 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id 4791E180F8B82 for ; Wed, 2 Dec 2020 15:47:36 +0000 (UTC) X-HE-Tag: burn47_2415dd2273b4 X-Filterd-Recvd-Size: 2484 Received: from m12-11.163.com (m12-11.163.com [220.181.12.11]) by imf28.hostedemail.com (Postfix) with ESMTP for ; Wed, 2 Dec 2020 15:47:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=O/npw76o0ufcvrM12h s+GrdXAyvpH9W3tDvavR6Ud6g=; b=ERuAvlWnyd++pzrek4C1fgeis89FnF4V1w l+nBO/jYFTAxWCqwHLNaB6X5+4k6qIxbMSj4Xa2zWPqfKRBnXADTCAaFKjIG6XIn M+P0mGleLazGu5rZhcqT8kAFS+c6vUamL0b/gVQm3a1lHJBD3ANwEj7XyuNAW1PD F1amx8bVE= Received: from localhost.localdomain (unknown [36.170.33.20]) by smtp7 (Coremail) with SMTP id C8CowAAHB58Jt8df6eEzBg--.12951S2; Wed, 02 Dec 2020 23:47:22 +0800 (CST) From: carver4lio@163.com To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Hailong Liu , Hailong Liu Subject: [PATCH] mm:remove the unuseful else after a return Date: Wed, 2 Dec 2020 23:47:20 +0800 Message-Id: <20201202154720.115162-1-carver4lio@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID:C8CowAAHB58Jt8df6eEzBg--.12951S2 X-Coremail-Antispam: 1Uf129KBjvdXoWruw1xur4fCw43GF1ruw1fCrg_yoWfZFbEkF yIvFsrKrs8CFyfGFy2ya42qrZ7A39Y9rsrWF98tr43t345Gr4kXFyDZa1fXrWqvFWxGas8 Cr1jvFWfuryYyjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUU-VyDUUUUU== X-Originating-IP: [36.170.33.20] X-CM-SenderInfo: xfdu4v3uuox0i6rwjhhfrp/xtbCnwvsnVzmVVedRgABsH X-Bogosity: Ham, tests=bogofilter, spamicity=0.000092, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Hailong Liu The *else* is not useful after a *return* in __lock_page_or_retry(). Signed-off-by: Hailong Liu --- mm/filemap.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 0b2067b3c..55e6ad1b0 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1583,19 +1583,19 @@ int __lock_page_or_retry(struct page *page, struct mm_struct *mm, else wait_on_page_locked(page); return 0; - } else { - if (flags & FAULT_FLAG_KILLABLE) { - int ret; - - ret = __lock_page_killable(page); - if (ret) { - mmap_read_unlock(mm); - return 0; - } - } else - __lock_page(page); - return 1; } + if (flags & FAULT_FLAG_KILLABLE) { + int ret; + + ret = __lock_page_killable(page); + if (ret) { + mmap_read_unlock(mm); + return 0; + } + } else + __lock_page(page); + return 1; + } /** -- 2.17.1