From patchwork Tue Dec 15 03:05:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 11973663 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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,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 5C93AC4361B for ; Tue, 15 Dec 2020 03:05:05 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EC60D223C8 for ; Tue, 15 Dec 2020 03:05:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EC60D223C8 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 8D18A6B008C; Mon, 14 Dec 2020 22:05:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 85A766B0092; Mon, 14 Dec 2020 22:05:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6FB7D6B0093; Mon, 14 Dec 2020 22:05:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0067.hostedemail.com [216.40.44.67]) by kanga.kvack.org (Postfix) with ESMTP id 57CD86B008C for ; Mon, 14 Dec 2020 22:05:04 -0500 (EST) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 1C4B88249980 for ; Tue, 15 Dec 2020 03:05:04 +0000 (UTC) X-FDA: 77594024928.28.food98_200edea27420 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin28.hostedemail.com (Postfix) with ESMTP id F32FA6C3B for ; Tue, 15 Dec 2020 03:05:03 +0000 (UTC) X-HE-Tag: food98_200edea27420 X-Filterd-Recvd-Size: 2265 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf10.hostedemail.com (Postfix) with ESMTP for ; Tue, 15 Dec 2020 03:05:03 +0000 (UTC) Date: Mon, 14 Dec 2020 19:05:02 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1608001502; bh=ac+AE+rdhzuUx5TMyW1deoj6szh7xa0A3YGUu6Ckwok=; h=From:To:Subject:In-Reply-To:From; b=phlAtmXzKcyQliHXhvZP76nsKKhGu+MrvQSUkOlE/SeXGuRfVHhzqt6QmJbQcTB6J 2w+7mUXnKP7XUY3Dnaki9m4QhUCbJsA4o3llLzGGXVZMT89WCsU1Cqo9MvfnqA50RP ZZALYms+kUsK/SSCvDcqijk5J1EfsTM88uu+5MWc= From: Andrew Morton To: akpm@linux-foundation.org, carver4lio@163.com, linux-mm@kvack.org, liu.hailong6@zte.com.cn, mm-commits@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 031/200] mm/filemap.c: remove else after a return Message-ID: <20201215030502.gbCPAEf6A%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: Hailong Liu Subject: mm/filemap.c: remove else after a return The `else' is not useful after a `return' in __lock_page_or_retry(). [akpm@linux-foundation.org: coding style fixes] Link: https://lkml.kernel.org/r/20201202154720.115162-1-carver4lio@163.com Signed-off-by: Hailong Liu Reviewed-by: Andrew Morton Signed-off-by: Andrew Morton --- mm/filemap.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) --- a/mm/filemap.c~mm-remove-the-unuseful-else-after-a-return +++ a/mm/filemap.c @@ -1583,19 +1583,20 @@ int __lock_page_or_retry(struct page *pa else wait_on_page_locked(page); return 0; - } else { - if (flags & FAULT_FLAG_KILLABLE) { - int ret; + } + 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; + ret = __lock_page_killable(page); + if (ret) { + mmap_read_unlock(mm); + return 0; + } + } else { + __lock_page(page); } + return 1; + } /**