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 D096DC433E0 for ; Wed, 24 Feb 2021 20:04:49 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7AEE464F36 for ; Wed, 24 Feb 2021 20:04:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7AEE464F36 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 09B4C6B00A7; Wed, 24 Feb 2021 15:04:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 04BC98D0014; Wed, 24 Feb 2021 15:04:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ECA298D000B; Wed, 24 Feb 2021 15:04:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0077.hostedemail.com [216.40.44.77]) by kanga.kvack.org (Postfix) with ESMTP id D74B56B00A7 for ; Wed, 24 Feb 2021 15:04:48 -0500 (EST) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id A056F82C27FE for ; Wed, 24 Feb 2021 20:04:48 +0000 (UTC) X-FDA: 77854239456.27.4FF1C98 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf11.hostedemail.com (Postfix) with ESMTP id 8F0E02000392 for ; Wed, 24 Feb 2021 20:04:38 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id D3EB964F31; Wed, 24 Feb 2021 20:04:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1614197087; bh=c04nelTSFATbEmttuyWFPL753KSZH3WH9JphC+q50wg=; h=Date:From:To:Subject:In-Reply-To:From; b=E8HNuA8A6+YYmOpYnWWmw6qupGzOBLphP1S4+0REheTgGu67/nCoZJth7s7YFslyy 7Do1jlQDsuqfEClFC155nuWEQBVWuXQvcWw8wFSFLx09eIsaXQU6UMg7d0qxyvY5B/ PBAHo9XmhaU7YAwWQoJbnnbRifRydV87MTsynQn8= Date: Wed, 24 Feb 2021 12:04:46 -0800 From: Andrew Morton To: akpm@linux-foundation.org, jarkko@kernel.org, linux-mm@kvack.org, mm-commits@vger.kernel.org, tianjia.zhang@linux.alibaba.com, torvalds@linux-foundation.org, zhang.jia@linux.alibaba.com Subject: [patch 081/173] mm/mprotect.c: optimize error detection in do_mprotect_pkey() Message-ID: <20210224200446.uerlj0CaI%akpm@linux-foundation.org> In-Reply-To: <20210224115824.1e289a6895087f10c41dd8d6@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 8F0E02000392 X-Stat-Signature: kyhtq19uwz6gifkw4u3sizw8chmm5zd7 Received-SPF: none (linux-foundation.org>: No applicable sender policy available) receiver=imf11; identity=mailfrom; envelope-from=""; helo=mail.kernel.org; client-ip=198.145.29.99 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1614197078-97569 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: Tianjia Zhang Subject: mm/mprotect.c: optimize error detection in do_mprotect_pkey() Obviously, the error variable detection of the if statement is for the mprotect callback function, so it is also put into the scope of calling callbck. This is a cleanup which makes this site consistent with the rest of this function's error handling. Link: https://lkml.kernel.org/r/20210118133310.98375-1-tianjia.zhang@linux.alibaba.com Signed-off-by: Tianjia Zhang Reported-by: Jia Zhang Reviewed-by: Andrew Morton Cc: Jarkko Sakkinen Signed-off-by: Andrew Morton --- mm/mprotect.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/mm/mprotect.c~mm-optimizing-error-condition-detection-in-do_mprotect_pkey +++ a/mm/mprotect.c @@ -617,10 +617,11 @@ static int do_mprotect_pkey(unsigned lon if (tmp > end) tmp = end; - if (vma->vm_ops && vma->vm_ops->mprotect) + if (vma->vm_ops && vma->vm_ops->mprotect) { error = vma->vm_ops->mprotect(vma, nstart, tmp, newflags); - if (error) - goto out; + if (error) + goto out; + } error = mprotect_fixup(vma, &prev, nstart, tmp, newflags); if (error) _