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 4ABD3C6FA82 for ; Fri, 2 Sep 2022 19:47:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0F88780109; Fri, 2 Sep 2022 15:47:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2068D800FC; Fri, 2 Sep 2022 15:47:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B7B608010B; Fri, 2 Sep 2022 15:47:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id A8A1C800FF for ; Fri, 2 Sep 2022 15:47:03 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 915B41A0A06 for ; Fri, 2 Sep 2022 19:47:03 +0000 (UTC) X-FDA: 79868178726.23.A638152 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf05.hostedemail.com (Postfix) with ESMTP id 0E3EB10005B for ; Fri, 2 Sep 2022 19:47:02 +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=OYs7DKMOJ2CJVBO8NYQ1XKRVPPHMKNYSdlF+6wCOqj0=; b=t3VCfxgRI8wpNt/IDPIvKgidU2 bbmxSRfVJhqmvmYcSvXelIC0YhOAx/cDdc+qektHI7mv4NNUO7gDVdYoXWw0CeusNjC70EkMUNrk6 zibVXKo1+LUkYjZbScNQxutW/R1WeaNVAv/nuYHxFQ595EabvWdeDC9OfzbyhvOODA1bWiM1i+iFE oBB5laxrBhvaznzl2Kef4nN+ws2aTBXMmID730DOtzrXoPHncSV8UmWK6Nuc05gtUcKSkNlI55EOx 6RcgTs4ovwoAGqaAZO1X3Vq9oerSh8y8+OYvrUMsqVRg498HIL/xAt7QFagbQinHj1xQy2BjHzFrp mP4m6V5w==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd2-007IdX-GG; 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 26/57] shmem: Convert shmem_write_begin() to use shmem_get_folio() Date: Fri, 2 Sep 2022 20:46:22 +0100 Message-Id: <20220902194653.1739778-27-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=T5uKcBcX9GVz2HkvJchA7vzWszKbvNZ6/UJygQsajyz1iZBDpnIT2yQpI2YQ5Md7xVxlyR 5NbsmNaxctL8biJrNgMjeVqVdQYy22oG7wKKRnN/FrfypP01JhDMObxoPWHVWuSXtR6P51 mVT/vlpBaSWBJ3Z+nAHxOG+GwajdCCg= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=t3VCfxgR; dmarc=none; spf=none (imf05.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=OYs7DKMOJ2CJVBO8NYQ1XKRVPPHMKNYSdlF+6wCOqj0=; b=tXGyDlyjAOwFiefox8xgtm+sSVgxRfQh97PcMrxB9RkH/76Mia5/zJZjz8IjbKp89oSe5r HlE16ZDMIVResJRDmlLlmWB0fjUHCxO8gK4Ogc3HYqCitxgY8r0BpJxOKG1YwmUtO0DrVs zGW4IkKRBEjaVZqClmai1fXCctfNpWU= X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 0E3EB10005B Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=t3VCfxgR; dmarc=none; spf=none (imf05.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: 75xszikqakxqr7qpc5sg64ju8p41rt8f X-HE-Tag: 1662148022-555326 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: Use a folio throughout this function, saving 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 a1cbee06b5cf..44bb6ea11710 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2497,6 +2497,7 @@ shmem_write_begin(struct file *file, struct address_space *mapping, struct inode *inode = mapping->host; struct shmem_inode_info *info = SHMEM_I(inode); pgoff_t index = pos >> PAGE_SHIFT; + struct folio *folio; int ret = 0; /* i_rwsem is held by caller */ @@ -2508,14 +2509,15 @@ shmem_write_begin(struct file *file, struct address_space *mapping, return -EPERM; } - ret = shmem_getpage(inode, index, pagep, SGP_WRITE); + ret = shmem_get_folio(inode, index, &folio, SGP_WRITE); if (ret) return ret; + *pagep = folio_file_page(folio, index); if (PageHWPoison(*pagep)) { - unlock_page(*pagep); - put_page(*pagep); + folio_unlock(folio); + folio_put(folio); *pagep = NULL; return -EIO; } -- 2.35.1