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 65A78C54EBE for ; Mon, 16 Jan 2023 19:39:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CA1A96B007B; Mon, 16 Jan 2023 14:39:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C2B7B6B007D; Mon, 16 Jan 2023 14:39:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ACB9C6B007E; Mon, 16 Jan 2023 14:39:39 -0500 (EST) 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 993B86B007B for ; Mon, 16 Jan 2023 14:39:39 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 6EFA81202F6 for ; Mon, 16 Jan 2023 19:39:39 +0000 (UTC) X-FDA: 80361676878.27.D474E81 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf12.hostedemail.com (Postfix) with ESMTP id ED5E340012 for ; Mon, 16 Jan 2023 19:39:37 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=XH2W9gs7; spf=none (imf12.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=1673897978; 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=xC72UzgGngSDoXt52H+Zit4qgNWY+zzDo/EkJgHacCc=; b=Pt8E7KPRzY59uKsDzC6oD8iodIkEpSpctuVG6qh8W6BQHtO9aDgfrl5ypibkbJTGZQ8COa X+DT5qxHuO9Qf0RJamndiRiHh3JZxC09bEqblLA71vkwxTdMU5K5FAfT5+rDb0Ydpc50WJ ZPtgF0/mCXILPiCNicEbMkz5JUBu1d0= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=XH2W9gs7; spf=none (imf12.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673897978; a=rsa-sha256; cv=none; b=MBVVCk8wY5K+QRjtJBbsT29tNDi60/9AxsieA1O3+N4jMnrvFdjgRP41+vSnNWUSclGJHn 0GMZAXKnIFuTILK0OFiWIOsREV3+H/oadT1bFKWNooFGmFBvi4dj7MYcj6bWTwEtXpcK0W Mfz9PhwUTv4ABnLTfrwy5F8r+5BQtP0= 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=xC72UzgGngSDoXt52H+Zit4qgNWY+zzDo/EkJgHacCc=; b=XH2W9gs7YN/z31Bfeb35drSRey mi5JNUqOWG8PkbyhqvYte5nTS2+9gFGoAiNs57Sk6ANglcdQEoVox9eej6Cew+uk4P+TGMhU0b4Aa u1WELsjEXyIQQX3fVgSRRO7/ZkWfM6pbQCo2BfiNBRi69z6+4NAx4tS1/SibanSwjuxuBxHmJAS+L Xqcan1hqCzWh0TbXiyutbkPJZG3c1dYsy4a1uqlBT/2VQnTlolM9+f3TK/B8ddaaF/gUZVinFUL9H Kq0hWHbhMTZuJ2kLQeLLTTulgqjMtbYRH4gH7RA+pQyODQvexMVTg6zsI5T8oVKxJSAnoo4S66m2/ mHVdZ0hg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHVKZ-0090vw-EY; Mon, 16 Jan 2023 19:39:43 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH 2/3] filemap: Convert filemap_range_has_page() to use a folio Date: Mon, 16 Jan 2023 19:39:40 +0000 Message-Id: <20230116193941.2148487-3-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230116193941.2148487-1-willy@infradead.org> References: <20230116193941.2148487-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: ED5E340012 X-Stat-Signature: 3rs4fgn8tmk5ds4ae1t3fdmwww8119hx X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1673897977-903362 X-HE-Meta: U2FsdGVkX19mxFx+xjYaNA9mrfvTT4Uy1wdpIB8O9/UdAvyu8ZkDbDSEfOlBaAtYPIkHE6IoFTJ22m4TwqCrdy/0Yustto5zXtRmr5WfAtBwCbpr7GeEyQrmFaFlaov8+HxNLGpkteE/vcPZVkBH6S+taqwKhK+GPe7ezUm3oIGxaFpTQqWIUDoKnlAM1fEGz7FGTbZklztguHRPqDxKmaQqtpZ98h9qY3EgIs8Pj2t+VkF9Q84XH76U/H6wpP8YssczWz9fFeSR0sKFlQ73dU1mjdqoMOXdoGJVc9H2I3A4Vdu4imwbY1yUh/xa0kDXIJGYpLHoFkLm8sPeODoblBuAq1GhQaSZhjfxtphrEeIlyo0qUktwP/rGqhsn53Ctay8oTWpksC3mHF4HP1INpzQh1AOKsGwJD+/UAkxOAFcu9We9+Lnodz6JBOr4DwFqbtF/swuKN2kiWnXCmZu1So/HcWtZiyddfMgDBKJsfS+OQ+G131mB5AdFXV20K24XuF/hLi7O2ECVItGN9b7uut62gVCFQ0RTeJYGJwbv4cUfk3edI9QcbV2mRGxUNWjKfCUeu9inNOGk7DJKgt2Qxt+ZpjKnFM+bgd94fRVep4RZSvfTjOBf95SnDgJvEJkE/oVbG/HDc0SVwflgtVMwBOfgMqyPzQ44/i88r5jG6mNEmyuKPMwfNF7ihPToaeYZqk72ygaLrX2g8/lMfsDhRDfu3GnFEEy4ZCGLufseFcckcXhDgCQShNoTahgFZFXK1tL6Pqa5PjQ8CpaPDgFVtB+M7NdB/T/FrZ5BtG2m0WrVgbzqURYh+yrUPd7iQVyRZeYDukNGSKNoICDs57rcSPXmDA4uiA1tB/QzSDleyv/s/J5+uB0gxhNeQznihZFyvVis8qDprYUv0EVeU3kC+1Jn4SGm0TNRIRvQtuVv+wZx18hfYZvOvg== 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: The folio isn't returned from this function, so this is an entirely internal change. Signed-off-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index b6b7efc9abc0..c915ded191f0 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -470,7 +470,7 @@ EXPORT_SYMBOL(filemap_flush); bool filemap_range_has_page(struct address_space *mapping, loff_t start_byte, loff_t end_byte) { - struct page *page; + struct folio *folio; XA_STATE(xas, &mapping->i_pages, start_byte >> PAGE_SHIFT); pgoff_t max = end_byte >> PAGE_SHIFT; @@ -479,11 +479,11 @@ bool filemap_range_has_page(struct address_space *mapping, rcu_read_lock(); for (;;) { - page = xas_find(&xas, max); - if (xas_retry(&xas, page)) + folio = xas_find(&xas, max); + if (xas_retry(&xas, folio)) continue; /* Shadow entries don't count */ - if (xa_is_value(page)) + if (xa_is_value(folio)) continue; /* * We don't need to try to pin this page; we're about to @@ -494,7 +494,7 @@ bool filemap_range_has_page(struct address_space *mapping, } rcu_read_unlock(); - return page != NULL; + return folio != NULL; } EXPORT_SYMBOL(filemap_range_has_page); -- 2.35.1