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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75BA3C6FA82 for ; Fri, 2 Sep 2022 19:47:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BE4C7800FA; Fri, 2 Sep 2022 15:47:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D784B800FD; Fri, 2 Sep 2022 15:47:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5D92D80114; Fri, 2 Sep 2022 15:47:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D15B380108 for ; Fri, 2 Sep 2022 15:47:03 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id B0A43801EA for ; Fri, 2 Sep 2022 19:47:03 +0000 (UTC) X-FDA: 79868178726.12.54970B5 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf26.hostedemail.com (Postfix) with ESMTP id 4177B140058 for ; Fri, 2 Sep 2022 19:47:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=AwmMvcWOAAeFfkqkqYj/393+BTU1yn9WJ+SkxVL14ks=; b=e1GAC1ApoL6WjcIvr0CY8Y5zhy oCVIJpIdIMlMc+BhTE+buhSgP4HrH4NfoLFuP/G3e9i8xBYEwfzP+gDjv2ZeBRiiRtK2DJSCy9GqF DbqD/lrjbXGqpayqtMxjxPdc/KT1L2oYoRt4+bcwZnDj3+D2iebTbFkAsjBTeLASBxyRKtvL+crbg 4uwYXUqGasthcZSLr69060s9yCx0vKbrWW6OP0Aomsue+7Eme3ugY30xsNcC8efEYQDbuMWkQt7mt bADmR/+EV98HqOHZGbBawKr+pV5684HphMvQBKSuzbc5nEyMWDYK8WFVmQQXiBsXQFB+RS6c33HlZ ipxYzsSw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd2-007Id5-1F; Fri, 02 Sep 2022 19:47:00 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH v2 22/57] shmem: Convert shmem_fault() to use shmem_get_folio_gfp() Date: Fri, 2 Sep 2022 20:46:18 +0100 Message-Id: <20220902194653.1739778-23-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220902194653.1739778-1-willy@infradead.org> References: <20220902194653.1739778-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662148023; a=rsa-sha256; cv=none; b=MRiT4l9UPFM4eobVj8o1Ua20K1ACf4zPHvOxcY2/Niji4hYDn7JcQYbW4wn20/tZ7mwahl NvyX5TKbZ0FVi5MiKc2nsvwXriFvi1oDfJcyIYxvTbhkwlfGAu6nLgq8JHbkDS3OT6TC+y vZMkSU/M8Gf3fDY996a5h9K7qziR7N8= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=e1GAC1Ap; spf=none (imf26.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662148023; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=AwmMvcWOAAeFfkqkqYj/393+BTU1yn9WJ+SkxVL14ks=; b=KcjqlhuxnwDFzeCX8h5LNtIb1PfNqMrNrWFPcEjKUkvKLupmgGTHBIwWoxAdmZujRu5/D7 7ZeqlxPDL7/xMWktdaIz88fxiSYkEe1jLJyWaOoj91L7dcic79Wz7Whb4UT5FK5rruumXW tp/trD30YFX5jvPqAnjaHxh42usYCyA= Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=e1GAC1Ap; spf=none (imf26.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Stat-Signature: 7j5m89iuab6pjhwjqgdpn7d4iszwop83 X-Rspamd-Queue-Id: 4177B140058 X-Rspamd-Server: rspam04 X-Rspam-User: X-HE-Tag: 1662148023-481951 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: No particular advantage for this function, but necessary to remove shmem_getpage_gfp(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/shmem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/shmem.c b/mm/shmem.c index 89536091928f..59184bf6731f 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2065,6 +2065,7 @@ static vm_fault_t shmem_fault(struct vm_fault *vmf) struct vm_area_struct *vma = vmf->vma; struct inode *inode = file_inode(vma->vm_file); gfp_t gfp = mapping_gfp_mask(inode->i_mapping); + struct folio *folio; int err; vm_fault_t ret = VM_FAULT_LOCKED; @@ -2127,10 +2128,11 @@ static vm_fault_t shmem_fault(struct vm_fault *vmf) spin_unlock(&inode->i_lock); } - err = shmem_getpage_gfp(inode, vmf->pgoff, &vmf->page, SGP_CACHE, + err = shmem_get_folio_gfp(inode, vmf->pgoff, &folio, SGP_CACHE, gfp, vma, vmf, &ret); if (err) return vmf_error(err); + vmf->page = folio_file_page(folio, vmf->pgoff); return ret; } -- 2.35.1