Skip to contentSkip to conversation

nfs-remove-nfs_page_lengthg-and-usage-of-page_index.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: NFS: remove nfs_page_lengthg and usage of page_index
has been removed from the -mm tree. Its filename was
nfs-remove-nfs_page_lengthg-and-usage-of-page_index.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: NFS: remove nfs_page_lengthg and usage of page_index
Date: Wed, 22 May 2024 01:58:46 +0800

This function is no longer used after commit 4fa7a717b432 ("NFS: Fix up nfs_vm_page_mkwrite() for folios"), all users have been converted to use folio instead, just delete it to remove usage of page_index.

Cc Trond Myklebust <[email protected]>
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 "Huang, Ying" <[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 Xiubo Li <[email protected]>
Cc Yosry Ahmed <[email protected]>

---

 fs/nfs/internal.h |   19 -------------------
 1 file changed, 19 deletions(-)
fs/nfs/internal.h renamed from fs/nfs/internal.h~nfs-remove-nfs_page_lengthg-and-usage-of-page_index +0 -19
@@ -800,25 +800,6 @@ static inline void nfs_folio_mark_unstab
 /*
  * Determine the number of bytes of data the page contains
  */
-static inline
-unsigned int nfs_page_length(struct page *page)
-{
-	loff_t i_size = i_size_read(page_file_mapping(page)->host);
-
-	if (i_size > 0) {
-		pgoff_t index = page_index(page);
-		pgoff_t end_index = (i_size - 1) >> PAGE_SHIFT;
-		if (index < end_index)
-			return PAGE_SIZE;
-		if (index == end_index)
-			return ((i_size - 1) & ~PAGE_MASK) + 1;
-	}
-	return 0;
-}
-
-/*
- * Determine the number of bytes of data the page contains
- */
 static inline size_t nfs_folio_length(struct folio *folio)
 {
 	loff_t i_size = i_size_read(folio_file_mapping(folio)->host);

_

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