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 129A2C00140 for ; Mon, 8 Aug 2022 19:35:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 21B5A940016; Mon, 8 Aug 2022 15:35:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 15422940007; Mon, 8 Aug 2022 15:35:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E2458940017; Mon, 8 Aug 2022 15:35:25 -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 BB742940007 for ; Mon, 8 Aug 2022 15:35:25 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 9AA8916017C for ; Mon, 8 Aug 2022 19:35:25 +0000 (UTC) X-FDA: 79777429410.16.CC8BBF4 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf10.hostedemail.com (Postfix) with ESMTP id 4886EC002C for ; Mon, 8 Aug 2022 19:35:25 +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=q8gnnWajV66diQ2wfjTJSfiMq1VpYbZiFpN3K+ei4MU=; b=m8F9zBYlm3VQCVcTs85/wO2tcR RLayHQm28n7zDH3+Zm08FxrzFNy8OKF3iwz5W1HEIlOKMEywmd8S96PQHIG1eq97fr4b1TfuceXxE V+DHq26gM/PZQrWOMWiQUPbk6L5HDmQfP3gyjssKIRcHuuqaS9DTcc1Ncapo4y89oIXdgL8Gm8QSg nrR+NQwizoV5HY0nIW2lQHnPRnxD9WnOL1kQ5jsJZbmDgivLHztOBSFl7H0c78cCo29/QgIBt/TNi Jus6TS+EGNN28sj9v1q6wBRNzrzBr3NvaFeB8uT9Z0kNaVAJGnnrbWYW1yt52plAHi06qCYrnFTgH sqNv4SjQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8X3-00EAxE-2q; Mon, 08 Aug 2022 19:35:23 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hughd@google.com Subject: [PATCH 26/59] shmem: Convert shmem_read_mapping_page_gfp() to use shmem_get_folio_gfp() Date: Mon, 8 Aug 2022 20:33:54 +0100 Message-Id: <20220808193430.3378317-27-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220808193430.3378317-1-willy@infradead.org> References: <20220808193430.3378317-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659987325; a=rsa-sha256; cv=none; b=TXInvlRBjoX4ZnRSIWuiOaH4R2oT0uHl6fQwP5T5+0dLhVO8KdrkthBiYSkwd5kn3tonSp mOSrbXq4zg8u8ivprwsIPZzK+ATgbu0TPp9AlqGiLJJ22LJFHkEkfWFDi8TmLLM3g+E1Rl edZECebaLNITX3+FSt0mNW1XaXpMw1Y= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=m8F9zBYl; 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659987325; 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=q8gnnWajV66diQ2wfjTJSfiMq1VpYbZiFpN3K+ei4MU=; b=zUsPP1VYPtrAT0JsTuBLDg87aPUUmONlONeHBrotK2PSjf8tTs/tAu7Ahnkapbe56rdgZZ N6AKx1rogECsWI3gOGFjj5FkYkENvAk+78Sgj+gpLJwj7TLGeBhQVMkAuA8odhhrjQMLhV WsRxEepDhPg84PgdJ1/kFHNfOpQ2la4= X-Rspamd-Queue-Id: 4886EC002C Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=m8F9zBYl; 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-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: qptriodeaw1cnck8ueam7mugt8d7f746 X-HE-Tag: 1659987325-46902 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 f9654008950e..eaaadb7d31b7 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -4258,18 +4258,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