Skip to content

Commit 51706b6

Browse files
Matthew Wilcox (Oracle)jankara
authored andcommitted
ext2: Convert ext2_readdir to use a folio
Saves a hidden call to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) <[email protected]> Signed-off-by: Jan Kara <[email protected]> Message-Id: <[email protected]>
1 parent 52df49e commit 51706b6

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

fs/ext2/dir.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ ext2_readdir(struct file *file, struct dir_context *ctx)
286286

287287
for ( ; n < npages; n++, offset = 0) {
288288
ext2_dirent *de;
289-
struct page *page;
290-
char *kaddr = ext2_get_page(inode, n, 0, &page);
289+
struct folio *folio;
290+
char *kaddr = ext2_get_folio(inode, n, 0, &folio);
291291
char *limit;
292292

293293
if (IS_ERR(kaddr)) {
@@ -311,7 +311,7 @@ ext2_readdir(struct file *file, struct dir_context *ctx)
311311
if (de->rec_len == 0) {
312312
ext2_error(sb, __func__,
313313
"zero-length directory entry");
314-
ext2_put_page(page, de);
314+
folio_release_kmap(folio, de);
315315
return -EIO;
316316
}
317317
if (de->inode) {
@@ -323,13 +323,13 @@ ext2_readdir(struct file *file, struct dir_context *ctx)
323323
if (!dir_emit(ctx, de->name, de->name_len,
324324
le32_to_cpu(de->inode),
325325
d_type)) {
326-
ext2_put_page(page, de);
326+
folio_release_kmap(folio, de);
327327
return 0;
328328
}
329329
}
330330
ctx->pos += ext2_rec_len_from_disk(de->rec_len);
331331
}
332-
ext2_put_page(page, kaddr);
332+
folio_release_kmap(folio, kaddr);
333333
}
334334
return 0;
335335
}

0 commit comments

Comments
 (0)