mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-01 10:42:11 +00:00
ntfs3: Convert ntfs_read_folio to use a folio
Remove the struct page conversion, and use a folio throughout. We still convert back to a struct page for calling some internal functions, but those will change soon. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
This commit is contained in:
parent
b366809dd1
commit
f27a8e2d3d
@ -710,25 +710,24 @@ static sector_t ntfs_bmap(struct address_space *mapping, sector_t block)
|
||||
|
||||
static int ntfs_read_folio(struct file *file, struct folio *folio)
|
||||
{
|
||||
struct page *page = &folio->page;
|
||||
int err;
|
||||
struct address_space *mapping = page->mapping;
|
||||
struct address_space *mapping = folio->mapping;
|
||||
struct inode *inode = mapping->host;
|
||||
struct ntfs_inode *ni = ntfs_i(inode);
|
||||
|
||||
if (is_resident(ni)) {
|
||||
ni_lock(ni);
|
||||
err = attr_data_read_resident(ni, page);
|
||||
err = attr_data_read_resident(ni, &folio->page);
|
||||
ni_unlock(ni);
|
||||
if (err != E_NTFS_NONRESIDENT) {
|
||||
unlock_page(page);
|
||||
folio_unlock(folio);
|
||||
return err;
|
||||
}
|
||||
}
|
||||
|
||||
if (is_compressed(ni)) {
|
||||
ni_lock(ni);
|
||||
err = ni_readpage_cmpr(ni, page);
|
||||
err = ni_readpage_cmpr(ni, &folio->page);
|
||||
ni_unlock(ni);
|
||||
return err;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user