From: Kairui Song <ryncsn@gmail.com>
To: linux-mm@kvack.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
"Huang, Ying" <ying.huang@intel.com>,
Matthew Wilcox <willy@infradead.org>,
Chris Li <chrisl@kernel.org>, Barry Song <v-songbaohua@oppo.com>,
Ryan Roberts <ryan.roberts@arm.com>, Neil Brown <neilb@suse.de>,
Minchan Kim <minchan@kernel.org>, Hugh Dickins <hughd@google.com>,
David Hildenbrand <david@redhat.com>,
Yosry Ahmed <yosryahmed@google.com>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
Kairui Song <kasong@tencent.com>
Subject: [PATCH v3 10/12] mm: remove page_file_offset and folio_file_pos
Date: Tue, 30 Apr 2024 03:11:36 +0800 [thread overview]
Message-ID: <20240429191138.34123-3-ryncsn@gmail.com> (raw)
In-Reply-To: <20240429190500.30979-1-ryncsn@gmail.com>
From: Kairui Song <kasong@tencent.com>
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.
Signed-off-by: Kairui Song <kasong@tencent.com>
---
include/linux/pagemap.h | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 4e85f33721c4..91474dcc6cce 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -917,11 +917,6 @@ static inline loff_t page_offset(struct page *page)
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.
@@ -931,18 +926,6 @@ static inline loff_t folio_pos(struct folio *folio)
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).
*/
--
2.44.0
next prev parent reply other threads:[~2024-04-29 19:13 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-29 19:04 [PATCH v3 00/12] mm/swap: clean up and optimize swap cache index Kairui Song
2024-04-29 19:04 ` [PATCH v3 01/12] f2fs: drop usage of page_index Kairui Song
2024-04-29 19:04 ` [PATCH v3 02/12] nilfs2: " Kairui Song
2024-04-29 19:14 ` Matthew Wilcox
2024-04-29 19:22 ` Kairui Song
2024-04-29 19:28 ` Ryusuke Konishi
2024-04-29 19:38 ` Matthew Wilcox
2024-04-29 20:01 ` Ryusuke Konishi
2024-04-30 15:27 ` Kairui Song
2024-04-29 19:04 ` [PATCH v3 03/12] ceph: " Kairui Song
2024-04-29 19:04 ` [PATCH v3 04/12] NFS: remove nfs_page_lengthg and " Kairui Song
2024-04-29 19:04 ` [PATCH v3 05/12] cifs: drop usage of page_file_offset Kairui Song
2024-04-29 20:19 ` [EXTERNAL] " Steven French
2024-04-29 20:26 ` Matthew Wilcox
2024-04-30 2:23 ` Steven French
2024-04-30 15:40 ` Kairui Song
2024-04-29 19:04 ` [PATCH v3 07/12] netfs: drop usage of folio_file_pos Kairui Song
2024-04-29 19:11 ` [PATCH v3 08/12] nfs: " Kairui Song
2024-04-29 19:21 ` Matthew Wilcox
2024-04-29 19:42 ` Kairui Song
2024-04-29 19:11 ` [PATCH v3 09/12] mm/swap: get the swap file offset directly Kairui Song
2024-04-29 19:11 ` Kairui Song [this message]
2024-04-29 19:11 ` [PATCH v3 11/12] mm: drop page_index and convert folio_index to use folio Kairui Song
2024-04-29 19:11 ` [PATCH v3 12/12] mm/swap: reduce swap cache search space Kairui Song
2024-04-30 2:45 ` [PATCH v3 00/12] mm/swap: clean up and optimize swap cache index Huang, Ying
2024-04-30 15:27 ` Kairui Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240429191138.34123-3-ryncsn@gmail.com \
--to=ryncsn@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=chrisl@kernel.org \
--cc=david@redhat.com \
--cc=hughd@google.com \
--cc=kasong@tencent.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=minchan@kernel.org \
--cc=neilb@suse.de \
--cc=ryan.roberts@arm.com \
--cc=v-songbaohua@oppo.com \
--cc=willy@infradead.org \
--cc=ying.huang@intel.com \
--cc=yosryahmed@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).