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

fs: remove noop_set_page_dirty() 

Use __set_page_dirty_no_writeback() instead.  This will set the dirty bit
on the page, which will be used to avoid calling set_page_dirty() in the
future.  It will have no effect on actually writing the page back, as the
pages are not on any LRU lists.

[akpm@linux-foundation.org: export __set_page_dirty_no_writeback() to modules]

Link: https://lkml.kernel.org/r/20210615162342.1669332-6-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jan Kara <jack@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fc50eee3

drivers/dax/device.c

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static unsigned long dax_get_unmapped_area(struct file *filp, 
}



static const struct address_space_operations dev_dax_aops = {

	.set_page_dirty		= noop_set_page_dirty,

	.set_page_dirty		= __set_page_dirty_no_writeback,

	.invalidatepage		= noop_invalidatepage,

};

fs/ext2/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -992,7 +992,7 @@ const struct address_space_operations ext2_nobh_aops = { 
static const struct address_space_operations ext2_dax_aops = {

	.writepages		= ext2_dax_writepages,

	.direct_IO		= noop_direct_IO,

	.set_page_dirty		= noop_set_page_dirty,

	.set_page_dirty		= __set_page_dirty_no_writeback,

	.invalidatepage		= noop_invalidatepage,

};

fs/ext4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -3701,7 +3701,7 @@ static const struct address_space_operations ext4_da_aops = { 
static const struct address_space_operations ext4_dax_aops = {

	.writepages		= ext4_dax_writepages,

	.direct_IO		= noop_direct_IO,

	.set_page_dirty		= noop_set_page_dirty,

	.set_page_dirty		= __set_page_dirty_no_writeback,

	.bmap			= ext4_bmap,

	.invalidatepage		= noop_invalidatepage,

	.swap_activate		= ext4_iomap_swap_activate,

fs/fuse/dax.c

+1 −1
Original line number Diff line number Diff line
@@ -1329,7 +1329,7 @@ bool fuse_dax_inode_alloc(struct super_block *sb, struct fuse_inode *fi) 
static const struct address_space_operations fuse_dax_file_aops  = {

	.writepages	= fuse_dax_writepages,

	.direct_IO	= noop_direct_IO,

	.set_page_dirty	= noop_set_page_dirty,

	.set_page_dirty	= __set_page_dirty_no_writeback,

	.invalidatepage	= noop_invalidatepage,

};

fs/libfs.c

+0 −16
Original line number Diff line number Diff line
@@ -1171,22 +1171,6 @@ int noop_fsync(struct file *file, loff_t start, loff_t end, int datasync) 
}

EXPORT_SYMBOL(noop_fsync);



int noop_set_page_dirty(struct page *page)

{

	/*

	 * Unlike __set_page_dirty_no_writeback that handles dirty page

	 * tracking in the page object, dax does all dirty tracking in

	 * the inode address_space in response to mkwrite faults. In the

	 * dax case we only need to worry about potentially dirty CPU

	 * caches, not dirty page cache pages to write back.

	 *

	 * This callback is defined to prevent fallback to

	 * __set_page_dirty_buffers() in set_page_dirty().

	 */

	return 0;

}

EXPORT_SYMBOL_GPL(noop_set_page_dirty);



void noop_invalidatepage(struct page *page, unsigned int offset,

		unsigned int length)

{