From patchwork Fri Nov 13 13:54:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Su X-Patchwork-Id: 11903549 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B8F7A1391 for ; Fri, 13 Nov 2020 13:54:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 521C22223F for ; Fri, 13 Nov 2020 13:54:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="kUV2N3gZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 521C22223F 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 2C56B6B005D; Fri, 13 Nov 2020 08:54:51 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2734E6B0068; Fri, 13 Nov 2020 08:54:51 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 162AF6B006E; Fri, 13 Nov 2020 08:54:51 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0225.hostedemail.com [216.40.44.225]) by kanga.kvack.org (Postfix) with ESMTP id D96D16B005D for ; Fri, 13 Nov 2020 08:54:50 -0500 (EST) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 7875F1EE6 for ; Fri, 13 Nov 2020 13:54:50 +0000 (UTC) X-FDA: 77479540740.04.skate28_060474b2730f Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin04.hostedemail.com (Postfix) with ESMTP id 591A2800BAAF for ; Fri, 13 Nov 2020 13:54:50 +0000 (UTC) X-Spam-Summary: 1,0,0,7583e4d8ef8d8407,d41d8cd98f00b204,sh_def@163.com,,RULES_HIT:41:355:379:582:800:960:973:988:989:1152:1260:1277:1312:1313:1314:1345:1516:1518:1519:1534:1541:1593:1594:1595:1596:1711:1730:1747:1777:1792:2198:2199:2393:2559:2562:3138:3139:3140:3141:3142:3352:3865:3866:3868:3870:4321:4605:5007:6261:6653:10004:10400:11026:11334:11658:11914:12043:12048:12296:12297:12438:12555:12895:13069:13311:13357:13439:13895:14096:14097:14181:14394:14721:21080:21627:21795:21990:30051:30054:30075,0,RBL:220.181.12.13:@163.com:.lbl8.mailshell.net-66.100.201.100 62.50.2.100;04yfarasoeytnqxzbzj8syz8iybqnycn5ouhheb5xynhwp6a535rcrwm8hoifsa.rqz1ek1ra7hbaphpnzo46ktwu4d4dypyfowy66uic1s9um7f89qwsxdmyesp8no.w-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:70,LUA_SUMMARY:none X-HE-Tag: skate28_060474b2730f X-Filterd-Recvd-Size: 3253 Received: from m12-13.163.com (m12-13.163.com [220.181.12.13]) by imf49.hostedemail.com (Postfix) with ESMTP for ; Fri, 13 Nov 2020 13:54:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Date:From:Subject:Message-ID:MIME-Version; bh=w2BQA sMLFD23/RsKBW5LfLuDr6E3ojWa2/MmrEL46cc=; b=kUV2N3gZoRmAlrSdsCkzF NhOixRcl0/p0fB8jn/Mo5KWKvuAIMbC6w5vIUG2SGaWtFZZqEVuekgyApn0g/tnB k8J7f3urDWjb/IpX0KqF63hPQ93idcRL+n5fXvDE2x/7JWGkCqsAurZ0qrZNuVHr 09Ws8fb4X1bJpuF4iq/iPU= Received: from localhost (unknown [101.86.208.122]) by smtp9 (Coremail) with SMTP id DcCowAD3qzkTkK5fs_btQQ--.30535S2; Fri, 13 Nov 2020 21:54:27 +0800 (CST) Date: Fri, 13 Nov 2020 21:54:27 +0800 From: Hui Su To: hughd@google.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: sh_def@163.com Subject: [PATCH] mm/shmem.c: make shmem_mapping() inline Message-ID: <20201113135427.GA167783@rlk> MIME-Version: 1.0 Content-Disposition: inline X-CM-TRANSID: DcCowAD3qzkTkK5fs_btQQ--.30535S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7KF4UXw4xAr45GFyrGw17ZFb_yoW8Aw1UpF 98Aw15Cr4UWryjgFWIva18Zryaqa1kJ3y0yry3W3s0yF1kKFy7tF4jkr1qvFy5Ary8Cw42 qrW2k3y0kr1UtrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07U4lk3UUUUU= X-Originating-IP: [101.86.208.122] X-CM-SenderInfo: xvkbvvri6rljoofrz/1tbiMQbbX1UMWVTI8wABsd X-Bogosity: Ham, tests=bogofilter, spamicity=0.009403, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: inline the shmem_mapping(), and use shmem_mapping() instead of 'inode->i_mapping->a_ops == &shmem_aops' in shmem_evict_inode(). Signed-off-by: Hui Su Reviewed-by: Pankaj Gupta Reported-by: kernel test robot --- include/linux/shmem_fs.h | 2 +- mm/shmem.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index a5a5d1d4d7b1..154a16fe7fd5 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -67,7 +67,7 @@ extern unsigned long shmem_get_unmapped_area(struct file *, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags); extern int shmem_lock(struct file *file, int lock, struct user_struct *user); #ifdef CONFIG_SHMEM -extern bool shmem_mapping(struct address_space *mapping); +extern inline bool shmem_mapping(struct address_space *mapping); #else static inline bool shmem_mapping(struct address_space *mapping) { diff --git a/mm/shmem.c b/mm/shmem.c index 537c137698f8..7395d8e8226a 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1152,7 +1152,7 @@ static void shmem_evict_inode(struct inode *inode) struct shmem_inode_info *info = SHMEM_I(inode); struct shmem_sb_info *sbinfo = SHMEM_SB(inode->i_sb); - if (inode->i_mapping->a_ops == &shmem_aops) { + if (shmem_mapping(inode->i_mapping)) { shmem_unacct_size(info->flags, inode->i_size); inode->i_size = 0; shmem_truncate_range(inode, 0, (loff_t)-1); @@ -2352,7 +2352,7 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode return inode; } -bool shmem_mapping(struct address_space *mapping) +inline bool shmem_mapping(struct address_space *mapping) { return mapping->a_ops == &shmem_aops; }