[17/25] mm: Rename THP_SUPPORT to MULTI_PAGE_FOLIOS

Commit Message

Matthew Wilcox Dec. 16, 2020, 6:23 p.m. UTC

Using THPs was confusing everyone.  Switch to the new name of folios.

Signed-off-by: Matthew Wilcox (Oracle) <[e-mail]>
---
 fs/inode.c              |  4 ++--
 include/linux/fs.h      |  2 +-
 include/linux/pagemap.h | 14 +++++++-------
 mm/shmem.c              |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

Patch

diff --git a/fs/inode.c b/fs/inode.c
index cb008acf0efd..2c79282803e7 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -180,8 +180,8 @@  int inode_init_always(struct super_block *sb, struct inode *inode)
 	mapping->a_ops = &empty_aops;
 	mapping->host = inode;
 	mapping->flags = 0;
-	if (sb->s_type->fs_flags & FS_THP_SUPPORT)
-		__set_bit(AS_THP_SUPPORT, &mapping->flags);
+	if (sb->s_type->fs_flags & FS_MULTI_PAGE_FOLIOS)
+		__set_bit(AS_MULTI_PAGE_FOLIOS, &mapping->flags);
 	mapping->wb_err = 0;
 	atomic_set(&mapping->i_mmap_writable, 0);
 #ifdef CONFIG_READ_ONLY_THP_FOR_FS
diff --git a/include/linux/fs.h b/include/linux/fs.h
index ad4cf1bae586..08f9a8a524f2 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2231,7 +2231,7 @@  struct file_system_type {
 #define FS_HAS_SUBTYPE		4
 #define FS_USERNS_MOUNT		8	/* Can be mounted by userns root */
 #define FS_DISALLOW_NOTIFY_PERM	16	/* Disable fanotify permission events */
-#define FS_THP_SUPPORT		8192	/* Remove once all fs converted */
+#define FS_MULTI_PAGE_FOLIOS	8192	/* Remove once all fs converted */
 #define FS_RENAME_DOES_D_MOVE	32768	/* FS will handle d_move() during rename() internally. */
 	int (*init_fs_context)(struct fs_context *);
 	const struct fs_parameter_spec *parameters;
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 88a66b65d1ed..630a0a589073 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -29,7 +29,7 @@  enum mapping_flags {
 	AS_EXITING	= 4, 	/* final truncate in progress */
 	/* writeback related tags are not used */
 	AS_NO_WRITEBACK_TAGS = 5,
-	AS_THP_SUPPORT = 6,	/* THPs supported */
+	AS_MULTI_PAGE_FOLIOS = 6,
 };
 
 /**
@@ -121,9 +121,9 @@  static inline void mapping_set_gfp_mask(struct address_space *m, gfp_t mask)
 	m->gfp_mask = mask;
 }
 
-static inline bool mapping_thp_support(struct address_space *mapping)
+static inline bool mapping_multi_page_folios(struct address_space *mapping)
 {
-	return test_bit(AS_THP_SUPPORT, &mapping->flags);
+	return test_bit(AS_MULTI_PAGE_FOLIOS, &mapping->flags);
 }
 
 static inline int filemap_nr_thps(struct address_space *mapping)
@@ -138,20 +138,20 @@  static inline int filemap_nr_thps(struct address_space *mapping)
 static inline void filemap_nr_thps_inc(struct address_space *mapping)
 {
 #ifdef CONFIG_READ_ONLY_THP_FOR_FS
-	if (!mapping_thp_support(mapping))
+	if (!mapping_multi_page_folios(mapping))
 		atomic_inc(&mapping->nr_thps);
 #else
-	WARN_ON_ONCE(1);
+	WARN_ON_ONCE(!mapping_multi_page_folios(mapping));
 #endif
 }
 
 static inline void filemap_nr_thps_dec(struct address_space *mapping)
 {
 #ifdef CONFIG_READ_ONLY_THP_FOR_FS
-	if (!mapping_thp_support(mapping))
+	if (!mapping_multi_page_folios(mapping))
 		atomic_dec(&mapping->nr_thps);
 #else
-	WARN_ON_ONCE(1);
+	WARN_ON_ONCE(!mapping_multi_page_folios(mapping));
 #endif
 }
 
diff --git a/mm/shmem.c b/mm/shmem.c
index 53d84d2c9fe5..192b7b5a7852 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -3910,7 +3910,7 @@  static struct file_system_type shmem_fs_type = {
 	.parameters	= shmem_fs_parameters,
 #endif
 	.kill_sb	= kill_litter_super,
-	.fs_flags	= FS_USERNS_MOUNT | FS_THP_SUPPORT,
+	.fs_flags	= FS_USERNS_MOUNT | FS_MULTI_PAGE_FOLIOS,
 };
 
 int __init shmem_init(void)