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 6239BC433EF for ; Fri, 29 Apr 2022 19:23:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D67136B008A; Fri, 29 Apr 2022 15:23:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 70D766B0087; Fri, 29 Apr 2022 15:23:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 07E6C6B007B; Fri, 29 Apr 2022 15:23:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.a.hostedemail.com [64.99.140.24]) by kanga.kvack.org (Postfix) with ESMTP id 72B426B0083 for ; Fri, 29 Apr 2022 15:23:41 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 48E7D60C23 for ; Fri, 29 Apr 2022 19:23:41 +0000 (UTC) X-FDA: 79410891042.05.6EBE54A Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf10.hostedemail.com (Postfix) with ESMTP id 9E13AC006E for ; Fri, 29 Apr 2022 19:23:29 +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=ZdRQFmY7tYVAkShpTt0BWKTj7dJYhrBtcAdwDXEUpmc=; b=WaLi21lXwfPxfXMpJ/Q8QS6xzF UsbS4NDgW+cZT8Nwo1FR7tvxo+USDOtaXCc+vCLUR+QmoV4SrTgACDDjWgtI7PKjVMyrs9ODj3o/b DsfNfCzPxdK/rArfcOTV6wFyYo3zC7QQDis64mEiAXhaLxkcrbcO77lr6Sj+dzq0svaPvcl+FqY6P 6l/JlCHMzr0eBDcluXL/iCEflaFs3ZjH6ptNjvWVfOvLaCnJXYJ3I8Y21u9QezsuJPDwJPdhYyFDr tNdVrBQS7fGTRQVHqzZyDIBoSst/URm62x0bWn1xQ95oSVExOWiM/h4NpClZ0VyII7zY29Ac7nV/N 11i4t+Lw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nkWDK-00CjQ3-SM; Fri, 29 Apr 2022 19:23:38 +0000 From: "Matthew Wilcox (Oracle)" To: akpm@linuxfoundation.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH 18/21] mm/shmem: Turn shmem_alloc_page() into shmem_alloc_folio() Date: Fri, 29 Apr 2022 20:23:26 +0100 Message-Id: <20220429192329.3034378-19-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220429192329.3034378-1-willy@infradead.org> References: <20220429192329.3034378-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=WaLi21lX; spf=none (imf10.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-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 9E13AC006E X-Stat-Signature: s3zb3jjmpuxwb7sdzd83kh597j73y6j8 X-HE-Tag: 1651260209-487155 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: Call vma_alloc_folio() directly instead of alloc_page_vma(). It's a bit messy in the callers, but they're about to be cleaned up when they get converted to folios. Signed-off-by: Matthew Wilcox (Oracle) --- mm/shmem.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 4b8d0972bf72..afee80747647 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1543,17 +1543,17 @@ static struct page *shmem_alloc_hugepage(gfp_t gfp, return &folio->page; } -static struct page *shmem_alloc_page(gfp_t gfp, +static struct folio *shmem_alloc_folio(gfp_t gfp, struct shmem_inode_info *info, pgoff_t index) { struct vm_area_struct pvma; - struct page *page; + struct folio *folio; shmem_pseudo_vma_init(&pvma, info, index); - page = alloc_page_vma(gfp, &pvma, 0); + folio = vma_alloc_folio(gfp, 0, &pvma, 0, false); shmem_pseudo_vma_destroy(&pvma); - return page; + return folio; } static struct page *shmem_alloc_and_acct_page(gfp_t gfp, @@ -1575,7 +1575,7 @@ static struct page *shmem_alloc_and_acct_page(gfp_t gfp, if (huge) page = shmem_alloc_hugepage(gfp, info, index); else - page = shmem_alloc_page(gfp, info, index); + page = &shmem_alloc_folio(gfp, info, index)->page; if (page) { __SetPageLocked(page); __SetPageSwapBacked(page); @@ -1625,7 +1625,7 @@ static int shmem_replace_page(struct page **pagep, gfp_t gfp, * limit chance of success by further cpuset and node constraints. */ gfp &= ~GFP_CONSTRAINT_MASK; - newpage = shmem_alloc_page(gfp, info, index); + newpage = &shmem_alloc_folio(gfp, info, index)->page; if (!newpage) return -ENOMEM; @@ -2350,7 +2350,6 @@ int shmem_mfill_atomic_pte(struct mm_struct *dst_mm, if (!*pagep) { ret = -ENOMEM; - page = shmem_alloc_page(gfp, info, pgoff); if (!page) goto out_unacct_blocks; -- 2.34.1