Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-28 16:52:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

isofs: Partially convert zisofs_read_folio to use a folio

Browse Source 
Remove several hidden calls to compound_head() and references
to page->index.  More needs to be done to use folios throughout
the zisofs code.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20241125180117.2914311-1-willy@infradead.org
This commit is contained in:
Matthew Wilcox (Oracle) 2024-11-25 18:01:14 +00:00 committed by Jan Kara
parent feffde684a
commit 5c44aa21f0
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/isofs/compress.c
View File

@ -301,7 +301,6 @@ static int zisofs_fill_pages(struct inode *inode, int full_page, int pcount,
*/ */
static int zisofs_read_folio(struct file *file, struct folio *folio) static int zisofs_read_folio(struct file *file, struct folio *folio)
{ {
struct page *page = &folio->page;
struct inode *inode = file_inode(file); struct inode *inode = file_inode(file);
struct address_space *mapping = inode->i_mapping; struct address_space *mapping = inode->i_mapping;
int err; int err;
@ -311,16 +310,15 @@ static int zisofs_read_folio(struct file *file, struct folio *folio)
PAGE_SHIFT <= zisofs_block_shift ? PAGE_SHIFT <= zisofs_block_shift ?
(1 << (zisofs_block_shift - PAGE_SHIFT)) : 0; (1 << (zisofs_block_shift - PAGE_SHIFT)) : 0;
struct page **pages; struct page **pages;
pgoff_t index = page->index, end_index; pgoff_t index = folio->index, end_index;
end_index = (inode->i_size + PAGE_SIZE - 1) >> PAGE_SHIFT; end_index = (inode->i_size + PAGE_SIZE - 1) >> PAGE_SHIFT;
/* /*
* If this page is wholly outside i_size we just return zero; * If this folio is wholly outside i_size we just return zero;
* do_generic_file_read() will handle this for us * do_generic_file_read() will handle this for us
*/ */
if (index >= end_index) { if (index >= end_index) {
SetPageUptodate(page); folio_end_read(folio, true);
unlock_page(page);
return 0; return 0;
} }
@ -338,10 +336,10 @@ static int zisofs_read_folio(struct file *file, struct folio *folio)
pages = kcalloc(max_t(unsigned int, zisofs_pages_per_cblock, 1), pages = kcalloc(max_t(unsigned int, zisofs_pages_per_cblock, 1),
sizeof(*pages), GFP_KERNEL); sizeof(*pages), GFP_KERNEL);
if (!pages) { if (!pages) {
unlock_page(page); folio_unlock(folio);
return -ENOMEM; return -ENOMEM;
} }
pages[full_page] = page; pages[full_page] = &folio->page;
for (i = 0; i < pcount; i++, index++) { for (i = 0; i < pcount; i++, index++) {
if (i != full_page) if (i != full_page)