Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp6222507rwb; Wed, 18 Jan 2023 02:42:05 -0800 (PST) X-Google-Smtp-Source: AMrXdXstXoDEvMzLcZxlq3R6yT+M9yCtRf6ssT5+dkl8fgVSWa7x43Q66zlQjXhw9Xa7YCPCGPvt X-Received: by 2002:a62:79d2:0:b0:582:b089:d9be with SMTP id u201-20020a6279d2000000b00582b089d9bemr7021449pfc.13.1674038524879; Wed, 18 Jan 2023 02:42:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674038524; cv=none; d=google.com; s=arc-20160816; b=zHGExH3t0txC7x0cE804mTDVoR5LztkeqB20Kmz8QlXLSPuTm1CgVN9/fdodhYNc9O vogB9/DOz5OYz91OlpjA7kImyEj4nK4BrRj02p1zandQC8NrbobfC1wwR/AU+L0tjbcJ o0VbfN13QYQmRo6wfLODsg6L/Hzxpw4e9tRyNaj7t8sANVzFplq242nhcFmQF82LUU6K VYrWBHSjg162e09EAsnx3Fr4bGwN8G4KIM2CASDluFBIzx4m9mWd9qhfKtYSmnBMB0bT o4ziOej0aBNZqsQNKQzQ/v8BIo20+Cw4B1T0dtcGMkpTYYuQoY9Cz0adCwVs9OqCTLmD 4K5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OEkmrOTp9bp0MHf7fBWQdFeBfwkVijLbFt/ZuD+SID8=; b=M4NGL9oGTD3hc9Lv2kSmV58MGN9Clz0p67BumBwoOJa0MMExa8QyXeiULVgbaaKzLG cYc+in/GJsGskhsngKEH+j0G+mvwWQos5Hk1mvxS9ADWfPXTM1McTjRBg75PWamjG6Wr fTRuhw2zNTSkQVMCp2wDvkfG8QgtL0SScd8D2jxJm1W3+Ov5j8xtsns6gOmx3CRD03fb PRU6Xz7W3+/r6l5pGYBlt1agHrXHakc8SXdePmYl+MhFHuYAEt/hKYsT7wn5vvx41oYs btYpUi1lMdxDSpbsD5eIzhUgJ6XAB5bZoTwC0dx8YLFWtfK17V3n7ZZ/jEg+UALiKoRV tN/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=fWwuU2mF; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m8-20020a056a00080800b0056be3585c3asi1881596pfk.266.2023.01.18.02.41.52; Wed, 18 Jan 2023 02:42:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=fWwuU2mF; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229691AbjARKl2 (ORCPT + 99 others); Wed, 18 Jan 2023 05:41:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229893AbjARKjY (ORCPT ); Wed, 18 Jan 2023 05:39:24 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7050166CDC; Wed, 18 Jan 2023 01:43:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; 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=OEkmrOTp9bp0MHf7fBWQdFeBfwkVijLbFt/ZuD+SID8=; b=fWwuU2mFDmXn7LwEaystbVgNKf 6W93ZUCVYBEuM6BrPk3yZuB09IzyaYZNsTkpzicBlyvZKyWPX0ki0J49msMlHfuxugAu1eEpI689X y3CMYNJbf3x3e3glDVCfRkR2AGRlBUjvBFY2PU2onSO73vKdDz+4yihTQap94U2geZXsUIy3Nugm1 wwPypEDOLE1/EGs/LD+ckYeTYmWPL3OM5Ra2Ppy9xP69HNLk6e/o8aBvYgPktsz2IXYbniaEeToGZ 4S8+Y9JfE4TjlT4PHg3Q+l/NnOBJcLddPWjYBKnTtMY7K5Z+TnqSyyRu9ooFbBu2aIsdGxbH9f2oO xXZ8yYKQ==; Received: from 213-147-167-250.nat.highway.webapn.at ([213.147.167.250] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pI4yt-0009wo-CP; Wed, 18 Jan 2023 09:43:43 +0000 From: Christoph Hellwig To: Andrew Morton , Matthew Wilcox , Hugh Dickins Cc: linux-afs@lists.infradead.org, linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org, cluster-devel@redhat.com, linux-mm@kvack.org, linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-nilfs@vger.kernel.org Subject: [PATCH 2/9] mm: make mapping_get_entry available outside of filemap.c Date: Wed, 18 Jan 2023 10:43:22 +0100 Message-Id: <20230118094329.9553-3-hch@lst.de> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230118094329.9553-1-hch@lst.de> References: <20230118094329.9553-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org mapping_get_entry is useful for page cache API users that need to know about xa_value internals. Rename it and make it available in pagemap.h. Signed-off-by: Christoph Hellwig --- include/linux/pagemap.h | 1 + mm/filemap.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 9f108168377195..24dedf6b12be49 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -507,6 +507,7 @@ pgoff_t page_cache_prev_miss(struct address_space *mapping, #define FGP_ENTRY 0x00000080 #define FGP_STABLE 0x00000100 +void *filemap_get_entry(struct address_space *mapping, pgoff_t index); struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, int fgp_flags, gfp_t gfp); struct page *pagecache_get_page(struct address_space *mapping, pgoff_t index, diff --git a/mm/filemap.c b/mm/filemap.c index c915ded191f03f..ed0583f9e27512 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1834,7 +1834,7 @@ EXPORT_SYMBOL(page_cache_prev_miss); */ /* - * mapping_get_entry - Get a page cache entry. + * filemap_get_entry - Get a page cache entry. * @mapping: the address_space to search * @index: The page cache index. * @@ -1845,7 +1845,7 @@ EXPORT_SYMBOL(page_cache_prev_miss); * * Return: The folio, swap or shadow entry, %NULL if nothing is found. */ -static void *mapping_get_entry(struct address_space *mapping, pgoff_t index) +void *filemap_get_entry(struct address_space *mapping, pgoff_t index) { XA_STATE(xas, &mapping->i_pages, index); struct folio *folio; @@ -1915,7 +1915,7 @@ struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, struct folio *folio; repeat: - folio = mapping_get_entry(mapping, index); + folio = filemap_get_entry(mapping, index); if (xa_is_value(folio)) { if (fgp_flags & FGP_ENTRY) return folio; -- 2.39.0