[merged] btrfs-drop-usage-of-folio_index.patch removed from -mm tree

[merged] btrfs-drop-usage-of-folio_index.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: btrfs: drop usage of folio_index
has been removed from the -mm tree.  Its filename was
     btrfs-drop-usage-of-folio_index.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Kairui Song <kasong@tencent.com>
Subject: btrfs: drop usage of folio_index
Date: Thu, 1 May 2025 02:10:48 +0800

folio_index is only needed for mixed usage of page cache and swap cache,
for pure page cache usage, the caller can just use folio->index instead.

It can't be a swap cache folio here.  Swap mapping may only call into fs
through `swap_rw` but btrfs does not use that method for swap.

Link: https://lkml.kernel.org/r/20250430181052.55698-3-ryncsn@gmail.com
Signed-off-by: Kairui Song <kasong@tencent.com>
Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Cc: Chris Mason <clm@fb.com>
Cc: Josef Bacik <josef@toxicpanda.com>
Cc: David Sterba <dsterba@suse.com>
Cc: Chao Yu <chao@kernel.org>
Cc: Chris Li <chrisl@kernel.org>
Cc: Christian Brauner <brauner@kernel.org>
Cc: "Huang, Ying" <ying.huang@linux.alibaba.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Joanne Koong <joannelkoong@gmail.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Yosry Ahmed <yosryahmed@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/btrfs/extent_io.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/fs/btrfs/extent_io.c~btrfs-drop-usage-of-folio_index
+++ a/fs/btrfs/extent_io.c
@@ -3508,7 +3508,7 @@ static void btree_clear_folio_dirty_tag(
 	ASSERT(folio_test_locked(folio));
 	xa_lock_irq(&folio->mapping->i_pages);
 	if (!folio_test_dirty(folio))
-		__xa_clear_mark(&folio->mapping->i_pages, folio_index(folio),
+		__xa_clear_mark(&folio->mapping->i_pages, folio->index,
 				PAGECACHE_TAG_DIRTY);
 	xa_unlock_irq(&folio->mapping->i_pages);
 }
_

Patches currently in -mm which might be from kasong@tencent.com are

fuse-drop-usage-of-folio_index.patch
f2fs-drop-usage-of-folio_index.patch
filemap-do-not-use-folio_contains-for-swap-cache-folios.patch
mm-move-folio_index-to-mm-swaph-and-remove-no-longer-needed-helper.patch
mm-swap-remove-no-longer-used-swap-mapping-helper.patch