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 7CF7AC6FA83 for ; Fri, 2 Sep 2022 19:47:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 96258800FE; Fri, 2 Sep 2022 15:47:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D25580105; 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 4560980101; Fri, 2 Sep 2022 15:47:05 -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 C048F80107 for ; Fri, 2 Sep 2022 15:47:03 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 9918CA121F for ; Fri, 2 Sep 2022 19:47:03 +0000 (UTC) X-FDA: 79868178726.18.22CBE98 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf20.hostedemail.com (Postfix) with ESMTP id 395E01C005F 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=5Lid3a1FhkSdqQODgXuXyckrWFdaSG2l+haewh8Zgwg=; b=oSRwhnyqtBGt8BcB4U7Ni/76eY 42ZgFzo2lW5z7UH107AwuTPUtzjJdZWmZ5un0/oF5A4CMA5/18h8Jx0f3QWTyEMAi2iPiOk9PV2f/ mGuJiwIQOjIr73LNQJB7K7QUEcmCD4mB1ov9kfGyXQfHyBOB0u+FWMQNgefwbmaiXkmQoupdbcXb+ o8Ofyo4PYir3BimLxfJectKMMbHrj+vwE/L1B2WMgFm5Ne57sCr+isKL4PkjZFBuTog1D+TKDceqf 1bLWpuM80SsuJHdrzwWbL53yHb19JKljBoch+i/cRxpZKhCzMrUcikuTrnZ3RKR0S6oYM2Igyau3M hKvXenlg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd2-007IdC-5M; 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 23/57] shmem: Convert shmem_read_mapping_page_gfp() to use shmem_get_folio_gfp() Date: Fri, 2 Sep 2022 20:46:19 +0100 Message-Id: <20220902194653.1739778-24-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=vwEcy9fgoDKiCJXXRMladFiSUIXaG9Ivqu5uWvx7ztNnNodbQae/OCAAWWTtEMEGNF1owD SclP9eBtxkjWDfbV+cU3XDvk57Mrh6DUcW4Ug5+0COTrobTh+3ZIFmCrZZ++SmrU5p10/v Xg0Sn8gfxTakU5I8rQF/Wan0yuz4POI= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=oSRwhnyq; dmarc=none; spf=none (imf20.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org 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=5Lid3a1FhkSdqQODgXuXyckrWFdaSG2l+haewh8Zgwg=; b=Dj5Z205clJ+/nnRmOAXEvx0cgzkrEtEOnBlu37pfqk4YeQBwyVSxmlqyJJc0igEVzuT1aJ vf0MT3sg72QmZUmb+WaHatgENV7Ar0akouuby41pVkeCE7MOIkd0JvQFuV83s5f+O8GOpv QBI56iAx/Djiy4k3QGmO7q4znrREax8= X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 395E01C005F Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=oSRwhnyq; dmarc=none; spf=none (imf20.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: 66nb414hgf8dm89ibpnkroxjyguk77is X-HE-Tag: 1662148023-71754 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: Saves a couple of calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/shmem.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 59184bf6731f..107b8f019373 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -4269,18 +4269,20 @@ struct page *shmem_read_mapping_page_gfp(struct address_space *mapping, { #ifdef CONFIG_SHMEM struct inode *inode = mapping->host; + struct folio *folio; struct page *page; int error; BUG_ON(!shmem_mapping(mapping)); - error = shmem_getpage_gfp(inode, index, &page, SGP_CACHE, + error = shmem_get_folio_gfp(inode, index, &folio, SGP_CACHE, gfp, NULL, NULL, NULL); if (error) return ERR_PTR(error); - unlock_page(page); + folio_unlock(folio); + page = folio_file_page(folio, index); if (PageHWPoison(page)) { - put_page(page); + folio_put(folio); return ERR_PTR(-EIO); } -- 2.35.1