Commit 0af57378 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

mm: require ->set_page_dirty to be explicitly wired up 

Remove the CONFIG_BLOCK default to __set_page_dirty_buffers and just wire
that method up for the missing instances.

[hch@lst.de: ecryptfs: add a ->set_page_dirty cludge]
  Link: https://lkml.kernel.org/r/20210624125250.536369-1-hch@lst.de

Link: https://lkml.kernel.org/r/20210614061512.3966143-4-hch@lst.de


Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Tyler Hicks <code@tyhicks.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c1e3dbe9

fs/adfs/inode.c

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ static sector_t _adfs_bmap(struct address_space *mapping, sector_t block) 
}



static const struct address_space_operations adfs_aops = {

	.set_page_dirty	= __set_page_dirty_buffers,

	.readpage	= adfs_readpage,

	.writepage	= adfs_writepage,

	.write_begin	= adfs_write_begin,

fs/affs/file.c

+2 −0
Original line number Diff line number Diff line
@@ -453,6 +453,7 @@ static sector_t _affs_bmap(struct address_space *mapping, sector_t block) 
}



const struct address_space_operations affs_aops = {

	.set_page_dirty	= __set_page_dirty_buffers,

	.readpage = affs_readpage,

	.writepage = affs_writepage,

	.write_begin = affs_write_begin,
@@ -833,6 +834,7 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping, 
}



const struct address_space_operations affs_aops_ofs = {

	.set_page_dirty	= __set_page_dirty_buffers,

	.readpage = affs_readpage_ofs,

	//.writepage = affs_writepage_ofs,

	.write_begin = affs_write_begin_ofs,

fs/bfs/file.c

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ static sector_t bfs_bmap(struct address_space *mapping, sector_t block) 
}



const struct address_space_operations bfs_aops = {

	.set_page_dirty	= __set_page_dirty_buffers,

	.readpage	= bfs_readpage,

	.writepage	= bfs_writepage,

	.write_begin	= bfs_write_begin,

fs/block_dev.c

+1 −0
Original line number Diff line number Diff line
@@ -1754,6 +1754,7 @@ static int blkdev_writepages(struct address_space *mapping, 
}



static const struct address_space_operations def_blk_aops = {

	.set_page_dirty	= __set_page_dirty_buffers,

	.readpage	= blkdev_readpage,

	.readahead	= blkdev_readahead,

	.writepage	= blkdev_writepage,

fs/ecryptfs/mmap.c

+13 −0
Original line number Diff line number Diff line
@@ -533,7 +533,20 @@ static sector_t ecryptfs_bmap(struct address_space *mapping, sector_t block) 
	return block;

}



#include <linux/buffer_head.h>



const struct address_space_operations ecryptfs_aops = {

	/*

	 * XXX: This is pretty broken for multiple reasons: ecryptfs does not

	 * actually use buffer_heads, and ecryptfs will crash without

	 * CONFIG_BLOCK.  But it matches the behavior before the default for

	 * address_space_operations without the ->set_page_dirty method was

	 * cleaned up, so this is the best we can do without maintainer

	 * feedback.

	 */

#ifdef CONFIG_BLOCK

	.set_page_dirty = __set_page_dirty_buffers,

#endif

	.writepage = ecryptfs_writepage,

	.readpage = ecryptfs_readpage,

	.write_begin = ecryptfs_write_begin,