diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2023-09-21 21:07:41 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2023-10-25 20:19:00 +0200 |
| commit | 51706b6fd42edd30c3761a20a41c30bd184e59f7 (patch) | |
| tree | 8272a632233789b59d20b5634a05749dee63c538 /fs/ext2 | |
| parent | 52df49ee835d79d8e50f38d89d75bf0891854511 (diff) | |
| download | lwn-51706b6fd42edd30c3761a20a41c30bd184e59f7.tar.gz lwn-51706b6fd42edd30c3761a20a41c30bd184e59f7.zip | |
ext2: Convert ext2_readdir to use a folio
Saves a hidden call to compound_head().
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Message-Id: <20230921200746.3303942-4-willy@infradead.org>
Diffstat (limited to 'fs/ext2')
| -rw-r--r-- | fs/ext2/dir.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c index 5c1b7bded535..5a8a02d6be9a 100644 --- a/fs/ext2/dir.c +++ b/fs/ext2/dir.c @@ -286,8 +286,8 @@ ext2_readdir(struct file *file, struct dir_context *ctx) for ( ; n < npages; n++, offset = 0) { ext2_dirent *de; - struct page *page; - char *kaddr = ext2_get_page(inode, n, 0, &page); + struct folio *folio; + char *kaddr = ext2_get_folio(inode, n, 0, &folio); char *limit; if (IS_ERR(kaddr)) { @@ -311,7 +311,7 @@ ext2_readdir(struct file *file, struct dir_context *ctx) if (de->rec_len == 0) { ext2_error(sb, __func__, "zero-length directory entry"); - ext2_put_page(page, de); + folio_release_kmap(folio, de); return -EIO; } if (de->inode) { @@ -323,13 +323,13 @@ ext2_readdir(struct file *file, struct dir_context *ctx) if (!dir_emit(ctx, de->name, de->name_len, le32_to_cpu(de->inode), d_type)) { - ext2_put_page(page, de); + folio_release_kmap(folio, de); return 0; } } ctx->pos += ext2_rec_len_from_disk(de->rec_len); } - ext2_put_page(page, kaddr); + folio_release_kmap(folio, kaddr); } return 0; } |