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 61336C4167B for ; Wed, 4 May 2022 18:29:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C018B6B0099; Wed, 4 May 2022 14:29:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 40CA36B009A; Wed, 4 May 2022 14:29:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF3256B0087; Wed, 4 May 2022 14:29:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 984416B0085 for ; Wed, 4 May 2022 14:29:06 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 6B7142B316 for ; Wed, 4 May 2022 18:29:06 +0000 (UTC) X-FDA: 79428897492.22.2E29682 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf02.hostedemail.com (Postfix) with ESMTP id CE4D480097 for ; Wed, 4 May 2022 18:29:00 +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=KCGFMWstlwCQri3/MYlLlNDeEw20HeCV8bFed16Pygc=; b=vhftwwRUBge/q+QcD7LI9Jnr7v h/f1whj9goTzPf2iJglvZK7LLkOflrUG+InXqmOt6y4HJeHXni3P5hpjEMX8bvG2660uB2QGK0+t0 eK3xGZ3Ed91h1XiACy5aOCYQO1Gchwk5YjbVvGJL2GHJiyhfuYzC6+opxnUoG5w5j3T7OnBSh8bH3 lw4lP89z4NCkFtvA1BS1kR4AKIGWcZ2JxKEQKPgutzavHv/f861xW6VfAxoEM6q3a+sz2CBxXCBos tMePoOc6SgrFKKCY+PiU4mxzyo0JjWHyQtU/0KzqcvNEQx9y07lwbhHsFWUMXyqHFzed/kNWwFfnq rTYsy1nA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nmJkG-00Gq8f-HN; Wed, 04 May 2022 18:29:04 +0000 From: "Matthew Wilcox (Oracle)" To: akpm@linuxfoundation.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH v2 21/26] mm/shmem: Convert shmem_alloc_and_acct_page to use a folio Date: Wed, 4 May 2022 19:28:52 +0100 Message-Id: <20220504182857.4013401-22-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220504182857.4013401-1-willy@infradead.org> References: <20220504182857.4013401-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=vhftwwRU; dmarc=none; spf=none (imf02.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: CE4D480097 X-Rspam-User: X-Stat-Signature: tjywc8kwtoeegod5krfoo4t44u1rpsoh X-HE-Tag: 1651688940-538907 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: Convert shmem_alloc_hugepage() to return the folio that it uses and use a folio throughout shmem_alloc_and_acct_page(). Continue to return a page from shmem_alloc_and_acct_page() for now. Signed-off-by: Matthew Wilcox (Oracle) --- mm/shmem.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 36a4d7f07e0b..352137f0090a 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1522,7 +1522,7 @@ static gfp_t limit_gfp_mask(gfp_t huge_gfp, gfp_t limit_gfp) return result; } -static struct page *shmem_alloc_hugepage(gfp_t gfp, +static struct folio *shmem_alloc_hugefolio(gfp_t gfp, struct shmem_inode_info *info, pgoff_t index) { struct vm_area_struct pvma; @@ -1540,7 +1540,7 @@ static struct page *shmem_alloc_hugepage(gfp_t gfp, shmem_pseudo_vma_destroy(&pvma); if (!folio) count_vm_event(THP_FILE_FALLBACK); - return &folio->page; + return folio; } static struct folio *shmem_alloc_folio(gfp_t gfp, @@ -1567,7 +1567,7 @@ static struct page *shmem_alloc_and_acct_page(gfp_t gfp, pgoff_t index, bool huge) { struct shmem_inode_info *info = SHMEM_I(inode); - struct page *page; + struct folio *folio; int nr; int err = -ENOSPC; @@ -1579,13 +1579,13 @@ static struct page *shmem_alloc_and_acct_page(gfp_t gfp, goto failed; if (huge) - page = shmem_alloc_hugepage(gfp, info, index); + folio = shmem_alloc_hugefolio(gfp, info, index); else - page = shmem_alloc_page(gfp, info, index); - if (page) { - __SetPageLocked(page); - __SetPageSwapBacked(page); - return page; + folio = shmem_alloc_folio(gfp, info, index); + if (folio) { + __folio_set_locked(folio); + __folio_set_swapbacked(folio); + return &folio->page; } err = -ENOMEM; -- 2.34.1