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>,
David Howells <dhowells@redhat.com>,
Marc Dionne <marc.dionne@auristor.com>,
linux-afs@lists.infradead.org
Subject: [PATCH v3 06/12] afs: drop usage of folio_file_pos
Date: Tue, 30 Apr 2024 03:04:54 +0800 [thread overview]
Message-ID: <20240429190500.30979-7-ryncsn@gmail.com> (raw)
In-Reply-To: <20240429190500.30979-1-ryncsn@gmail.com>
From: Kairui Song <kasong@tencent.com>
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 cache is never exposed
to afs, so just drop it and use folio_pos instead.
Signed-off-by: Kairui Song <kasong@tencent.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Marc Dionne <marc.dionne@auristor.com>
Cc: linux-afs@lists.infradead.org
---
fs/afs/dir.c | 6 +++---
fs/afs/dir_edit.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/afs/dir.c b/fs/afs/dir.c
index 67afe68972d5..f8622ed72e08 100644
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@ -533,14 +533,14 @@ static int afs_dir_iterate(struct inode *dir, struct dir_context *ctx,
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;
diff --git a/fs/afs/dir_edit.c b/fs/afs/dir_edit.c
index e2fa577b66fe..a71bff10496b 100644
--- a/fs/afs/dir_edit.c
+++ b/fs/afs/dir_edit.c
@@ -256,7 +256,7 @@ void afs_edit_dir_add(struct afs_vnode *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_vnode *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))
--
2.44.0
next prev parent reply other threads:[~2024-04-29 19:07 UTC|newest]
Thread overview: 27+ 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 ` Kairui Song [this message]
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 ` [PATCH v3 10/12] mm: remove page_file_offset and folio_file_pos Kairui Song
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=20240429190500.30979-7-ryncsn@gmail.com \
--to=ryncsn@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=chrisl@kernel.org \
--cc=david@redhat.com \
--cc=dhowells@redhat.com \
--cc=hughd@google.com \
--cc=kasong@tencent.com \
--cc=linux-afs@lists.infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=marc.dionne@auristor.com \
--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).