From patchwork Fri Sep 2 19:46:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 12964562 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 3CE36C6FA83 for ; Fri, 2 Sep 2022 19:47:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3D7FE800F8; Fri, 2 Sep 2022 15:47:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D9F880111; 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 D9CA180101; Fri, 2 Sep 2022 15:47:04 -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 A7ED1800F5 for ; Fri, 2 Sep 2022 15:47:03 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 83D05ABC6D for ; Fri, 2 Sep 2022 19:47:03 +0000 (UTC) X-FDA: 79868178726.29.9B1CB64 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf04.hostedemail.com (Postfix) with ESMTP id 145794005B 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=YnWYtJTxyUkfJ5xzIKovXVn+G+9hgTCLzXw2yYLgy04=; b=Xy3RbiM0O1IA+cpsJUECFt74xN ZnV/jNtRHjIMA5qc4TlbXhqDNgO+MHR/N8eyRx0yZqppKsGS575WxDtqJDujfrP84lkWf/2k/NZgU BoDy5s56C5g9H7VCKjb7JWM+5UqdOi+4wmLzh+DkIT3P27Wy15meb/nJybSywSzfAIE5nioJOKNrY ihG03gelw6kwWDNkyh1H0zA4Pgi7I+/ANKcPbB20s7z0iwoD+qqZ4B7hVMdrdqNFg4IQKx8BHn66z ER0gO1J2zUl4XGh5MsDNALjdcwJuw3/VTm/NzbhjkuazVV13/JMyU8B0hA5SNZrbbSjBzvbb36/nj aM2Pv7FQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd2-007IdQ-CQ; 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 25/57] shmem: Convert shmem_get_partial_folio() to use shmem_get_folio() Date: Fri, 2 Sep 2022 20:46:21 +0100 Message-Id: <20220902194653.1739778-26-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 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662148023; a=rsa-sha256; cv=none; b=Lm+98Npx8HDIw16ey+xtJ2B9wVwn3ov1avsjhKeDyCe4TgFFItf5xOCtQ1JmQgVW+uUX4g YN/ZodrJMYliTdVQLQiduiTczfv5qAGbaFnFmOJvzK2ekDMKWD6/0ZyJhFHFaDK5njRB3d PxYeflsTCJvEAqtRLdnIMG0EhUF9+0c= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Xy3RbiM0; dmarc=none; spf=none (imf04.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=YnWYtJTxyUkfJ5xzIKovXVn+G+9hgTCLzXw2yYLgy04=; b=2GpD9YqFx17R5BA1bG4OKvgRQcgfoO7TvyfZkSwHnfoUGQ3BEs+4fxmaewGkREAi9rgHPn eNhzKGUDYhBDQxLUJZJ0nDvZ0GJ7H/YzBdvI124I2AB7F5EZvKHGCd4A2Y/LXcujkE9WhE 0uAJ6bsCZboPhc3o0RB6R0jzq8lyCnA= X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 145794005B Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Xy3RbiM0; dmarc=none; spf=none (imf04.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: snr9g3yeps81ro57zn6jeofit1c5pxpo X-HE-Tag: 1662148023-82264 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: Get rid of an unnecessary folio->page->folio conversion. Signed-off-by: Matthew Wilcox (Oracle) --- mm/shmem.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index eb9e024f7cf4..a1cbee06b5cf 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -874,10 +874,9 @@ void shmem_unlock_mapping(struct address_space *mapping) static struct folio *shmem_get_partial_folio(struct inode *inode, pgoff_t index) { struct folio *folio; - struct page *page; /* - * At first avoid shmem_getpage(,,,SGP_READ): that fails + * At first avoid shmem_get_folio(,,,SGP_READ): that fails * beyond i_size, and reports fallocated pages as holes. */ folio = __filemap_get_folio(inode->i_mapping, index, @@ -888,9 +887,9 @@ static struct folio *shmem_get_partial_folio(struct inode *inode, pgoff_t index) * But read a page back from swap if any of it is within i_size * (although in some cases this is just a waste of time). */ - page = NULL; - shmem_getpage(inode, index, &page, SGP_READ); - return page ? page_folio(page) : NULL; + folio = NULL; + shmem_get_folio(inode, index, &folio, SGP_READ); + return folio; } /*