Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+6
-6
+4
-4
fs/ntfs3/frecord.c
+4
-4
fs/ntfs3/frecord.c
···
2046
2046
}
2047
2047
2048
2048
/*
2049
-
* ni_readpage_cmpr
2049
+
* ni_read_folio_cmpr
2050
2050
*
2051
2051
* When decompressing, we typically obtain more than one page per reference.
2052
2052
* We inject the additional pages into the page cache.
2053
2053
*/
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)
2055
2055
{
2056
2056
int err;
2057
2057
struct ntfs_sb_info *sbi = ni->mi.sbi;
2058
2058
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);
2061
2061
struct page **pages = NULL; /* Array of at most 16 pages. stack? */
2062
2062
u8 frame_bits;
2063
2063
CLST frame;
+1
-1
fs/ntfs3/inode.c
+1
-1
fs/ntfs3/inode.c
+1
-1
fs/ntfs3/ntfs_fs.h
+1
-1
fs/ntfs3/ntfs_fs.h
···
568
568
#define _ni_write_inode(i, w) ni_write_inode(i, w, __func__)
569
569
int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,
570
570
__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);
572
572
int ni_decompress_file(struct ntfs_inode *ni);
573
573
int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,
574
574
u32 pages_per_frame, int copy);