Unverified Commit 4248f563 authored by Konstantin Komarov's avatar Konstantin Komarov
Browse files

fs/ntfs3: rename ni_readpage_cmpr into ni_read_folio_cmpr 



The old "readpage" naming is still used in ni_readpage_cmpr(), even though
the vfs has transitioned to the folio-based read_folio() API.

This patch performs a straightforward renaming of the helper:
ni_readpage_cmpr() -> ni_read_folio_cmpr().

Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent 06909b25

fs/ntfs3/frecord.c

+4 −4
Original line number Diff line number Diff line
@@ -2046,18 +2046,18 @@ static struct page *ntfs_lock_new_page(struct address_space *mapping, 
}



/*

 * ni_readpage_cmpr

 * ni_read_folio_cmpr

 *

 * When decompressing, we typically obtain more than one page per reference.

 * We inject the additional pages into the page cache.

 */

int ni_readpage_cmpr(struct ntfs_inode *ni, struct folio *folio)

int ni_read_folio_cmpr(struct ntfs_inode *ni, struct folio *folio)

{

	int err;

	struct ntfs_sb_info *sbi = ni->mi.sbi;

	struct address_space *mapping = folio->mapping;

	pgoff_t index = folio->index;

	u64 frame_vbo, vbo = (u64)index << PAGE_SHIFT;

	pgoff_t index;

	u64 frame_vbo, vbo = folio_pos(folio);

	struct page **pages = NULL; /* Array of at most 16 pages. stack? */

	u8 frame_bits;

	CLST frame;

fs/ntfs3/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ static int ntfs_read_folio(struct file *file, struct folio *folio) 


	if (is_compressed(ni)) {

		ni_lock(ni);

		err = ni_readpage_cmpr(ni, folio);

		err = ni_read_folio_cmpr(ni, folio);

		ni_unlock(ni);

		return err;

	}

fs/ntfs3/ntfs_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ int ni_write_inode(struct inode *inode, int sync, const char *hint); 
#define _ni_write_inode(i, w) ni_write_inode(i, w, __func__)

int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,

	      __u64 vbo, __u64 len);

int ni_readpage_cmpr(struct ntfs_inode *ni, struct folio *folio);

int ni_read_folio_cmpr(struct ntfs_inode *ni, struct folio *folio);

int ni_decompress_file(struct ntfs_inode *ni);

int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,

		  u32 pages_per_frame, int copy);