Skip to contentSkip to conversation

afs-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: afs: drop usage of folio_file_pos
has been removed from the -mm tree. Its filename was
afs-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: afs: drop usage of folio_file_pos
Date: Wed, 22 May 2024 01:58:47 +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 afs. So just drop it and use folio_pos instead.

Cc David Howells <[email protected]>
Cc Marc Dionne <[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 Jeff Layton <[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/afs/dir.c      |    6 +++---
 fs/afs/dir_edit.c |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
fs/afs/dir.c renamed from fs/afs/dir.c~afs-drop-usage-of-folio_file_pos +3 -3
@@ -533,14 +533,14 @@ static int afs_dir_iterate(struct inode
 			break;
 		}
 
-		offset = round_down(ctx->pos, sizeof(*dblock)) - folio_file_pos(folio);
+		offset = round_down(ctx->pos, sizeof(*dblock)) - folio_pos(folio);
 		size = min_t(loff_t, folio_size(folio),
-			     req->actual_len - folio_file_pos(folio));
+			     req->actual_len - folio_pos(folio));
 
 		do {
 			dblock = kmap_local_folio(folio, offset);
 			ret = afs_dir_iterate_block(dvnode, ctx, dblock,
-						    folio_file_pos(folio) + offset);
+						    folio_pos(folio) + offset);
 			kunmap_local(dblock);
 			if (ret != 1)
 				goto out;
fs/afs/dir_edit.c renamed from fs/afs/dir_edit.c~afs-drop-usage-of-folio_file_pos +2 -2
@@ -256,7 +256,7 @@ void afs_edit_dir_add(struct afs_vnode *
 			folio = folio0;
 		}
 
-		block = kmap_local_folio(folio, b * AFS_DIR_BLOCK_SIZE - folio_file_pos(folio));
+		block = kmap_local_folio(folio, b * AFS_DIR_BLOCK_SIZE - folio_pos(folio));
 
 		/* Abandon the edit if we got a callback break. */
 		if (!test_bit(AFS_VNODE_DIR_VALID, &vnode->flags))
@@ -417,7 +417,7 @@ void afs_edit_dir_remove(struct afs_vnod
 			folio = folio0;
 		}
 
-		block = kmap_local_folio(folio, b * AFS_DIR_BLOCK_SIZE - folio_file_pos(folio));
+		block = kmap_local_folio(folio, b * AFS_DIR_BLOCK_SIZE - folio_pos(folio));
 
 		/* Abandon the edit if we got a callback break. */
 		if (!test_bit(AFS_VNODE_DIR_VALID, &vnode->flags))

_

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