Skip to contentSkip to conversation

mm-remove-page_file_offset-and-folio_file_pos.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jun 25, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: remove page_file_offset and folio_file_pos
has been removed from the -mm tree. Its filename was
mm-remove-page_file_offset-and-folio_file_pos.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Kairui Song <[email protected]>
Subject: mm: remove page_file_offset and folio_file_pos
Date: Wed, 22 May 2024 01:58:51 +0800

These two helpers were useful for mixed usage of swap cache and page cache, which help retrieve the corresponding file or swap device offset of a page or folio.

They were introduced in commit f981c5950fa8 ("mm: methods for teaching filesystems about PG_swapcache pages") and used in commit d56b4ddf7781 ("nfs: teach the NFS client how to treat PG_swapcache pages"), suppose to be used with direct_IO for swap over fs.

But after commit e1209d3a7a67 ("mm: introduce ->swap_rw and use it for reads from SWP_FS_OPS swap-space"), swap with direct_IO is no more, and swap cache mapping is never exposed to fs.

Now we have dropped all users of page_file_offset and folio_file_pos, so they can be deleted.

Cc Anna Schumaker <[email protected]>
Cc Barry Song <[email protected]>
Cc Chao Yu <[email protected]>
Cc Chris Li <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc David Howells <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Ilya Dryomov <[email protected]>
Cc Jaegeuk Kim <[email protected]>
Cc Jeff Layton <[email protected]>
Cc Marc Dionne <[email protected]>
Cc Matthew Wilcox (Oracle) <[email protected]>
Cc Minchan Kim <[email protected]>
Cc NeilBrown <[email protected]>
Cc Ryan Roberts <[email protected]>
Cc Ryusuke Konishi <[email protected]>
Cc Trond Myklebust <[email protected]>
Cc Xiubo Li <[email protected]>
Cc Yosry Ahmed <[email protected]>

---

 include/linux/pagemap.h |   17 -----------------
 1 file changed, 17 deletions(-)
include/linux/pagemap.h renamed from include/linux/pagemap.h~mm-remove-page_file_offset-and-folio_file_pos +0 -17
@@ -932,11 +932,6 @@ static inline loff_t page_offset(struct
 	return ((loff_t)page->index) << PAGE_SHIFT;
 }
 
-static inline loff_t page_file_offset(struct page *page)
-{
-	return ((loff_t)page_index(page)) << PAGE_SHIFT;
-}
-
 /**
  * folio_pos - Returns the byte position of this folio in its file.
  * @folio: The folio.
@@ -946,18 +941,6 @@ static inline loff_t folio_pos(struct fo
 	return page_offset(&folio->page);
 }
 
-/**
- * folio_file_pos - Returns the byte position of this folio in its file.
- * @folio: The folio.
- *
- * This differs from folio_pos() for folios which belong to a swap file.
- * NFS is the only filesystem today which needs to use folio_file_pos().
- */
-static inline loff_t folio_file_pos(struct folio *folio)
-{
-	return page_file_offset(&folio->page);
-}
-
 /*
  * Get the offset in PAGE_SIZE (even for hugetlb folios).
  */

_

Patches currently in -mm which might be from [email protected] are