Commit ff36da69 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

fs: Remove FS_THP_SUPPORT 



Instead of setting a bit in the fs_flags to set a bit in the
address_space, set the bit in the address_space directly.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent a1efe484

fs/inode.c

+0 −2
Original line number Diff line number Diff line
@@ -180,8 +180,6 @@ 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);

	mapping->wb_err = 0;

	atomic_set(&mapping->i_mmap_writable, 0);

#ifdef CONFIG_READ_ONLY_THP_FOR_FS

include/linux/fs.h

+0 −1
Original line number Diff line number Diff line
@@ -2518,7 +2518,6 @@ struct file_system_type { 
#define FS_USERNS_MOUNT		8	/* Can be mounted by userns root */

#define FS_DISALLOW_NOTIFY_PERM	16	/* Disable fanotify permission events */

#define FS_ALLOW_IDMAP         32      /* FS has been updated to handle vfs idmappings. */

#define FS_THP_SUPPORT		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;

include/linux/pagemap.h

+16 −0
Original line number Diff line number Diff line
@@ -176,6 +176,22 @@ static inline void mapping_set_gfp_mask(struct address_space *m, gfp_t mask) 
	m->gfp_mask = mask;

}



/**

 * mapping_set_large_folios() - Indicate the file supports large folios.

 * @mapping: The file.

 *

 * The filesystem should call this function in its inode constructor to

 * indicate that the VFS can use large folios to cache the contents of

 * the file.

 *

 * Context: This should not be called while the inode is active as it

 * is non-atomic.

 */

static inline void mapping_set_large_folios(struct address_space *mapping)

{

	__set_bit(AS_THP_SUPPORT, &mapping->flags);

}



static inline bool mapping_thp_support(struct address_space *mapping)

{

	return test_bit(AS_THP_SUPPORT, &mapping->flags);

mm/shmem.c

+2 −1
Original line number Diff line number Diff line
@@ -2303,6 +2303,7 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode 
		INIT_LIST_HEAD(&info->swaplist);

		simple_xattrs_init(&info->xattrs);

		cache_no_acl(inode);

		mapping_set_large_folios(inode->i_mapping);



		switch (mode & S_IFMT) {

		default:
@@ -3870,7 +3871,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,

};



int __init shmem_init(void)