Skip to content

Commit 4248f56

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: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
1 parent 06909b2 commit 4248f56

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

fs/ntfs3/frecord.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2046,18 +2046,18 @@ static struct page *ntfs_lock_new_page(struct address_space *mapping,
20462046
}
20472047

20482048
/*
2049-
* ni_readpage_cmpr
2049+
* ni_read_folio_cmpr
20502050
*
20512051
* When decompressing, we typically obtain more than one page per reference.
20522052
* We inject the additional pages into the page cache.
20532053
*/
2054-
int ni_readpage_cmpr(struct ntfs_inode *ni, struct folio *folio)
2054+
int ni_read_folio_cmpr(struct ntfs_inode *ni, struct folio *folio)
20552055
{
20562056
int err;
20572057
struct ntfs_sb_info *sbi = ni->mi.sbi;
20582058
struct address_space *mapping = folio->mapping;
2059-
pgoff_t index = folio->index;
2060-
u64 frame_vbo, vbo = (u64)index << PAGE_SHIFT;
2059+
pgoff_t index;
2060+
u64 frame_vbo, vbo = folio_pos(folio);
20612061
struct page **pages = NULL; /* Array of at most 16 pages. stack? */
20622062
u8 frame_bits;
20632063
CLST frame;

fs/ntfs3/inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ static int ntfs_read_folio(struct file *file, struct folio *folio)
736736

737737
if (is_compressed(ni)) {
738738
ni_lock(ni);
739-
err = ni_readpage_cmpr(ni, folio);
739+
err = ni_read_folio_cmpr(ni, folio);
740740
ni_unlock(ni);
741741
return err;
742742
}

fs/ntfs3/ntfs_fs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ int ni_write_inode(struct inode *inode, int sync, const char *hint);
568568
#define _ni_write_inode(i, w) ni_write_inode(i, w, __func__)
569569
int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,
570570
__u64 vbo, __u64 len);
571-
int ni_readpage_cmpr(struct ntfs_inode *ni, struct folio *folio);
571+
int ni_read_folio_cmpr(struct ntfs_inode *ni, struct folio *folio);
572572
int ni_decompress_file(struct ntfs_inode *ni);
573573
int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,
574574
u32 pages_per_frame, int copy);

0 commit comments

Comments
 (0)