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>,
Ryusuke Konishi <konishi.ryusuke@gmail.com>,
linux-nilfs@vger.kernel.org
Subject: [PATCH v4 02/12] nilfs2: drop usage of page_index
Date: Thu, 2 May 2024 16:45:59 +0800 [thread overview]
Message-ID: <20240502084609.28376-3-ryncsn@gmail.com> (raw)
In-Reply-To: <20240502084609.28376-1-ryncsn@gmail.com>
From: Kairui Song <kasong@tencent.com>
page_index is only 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 (being part of buffer head),
so just drop it. And while we are at it, optimize the code by retrieving
the offset of the buffer head within the folio directly using bh_offset,
and get rid of the loop and usage of page helpers.
Suggested-by: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Kairui Song <kasong@tencent.com>
Cc: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Cc: linux-nilfs@vger.kernel.org
---
fs/nilfs2/bmap.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/fs/nilfs2/bmap.c b/fs/nilfs2/bmap.c
index 383f0afa2cea..cd14ea25968c 100644
--- a/fs/nilfs2/bmap.c
+++ b/fs/nilfs2/bmap.c
@@ -450,15 +450,9 @@ int nilfs_bmap_test_and_clear_dirty(struct nilfs_bmap *bmap)
__u64 nilfs_bmap_data_get_key(const struct nilfs_bmap *bmap,
const struct buffer_head *bh)
{
- struct buffer_head *pbh;
- __u64 key;
+ loff_t pos = folio_pos(bh->b_folio) + bh_offset(bh);
- key = page_index(bh->b_page) << (PAGE_SHIFT -
- bmap->b_inode->i_blkbits);
- for (pbh = page_buffers(bh->b_page); pbh != bh; pbh = pbh->b_this_page)
- key++;
-
- return key;
+ return pos >> bmap->b_inode->i_blkbits;
}
__u64 nilfs_bmap_find_target_seq(const struct nilfs_bmap *bmap, __u64 key)
--
2.44.0
next prev parent reply other threads:[~2024-05-02 8:47 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-02 8:45 [PATCH v4 00/12] mm/swap: clean up and optimize swap cache index Kairui Song
2024-05-02 8:45 ` [PATCH v4 01/12] f2fs: drop usage of page_index Kairui Song
2024-05-02 8:45 ` Kairui Song [this message]
2024-05-02 11:08 ` [PATCH v4 02/12] nilfs2: " Ryusuke Konishi
2024-05-02 8:46 ` [PATCH v4 03/12] ceph: " Kairui Song
2024-05-02 8:46 ` [PATCH v4 04/12] NFS: remove nfs_page_lengthg and " Kairui Song
2024-05-02 8:46 ` [PATCH v4 05/12] cifs: drop usage of page_file_offset Kairui Song
2024-05-02 8:46 ` [PATCH v4 06/12] afs: drop usage of folio_file_pos Kairui Song
2024-05-02 8:46 ` [PATCH v4 07/12] netfs: " Kairui Song
2024-05-02 8:49 ` [PATCH v4 08/12] nfs: " Kairui Song
2024-05-02 8:49 ` [PATCH v4 09/12] mm/swap: get the swap device offset directly Kairui Song
2024-05-08 6:28 ` Huang, Ying
2024-05-02 8:49 ` [PATCH v4 10/12] mm: remove page_file_offset and folio_file_pos Kairui Song
2024-05-08 6:32 ` Huang, Ying
2024-05-02 8:49 ` [PATCH v4 11/12] mm: drop page_index and convert folio_index to use folio Kairui Song
2024-05-02 9:12 ` David Hildenbrand
2024-05-02 9:32 ` Kairui Song
2024-05-02 9:38 ` Kairui Song
2024-05-02 8:49 ` [PATCH v4 12/12] mm/swap: reduce swap cache search space Kairui Song
2024-05-08 7:25 ` Huang, Ying
2024-05-08 7:49 ` 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=20240502084609.28376-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=konishi.ryusuke@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nilfs@vger.kernel.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 read-only IMAP folder(s) and NNTP newsgroup(s).