On Thu, Mar 26, 2026 at 09:42:49PM -0400, Zi Yan wrote: > filemap_nr_thps*() are removed, the related field, address_space->nr_thps, > is no longer needed. Remove it. > > Signed-off-by: Zi Yan <[email protected]>
I wonder if we shouldn't squash this into previous actually, but it's fine either way, so: Reviewed-by: Lorenzo Stoakes (Oracle) <[email protected]> > --- > fs/inode.c | 3 --- > include/linux/fs.h | 5 ----- > 2 files changed, 8 deletions(-) > > diff --git a/fs/inode.c b/fs/inode.c > index cc12b68e021b..16ab0a345419 100644 > --- a/fs/inode.c > +++ b/fs/inode.c > @@ -280,9 +280,6 @@ int inode_init_always_gfp(struct super_block *sb, struct > inode *inode, gfp_t gfp > mapping->flags = 0; > mapping->wb_err = 0; > atomic_set(&mapping->i_mmap_writable, 0); > -#ifdef CONFIG_READ_ONLY_THP_FOR_FS > - atomic_set(&mapping->nr_thps, 0); > -#endif > mapping_set_gfp_mask(mapping, GFP_HIGHUSER_MOVABLE); > mapping->i_private_data = NULL; > mapping->writeback_index = 0; > diff --git a/include/linux/fs.h b/include/linux/fs.h > index 0bdccfa70b44..35875696fb4c 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -455,7 +455,6 @@ extern const struct address_space_operations empty_aops; > * memory mappings. > * @gfp_mask: Memory allocation flags to use for allocating pages. > * @i_mmap_writable: Number of VM_SHARED, VM_MAYWRITE mappings. > - * @nr_thps: Number of THPs in the pagecache (non-shmem only). > * @i_mmap: Tree of private and shared mappings. > * @i_mmap_rwsem: Protects @i_mmap and @i_mmap_writable. > * @nrpages: Number of page entries, protected by the i_pages lock. > @@ -473,10 +472,6 @@ struct address_space { > struct rw_semaphore invalidate_lock; > gfp_t gfp_mask; > atomic_t i_mmap_writable; > -#ifdef CONFIG_READ_ONLY_THP_FOR_FS > - /* number of thp, only for non-shmem files */ > - atomic_t nr_thps; > -#endif > struct rb_root_cached i_mmap; > unsigned long nrpages; > pgoff_t writeback_index; > -- > 2.43.0 >
