Skip to contentSkip to conversation

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

merged Andrew Morton 1 participant 1 message May 12, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

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 <[email protected]>
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.

---

 fs/btrfs/extent_io.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/extent_io.c renamed from fs/btrfs/extent_io.c~btrfs-drop-usage-of-folio_index +1 -1
@@ -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 [email protected] 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