Skip to content

Commit fa7d614

Browse files
committed
afs: Don't use certain unnecessary folio_*() functions
Filesystems should use folio->index and folio->mapping, instead of folio_index(folio), folio_mapping() and folio_file_mapping() since they know that it's in the pagecache. Change this automagically with: perl -p -i -e 's/folio_mapping[(]([^)]*)[)]/\1->mapping/g' fs/afs/*.c perl -p -i -e 's/folio_file_mapping[(]([^)]*)[)]/\1->mapping/g' fs/afs/*.c perl -p -i -e 's/folio_index[(]([^)]*)[)]/\1->index/g' fs/afs/*.c Reported-by: Matthew Wilcox <willy@infradead.org> Signed-off-by: David Howells <dhowells@redhat.com> cc: Marc Dionne <marc.dionne@auristor.com> cc: linux-afs@lists.infradead.org cc: linux-fsdevel@vger.kernel.org
1 parent 202bc57 commit fa7d614

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

fs/afs/dir.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ static void afs_dir_read_cleanup(struct afs_read *req)
124124
if (xas_retry(&xas, folio))
125125
continue;
126126
BUG_ON(xa_is_value(folio));
127-
ASSERTCMP(folio_file_mapping(folio), ==, mapping);
127+
ASSERTCMP(folio->mapping, ==, mapping);
128128

129129
folio_put(folio);
130130
}
@@ -202,12 +202,12 @@ static void afs_dir_dump(struct afs_vnode *dvnode, struct afs_read *req)
202202
if (xas_retry(&xas, folio))
203203
continue;
204204

205-
BUG_ON(folio_file_mapping(folio) != mapping);
205+
BUG_ON(folio->mapping != mapping);
206206

207207
size = min_t(loff_t, folio_size(folio), req->actual_len - folio_pos(folio));
208208
for (offset = 0; offset < size; offset += sizeof(*block)) {
209209
block = kmap_local_folio(folio, offset);
210-
pr_warn("[%02lx] %32phN\n", folio_index(folio) + offset, block);
210+
pr_warn("[%02lx] %32phN\n", folio->index + offset, block);
211211
kunmap_local(block);
212212
}
213213
}
@@ -233,7 +233,7 @@ static int afs_dir_check(struct afs_vnode *dvnode, struct afs_read *req)
233233
if (xas_retry(&xas, folio))
234234
continue;
235235

236-
BUG_ON(folio_file_mapping(folio) != mapping);
236+
BUG_ON(folio->mapping != mapping);
237237

238238
if (!afs_dir_check_folio(dvnode, folio, req->actual_len)) {
239239
afs_dir_dump(dvnode, req);
@@ -2022,7 +2022,7 @@ static bool afs_dir_release_folio(struct folio *folio, gfp_t gfp_flags)
20222022
{
20232023
struct afs_vnode *dvnode = AFS_FS_I(folio_inode(folio));
20242024

2025-
_enter("{{%llx:%llu}[%lu]}", dvnode->fid.vid, dvnode->fid.vnode, folio_index(folio));
2025+
_enter("{{%llx:%llu}[%lu]}", dvnode->fid.vid, dvnode->fid.vnode, folio->index);
20262026

20272027
folio_detach_private(folio);
20282028

0 commit comments

Comments
 (0)