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>, Chao Yu <chao@kernel.org>, Jaegeuk Kim <jaegeuk@kernel.org>, linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH 3/8] f2fs: drop usage of page_index Date: Thu, 18 Apr 2024 00:08:37 +0800 [thread overview] Message-ID: <20240417160842.76665-4-ryncsn@gmail.com> (raw) In-Reply-To: <20240417160842.76665-1-ryncsn@gmail.com> From: Kairui Song <kasong@tencent.com> 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. Signed-off-by: Kairui Song <kasong@tencent.com> Cc: Chao Yu <chao@kernel.org> Cc: Jaegeuk Kim <jaegeuk@kernel.org> Cc: linux-f2fs-devel@lists.sourceforge.net --- fs/f2fs/data.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index d9494b5fc7c1..12d5bbd18755 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -2057,7 +2057,7 @@ static int f2fs_read_single_page(struct inode *inode, struct page *page, sector_t block_nr; int ret = 0; - block_in_file = (sector_t)page_index(page); + block_in_file = (sector_t)page->index; last_block = block_in_file + nr_pages; last_block_in_file = bytes_to_blks(inode, f2fs_readpage_limit(inode) + blocksize - 1); @@ -4086,8 +4086,7 @@ void f2fs_clear_page_cache_dirty_tag(struct page *page) unsigned long flags; xa_lock_irqsave(&mapping->i_pages, flags); - __xa_clear_mark(&mapping->i_pages, page_index(page), - PAGECACHE_TAG_DIRTY); + __xa_clear_mark(&mapping->i_pages, page->index, PAGECACHE_TAG_DIRTY); xa_unlock_irqrestore(&mapping->i_pages, flags); } -- 2.44.0
WARNING: multiple messages have this Message-ID (diff)
From: Kairui Song <ryncsn@gmail.com> To: linux-mm@kvack.org Cc: Kairui Song <kasong@tencent.com>, Ryan Roberts <ryan.roberts@arm.com>, Chris Li <chrisl@kernel.org>, Neil Brown <neilb@suse.de>, David Hildenbrand <david@redhat.com>, Hugh Dickins <hughd@google.com>, linux-kernel@vger.kernel.org, Matthew Wilcox <willy@infradead.org>, linux-f2fs-devel@lists.sourceforge.net, Yosry Ahmed <yosryahmed@google.com>, Minchan Kim <minchan@kernel.org>, Barry Song <v-songbaohua@oppo.com>, "Huang, Ying" <ying.huang@intel.com>, linux-fsdevel@vger.kernel.org, Jaegeuk Kim <jaegeuk@kernel.org>, Andrew Morton <akpm@linux-foundation.org> Subject: [f2fs-dev] [PATCH 3/8] f2fs: drop usage of page_index Date: Thu, 18 Apr 2024 00:08:37 +0800 [thread overview] Message-ID: <20240417160842.76665-4-ryncsn@gmail.com> (raw) In-Reply-To: <20240417160842.76665-1-ryncsn@gmail.com> From: Kairui Song <kasong@tencent.com> 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. Signed-off-by: Kairui Song <kasong@tencent.com> Cc: Chao Yu <chao@kernel.org> Cc: Jaegeuk Kim <jaegeuk@kernel.org> Cc: linux-f2fs-devel@lists.sourceforge.net --- fs/f2fs/data.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index d9494b5fc7c1..12d5bbd18755 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -2057,7 +2057,7 @@ static int f2fs_read_single_page(struct inode *inode, struct page *page, sector_t block_nr; int ret = 0; - block_in_file = (sector_t)page_index(page); + block_in_file = (sector_t)page->index; last_block = block_in_file + nr_pages; last_block_in_file = bytes_to_blks(inode, f2fs_readpage_limit(inode) + blocksize - 1); @@ -4086,8 +4086,7 @@ void f2fs_clear_page_cache_dirty_tag(struct page *page) unsigned long flags; xa_lock_irqsave(&mapping->i_pages, flags); - __xa_clear_mark(&mapping->i_pages, page_index(page), - PAGECACHE_TAG_DIRTY); + __xa_clear_mark(&mapping->i_pages, page->index, PAGECACHE_TAG_DIRTY); xa_unlock_irqrestore(&mapping->i_pages, flags); } -- 2.44.0 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next prev parent reply other threads:[~2024-04-17 16:09 UTC|newest] Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-04-17 16:08 [PATCH 0/8] mm/swap: optimize swap cache search space Kairui Song 2024-04-17 16:08 ` [PATCH 1/8] NFS: remove nfs_page_lengthg and usage of page_index Kairui Song 2024-04-17 16:08 ` [PATCH 2/8] nilfs2: drop " Kairui Song 2024-04-17 16:14 ` Matthew Wilcox 2024-04-18 2:42 ` Kairui Song 2024-04-17 16:08 ` Kairui Song [this message] 2024-04-17 16:08 ` [f2fs-dev] [PATCH 3/8] f2fs: " Kairui Song 2024-04-17 16:08 ` [PATCH 4/8] ceph: " Kairui Song 2024-04-18 0:28 ` Xiubo Li 2024-04-18 1:30 ` Matthew Wilcox 2024-04-18 1:40 ` Xiubo Li 2024-04-22 15:34 ` Kairui Song 2024-04-23 0:32 ` Xiubo Li 2024-04-17 16:08 ` [PATCH 5/8] cifs: drop usage of page_file_offset Kairui Song 2024-04-17 16:25 ` Matthew Wilcox 2024-04-17 16:08 ` [PATCH 6/8] mm/swap: get the swap file offset directly Kairui Song 2024-04-18 18:43 ` kernel test robot 2024-04-23 1:41 ` Huang, Ying 2024-04-23 13:33 ` Kairui Song 2024-04-17 16:08 ` [PATCH 7/8] mm: drop page_index/page_file_offset and convert swap helpers to use folio Kairui Song 2024-04-18 1:55 ` Barry Song 2024-04-18 2:42 ` Kairui Song 2024-04-18 10:19 ` Barry Song 2024-04-18 3:30 ` Matthew Wilcox 2024-04-18 3:55 ` Barry Song 2024-04-17 16:08 ` [PATCH 8/8] mm/swap: reduce swap cache search space Kairui Song 2024-04-18 18:21 ` kernel test robot 2024-04-18 18:21 ` kernel test robot 2024-04-22 7:54 ` [PATCH 0/8] mm/swap: optimize " Huang, Ying 2024-04-22 15:20 ` Kairui Song 2024-04-23 1:29 ` Huang, Ying 2024-04-23 3:20 ` Matthew Wilcox 2024-04-24 2:24 ` Huang, Ying 2024-04-26 23:16 ` Chris Li 2024-04-28 1:14 ` Huang, Ying 2024-04-28 2:43 ` Chris Li 2024-04-28 3:21 ` Huang, Ying 2024-04-28 17:26 ` Chris Li 2024-04-28 17:37 ` Kairui Song 2024-04-28 17:45 ` Kairui Song 2024-04-29 5:50 ` Chris Li
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=20240417160842.76665-4-ryncsn@gmail.com \ --to=ryncsn@gmail.com \ --cc=akpm@linux-foundation.org \ --cc=chao@kernel.org \ --cc=chrisl@kernel.org \ --cc=david@redhat.com \ --cc=hughd@google.com \ --cc=jaegeuk@kernel.org \ --cc=kasong@tencent.com \ --cc=linux-f2fs-devel@lists.sourceforge.net \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.