Commit 6f4d2f97 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Linus Torvalds
Browse files

fs: do not update nr_thps for mappings which support THPs 



The nr_thps counter is to support THPs in the page cache when the
filesystem doesn't understand THPs.  Eventually it will be removed, but we
should still support filesystems which do not understand THPs yet.  Move
the nr_thp manipulation functions to filemap.h since they're page-cache
specific.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: Song Liu <songliubraving@fb.com>
Cc: Rik van Riel <riel@surriel.com>
Cc: "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Dave Chinner <dchinner@redhat.com>
Cc: Christoph Hellwig <hch@infradead.org>
Link: https://lkml.kernel.org/r/20200916032717.22917-2-willy@infradead.org


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 01c70267

include/linux/fs.h

+0 −27
Original line number Diff line number Diff line
@@ -2697,33 +2697,6 @@ static inline errseq_t file_sample_sb_err(struct file *file) 
	return errseq_sample(&file->f_path.dentry->d_sb->s_wb_err);

}



static inline int filemap_nr_thps(struct address_space *mapping)

{

#ifdef CONFIG_READ_ONLY_THP_FOR_FS

	return atomic_read(&mapping->nr_thps);

#else

	return 0;

#endif

}



static inline void filemap_nr_thps_inc(struct address_space *mapping)

{

#ifdef CONFIG_READ_ONLY_THP_FOR_FS

	atomic_inc(&mapping->nr_thps);

#else

	WARN_ON_ONCE(1);

#endif

}



static inline void filemap_nr_thps_dec(struct address_space *mapping)

{

#ifdef CONFIG_READ_ONLY_THP_FOR_FS

	atomic_dec(&mapping->nr_thps);

#else

	WARN_ON_ONCE(1);

#endif

}



extern int vfs_fsync_range(struct file *file, loff_t start, loff_t end,

			   int datasync);

extern int vfs_fsync(struct file *file, int datasync);

include/linux/pagemap.h

+29 −0
Original line number Diff line number Diff line
@@ -126,6 +126,35 @@ static inline bool mapping_thp_support(struct address_space *mapping) 
	return test_bit(AS_THP_SUPPORT, &mapping->flags);

}



static inline int filemap_nr_thps(struct address_space *mapping)

{

#ifdef CONFIG_READ_ONLY_THP_FOR_FS

	return atomic_read(&mapping->nr_thps);

#else

	return 0;

#endif

}



static inline void filemap_nr_thps_inc(struct address_space *mapping)

{

#ifdef CONFIG_READ_ONLY_THP_FOR_FS

	if (!mapping_thp_support(mapping))

		atomic_inc(&mapping->nr_thps);

#else

	WARN_ON_ONCE(1);

#endif

}



static inline void filemap_nr_thps_dec(struct address_space *mapping)

{

#ifdef CONFIG_READ_ONLY_THP_FOR_FS

	if (!mapping_thp_support(mapping))

		atomic_dec(&mapping->nr_thps);

#else

	WARN_ON_ONCE(1);

#endif

}



void release_pages(struct page **pages, int nr);



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE