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 BAD8BC25B08 for ; Mon, 8 Aug 2022 19:35:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D5EBB940015; Mon, 8 Aug 2022 15:35:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CEE39940016; Mon, 8 Aug 2022 15:35:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A2B9C940015; Mon, 8 Aug 2022 15:35:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 868F0940007 for ; Mon, 8 Aug 2022 15:35:25 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 6393AC019A for ; Mon, 8 Aug 2022 19:35:25 +0000 (UTC) X-FDA: 79777429410.10.8175288 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf23.hostedemail.com (Postfix) with ESMTP id 01C0D140035 for ; Mon, 8 Aug 2022 19:35:24 +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=4/bBVrQwW9UQGE0RAa+OZQItuDYpAzdCXqP4/yS9MfU=; b=bIH93aETHmHh/KLf0RkLP3J0Yz ZpMuvKXgXe6vHBrKnopUl3n/bZJsk0z/TntoiVnUkp7vjX9iuTad2ChAq0zR7v1kYPQAoazXFSiN9 rRgNtEpc/1TU6QbjdEiODEGgUZa1+ctR5Vuiz9MjGF7h0NoWTx+OwDFCmN/MqHttLsw842FfjOiMG UFNjYWCoU+TEbUtzH+ufZXKFE0T/7gOpQhWRJxDuelxfcXQ4ZvE7lz5LvaZFOL9pVfRobQlzIgIbb BubpyJjIKCm0yTkRKHTGAoBADXAZ53e9q1f9KJwZQt9R7A9ZLYWbvInnuC96pA6oqqTkgeLwFWr1Q 0OK/tmxg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8X2-00EAx8-TV; Mon, 08 Aug 2022 19:35:20 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hughd@google.com Subject: [PATCH 25/59] shmem: Convert shmem_fault() to use shmem_get_folio_gfp() Date: Mon, 8 Aug 2022 20:33:53 +0100 Message-Id: <20220808193430.3378317-26-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=237L/bDNwXUW7x8aLHBe4HjOTMyvtYmTTUrttfgS/1KSKSjvlfrYfkiQ1H1hWJbZRWf5/d EtJO23QtXxzzVPa/RKPJPBBZ0FZGlkXPSdtyAYaUQluQ1XuKb2Kidvx7pOT5pOEwgQpl4/ IIZ7XoB4tClny78wzQkhq6RDUPlAmXg= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=bIH93aET; dmarc=none; spf=none (imf23.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=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=4/bBVrQwW9UQGE0RAa+OZQItuDYpAzdCXqP4/yS9MfU=; b=DMyQrd0LUSDisnnlSUafdkzA72DjbmczCGFYGUkzQiJKM32TDT2ozY1Va43RMtWDVjfHnt nvqKYu56fk0Egu7geSJmFNr/LYuhqsZgLhNztGG2uNKwWkaA6p44+F8CmoLr2eLIHV8GGF u7kEiwSi3SNMew6L3dKPZzseu5Jo64g= X-Rspamd-Server: rspam10 X-Stat-Signature: cycgojo5ergpyudj345octdragcf6hr6 Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=bIH93aET; dmarc=none; spf=none (imf23.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-Rspamd-Queue-Id: 01C0D140035 X-HE-Tag: 1659987324-928346 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: No particular advantage for this function, but necessary to remove shmem_getpage_gfp(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/shmem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/shmem.c b/mm/shmem.c index e41214dcb137..f9654008950e 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2063,6 +2063,7 @@ static vm_fault_t shmem_fault(struct vm_fault *vmf) struct vm_area_struct *vma = vmf->vma; struct inode *inode = file_inode(vma->vm_file); gfp_t gfp = mapping_gfp_mask(inode->i_mapping); + struct folio *folio; int err; vm_fault_t ret = VM_FAULT_LOCKED; @@ -2125,10 +2126,11 @@ static vm_fault_t shmem_fault(struct vm_fault *vmf) spin_unlock(&inode->i_lock); } - err = shmem_getpage_gfp(inode, vmf->pgoff, &vmf->page, SGP_CACHE, + err = shmem_get_folio_gfp(inode, vmf->pgoff, &folio, SGP_CACHE, gfp, vma, vmf, &ret); if (err) return vmf_error(err); + vmf->page = folio_file_page(folio, vmf->pgoff); return ret; } -- 2.35.1