Skip to contentSkip to conversation

netfs-drop-usage-of-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: netfs: drop usage of folio_file_pos
has been removed from the -mm tree. Its filename was
netfs-drop-usage-of-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: netfs: drop usage of folio_file_pos
Date: Wed, 22 May 2024 01:58:48 +0800

folio_file_pos is only needed for mixed usage of page cache and swap cache, for pure page cache usage, the caller can just use folio_pos instead.

It can't be a swap cache page here. Swap mapping may only call into fs through swap_rw and that is not supported for netfs. So just drop it and use folio_pos instead.

Cc David Howells <[email protected]>
Cc Jeff Layton <[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 "Huang, Ying" <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Ilya Dryomov <[email protected]>
Cc Jaegeuk Kim <[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]>

---

 fs/netfs/buffered_read.c  |    4 ++--
 fs/netfs/buffered_write.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
fs/netfs/buffered_read.c renamed from fs/netfs/buffered_read.c~netfs-drop-usage-of-folio_file_pos +2 -2
@@ -271,7 +271,7 @@ int netfs_read_folio(struct file *file,
 	_enter("%lx", folio->index);
 
 	rreq = netfs_alloc_request(mapping, file,
-				   folio_file_pos(folio), folio_size(folio),
+				   folio_pos(folio), folio_size(folio),
 				   NETFS_READPAGE);
 	if (IS_ERR(rreq)) {
 		ret = PTR_ERR(rreq);
@@ -470,7 +470,7 @@ retry:
 	}
 
 	rreq = netfs_alloc_request(mapping, file,
-				   folio_file_pos(folio), folio_size(folio),
+				   folio_pos(folio), folio_size(folio),
 				   NETFS_READ_FOR_WRITE);
 	if (IS_ERR(rreq)) {
 		ret = PTR_ERR(rreq);
fs/netfs/buffered_write.c renamed from fs/netfs/buffered_write.c~netfs-drop-usage-of-folio_file_pos +1 -1
@@ -54,7 +54,7 @@ static enum netfs_how_to_modify netfs_ho
 {
 	struct netfs_folio *finfo = netfs_folio_info(folio);
 	struct netfs_group *group = netfs_folio_group(folio);
-	loff_t pos = folio_file_pos(folio);
+	loff_t pos = folio_pos(folio);
 
 	_enter("");
 

_

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