mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-04-12 06:49:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

squashfs: convert squashfs_readpage_block() to take a folio

Browse Source 
Remove a few accesses to page->mapping.

Link: https://lkml.kernel.org/r/20241220224634.723899-3-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Phillip Lougher <phillip@squashfs.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2024-12-20 22:46:26 +00:00 committed by Andrew Morton
parent 8c1565fcf6
commit 2a7aea59cf
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/squashfs/file.c
View File

@ -472,7 +472,7 @@ static int squashfs_read_folio(struct file *file, struct folio *folio)
if (res == 0)
res = squashfs_readpage_sparse(&folio->page, expected);
else
res = squashfs_readpage_block(&folio->page, block, res, expected);
res = squashfs_readpage_block(folio, block, res, expected);
} else
res = squashfs_readpage_fragment(folio, expected);

6
fs/squashfs/file_cache.c
View File

@ -18,9 +18,9 @@
#include "squashfs.h"
/* Read separately compressed datablock and memcopy into page cache */
int squashfs_readpage_block(struct page *page, u64 block, int bsize, int expected)
int squashfs_readpage_block(struct folio *folio, u64 block, int bsize, int expected)
{
struct inode *i = page->mapping->host;
struct inode *i = folio->mapping->host;
struct squashfs_cache_entry *buffer = squashfs_get_datablock(i->i_sb,
block, bsize);
int res = buffer->error;
@ -29,7 +29,7 @@ int squashfs_readpage_block(struct page *page, u64 block, int bsize, int expecte
ERROR("Unable to read page, block %llx, size %x\n", block,
bsize);
else
squashfs_copy_cache(page, buffer, expected, 0);
squashfs_copy_cache(&folio->page, buffer, expected, 0);
squashfs_cache_put(buffer);
return res;

11
fs/squashfs/file_direct.c
View File

@ -19,12 +19,11 @@
#include "page_actor.h"
/* Read separately compressed datablock directly into page cache */
int squashfs_readpage_block(struct page *target_page, u64 block, int bsize,
int expected)
int squashfs_readpage_block(struct folio *folio, u64 block, int bsize,
int expected)
{
struct folio *folio = page_folio(target_page);
struct inode *inode = target_page->mapping->host;
struct page *target_page = &folio->page;
struct inode *inode = folio->mapping->host;
struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
loff_t file_end = (i_size_read(inode) - 1) >> PAGE_SHIFT;
int mask = (1 << (msblk->block_log - PAGE_SHIFT)) - 1;
@ -48,7 +47,7 @@ int squashfs_readpage_block(struct page *target_page, u64 block, int bsize,
/* Try to grab all the pages covered by the Squashfs block */
for (i = 0, index = start_index; index <= end_index; index++) {
page[i] = (index == folio->index) ? target_page :
grab_cache_page_nowait(target_page->mapping, index);
grab_cache_page_nowait(folio->mapping, index);
if (page[i] == NULL)
continue;

2
fs/squashfs/squashfs.h
View File

@ -78,7 +78,7 @@ void squashfs_copy_cache(struct page *, struct squashfs_cache_entry *, int,
int);
/* file_xxx.c */
extern int squashfs_readpage_block(struct page *, u64, int, int);
int squashfs_readpage_block(struct folio *, u64 block, int bsize, int expected);
/* id.c */
extern int squashfs_get_id(struct super_block *, unsigned int, unsigned int *);