Skip to contentSkip to conversation

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

page_index is needed for mixed usage of page cache and swap cache, for pure page cache usage, the caller can just use page->index instead.

It can't be a swap cache page here, so just drop it.

Cc Xiubo Li <[email protected]>
Cc Ilya Dryomov <[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 David Howells <[email protected]>
Cc "Huang, Ying" <[email protected]>
Cc Hugh Dickins <[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 Yosry Ahmed <[email protected]>

---

 fs/ceph/dir.c   |    2 +-
 fs/ceph/inode.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
fs/ceph/dir.c renamed from fs/ceph/dir.c~ceph-drop-usage-of-page_index +1 -1
@@ -141,7 +141,7 @@ __dcache_find_get_entry(struct dentry *p
 	if (ptr_pos >= i_size_read(dir))
 		return NULL;
 
-	if (!cache_ctl->page || ptr_pgoff != page_index(cache_ctl->page)) {
+	if (!cache_ctl->page || ptr_pgoff != cache_ctl->page->index) {
 		ceph_readdir_cache_release(cache_ctl);
 		cache_ctl->page = find_lock_page(&dir->i_data, ptr_pgoff);
 		if (!cache_ctl->page) {
fs/ceph/inode.c renamed from fs/ceph/inode.c~ceph-drop-usage-of-page_index +1 -1
@@ -1863,7 +1863,7 @@ static int fill_readdir_cache(struct ino
 	unsigned idx = ctl->index % nsize;
 	pgoff_t pgoff = ctl->index / nsize;
 
-	if (!ctl->page || pgoff != page_index(ctl->page)) {
+	if (!ctl->page || pgoff != ctl->page->index) {
 		ceph_readdir_cache_release(ctl);
 		if (idx == 0)
 			ctl->page = grab_cache_page(&dir->i_data, pgoff);

_

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