From patchwork Fri Sep 2 19:46:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 12964541 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 1566EECAAD5 for ; Fri, 2 Sep 2022 19:47:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 38852800EE; Fri, 2 Sep 2022 15:47:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E3822800EA; Fri, 2 Sep 2022 15:47:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B5852800EB; Fri, 2 Sep 2022 15:47:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 8E580800F1 for ; Fri, 2 Sep 2022 15:47:00 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 6788D121032 for ; Fri, 2 Sep 2022 19:47:00 +0000 (UTC) X-FDA: 79868178600.03.EBDC67C Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf16.hostedemail.com (Postfix) with ESMTP id F084318004E for ; Fri, 2 Sep 2022 19:46:59 +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=+uCDeTNBCbU4U+AQYTZ3Vcf2Qm5iFtfWTDrhJbl7ndY=; b=rUoLON+EI0BKBrLyOGzrCBb3Lm njwQuDxDA3GiI1Q2mu0mn50M/rid24Cwu+n7zYc9JCnygN0eVcShjfh2CfEyPGu7A5beIDNU1TIL7 NjdzDNsULku3oHOkR5yDT2B0qE4xILN42XzSjfJoi8mbkFFMmnnn8ogPZQiCZBvaO4FPNuUd0CEP+ 94J+WwFDpfv6NH83cUvJI7QXmSiUMu/nobxExUseqYUuYQ/Cmwx9K2WE2SsoERaBYbypBw014LQ5F hRAXbWEgHfhqQGMfHvDVrl3UNXcPbGWzzatzajV6ekqyUIsTov4Njc57G/ifb2AEacBhWUQI8JvH2 A0Te0KCg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd2-007IdJ-8t; 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 24/57] shmem: Add shmem_get_folio() Date: Fri, 2 Sep 2022 20:46:20 +0100 Message-Id: <20220902194653.1739778-25-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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662148020; 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=+uCDeTNBCbU4U+AQYTZ3Vcf2Qm5iFtfWTDrhJbl7ndY=; b=LC4QPF+0Vv7nLo0krx7VzOfB+F2zhMimr//r4MZFhZz4ZKc63p9an4GadadgtB2aMzkAW9 oSUjtN3pYYe1g8+UOpuvra8E0e9yr+3Rgg5BvM1uaJn9+fJYJuNLfWXwkWwUKh0me/wUyP Kn2QWowV0Ts594KhsPJNuXBGY1r0w08= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=rUoLON+E; dmarc=none; spf=none (imf16.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662148020; a=rsa-sha256; cv=none; b=iFlJ7rgRHznZBXiOY/kb/RSsbFiYuA2f1bkux2DXkgfsnSpYLTS61JUPNrPS4xkOtvZ7bO sXwznOw4eNHXKxSDMMSaouBB2MZDLhyL1RGO/iMDf0m84SRP7iDWHiaDUDRMzU3wMwNYCs oeIjDRuPm7ETcK10E79uksh8PZ8FWEo= X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: F084318004E Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=rUoLON+E; dmarc=none; spf=none (imf16.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspam-User: X-Stat-Signature: mhk8eea1yrmnudtgnm6ea5cqkr1zeeax X-HE-Tag: 1662148019-717100 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: With no remaining callers of shmem_getpage_gfp(), add shmem_get_folio() and reimplement shmem_getpage() as a call to shmem_get_folio(). Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/shmem_fs.h | 2 ++ mm/shmem.c | 23 ++++++++++------------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index ff0b990de83d..f4bd50b08a91 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -113,6 +113,8 @@ enum sgp_type { extern int shmem_getpage(struct inode *inode, pgoff_t index, struct page **pagep, enum sgp_type sgp); +int shmem_get_folio(struct inode *inode, pgoff_t index, struct folio **foliop, + enum sgp_type sgp); static inline struct page *shmem_read_mapping_page( struct address_space *mapping, pgoff_t index) diff --git a/mm/shmem.c b/mm/shmem.c index 107b8f019373..eb9e024f7cf4 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2025,14 +2025,18 @@ static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index, return error; } -static int shmem_getpage_gfp(struct inode *inode, pgoff_t index, - struct page **pagep, enum sgp_type sgp, - gfp_t gfp, struct vm_area_struct *vma, - struct vm_fault *vmf, vm_fault_t *fault_type) +int shmem_get_folio(struct inode *inode, pgoff_t index, struct folio **foliop, + enum sgp_type sgp) +{ + return shmem_get_folio_gfp(inode, index, foliop, sgp, + mapping_gfp_mask(inode->i_mapping), NULL, NULL, NULL); +} + +int shmem_getpage(struct inode *inode, pgoff_t index, + struct page **pagep, enum sgp_type sgp) { struct folio *folio = NULL; - int ret = shmem_get_folio_gfp(inode, index, &folio, sgp, gfp, vma, - vmf, fault_type); + int ret = shmem_get_folio(inode, index, &folio, sgp); if (folio) *pagep = folio_file_page(folio, index); @@ -2041,13 +2045,6 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index, return ret; } -int shmem_getpage(struct inode *inode, pgoff_t index, - struct page **pagep, enum sgp_type sgp) -{ - return shmem_getpage_gfp(inode, index, pagep, sgp, - mapping_gfp_mask(inode->i_mapping), NULL, NULL, NULL); -} - /* * This is like autoremove_wake_function, but it removes the wait queue * entry unconditionally - even if something else had already woken the