Unverified Commit f27a8e2d authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Konstantin Komarov
Browse files

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: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent b366809d

fs/ntfs3/inode.c

+4 −5
Original line number Diff line number Diff line
@@ -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;

	}