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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Jan 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/adfs/inode.c b/fs/adfs/inode.c
index fb7ee02..adbb3a1 100644 (file)
--- a/fs/adfs/inode.c
+++ b/fs/adfs/inode.c
@@ -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,

diff --git a/fs/affs/file.c b/fs/affs/file.c
index d91b013..75ebd2b 100644 (file)
--- a/fs/affs/file.c
+++ b/fs/affs/file.c
@@ -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 @@ err_bh:
 }
 
 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,

diff --git a/fs/bfs/file.c b/fs/bfs/file.c
index 0dceefc..7f8544a 100644 (file)
--- a/fs/bfs/file.c
+++ b/fs/bfs/file.c
@@ -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,

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 6cc4d4c..eb34f5c 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -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,

diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c
index 392e721..7d85e64 100644 (file)
--- a/fs/ecryptfs/mmap.c
+++ b/fs/ecryptfs/mmap.c
@@ -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,

diff --git a/fs/exfat/inode.c b/fs/exfat/inode.c
index 1803ef3..ca37d43 100644 (file)
--- a/fs/exfat/inode.c
+++ b/fs/exfat/inode.c
@@ -491,6 +491,7 @@ int exfat_block_truncate_page(struct inode *inode, loff_t from)
 }
 
 static const struct address_space_operations exfat_aops = {
+       .set_page_dirty = __set_page_dirty_buffers,
        .readpage       = exfat_readpage,
        .readahead      = exfat_readahead,
        .writepage      = exfat_writepage,

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 68178b2..bf41f57 100644 (file)
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -961,6 +961,7 @@ ext2_dax_writepages(struct address_space *mapping, struct writeback_control *wbc
 }
 
 const struct address_space_operations ext2_aops = {
+       .set_page_dirty         = __set_page_dirty_buffers,
        .readpage               = ext2_readpage,
        .readahead              = ext2_readahead,
        .writepage              = ext2_writepage,
@@ -975,6 +976,7 @@ const struct address_space_operations ext2_aops = {
 };
 
 const struct address_space_operations ext2_nobh_aops = {
+       .set_page_dirty         = __set_page_dirty_buffers,
        .readpage               = ext2_readpage,
        .readahead              = ext2_readahead,
        .writepage              = ext2_nobh_writepage,

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index bab9b20..de0c9b0 100644 (file)
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -342,6 +342,7 @@ int fat_block_truncate_page(struct inode *inode, loff_t from)
 }
 
 static const struct address_space_operations fat_aops = {
+       .set_page_dirty = __set_page_dirty_buffers,
        .readpage       = fat_readpage,
        .readahead      = fat_readahead,
        .writepage      = fat_writepage,

diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
index d68184e..7c96199 100644 (file)
--- a/fs/gfs2/meta_io.c
+++ b/fs/gfs2/meta_io.c
@@ -89,11 +89,13 @@ static int gfs2_aspace_writepage(struct page *page, struct writeback_control *wb
 }
 
 const struct address_space_operations gfs2_meta_aops = {
+       .set_page_dirty = __set_page_dirty_buffers,
        .writepage = gfs2_aspace_writepage,
        .releasepage = gfs2_releasepage,
 };
 
 const struct address_space_operations gfs2_rgrp_aops = {
+       .set_page_dirty = __set_page_dirty_buffers,
        .writepage = gfs2_aspace_writepage,
        .releasepage = gfs2_releasepage,
 };

diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index 3fc5cb3..4a95a92 100644 (file)
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -159,6 +159,7 @@ static int hfs_writepages(struct address_space *mapping,
 }
 
 const struct address_space_operations hfs_btree_aops = {
+       .set_page_dirty = __set_page_dirty_buffers,
        .readpage       = hfs_readpage,
        .writepage      = hfs_writepage,
        .write_begin    = hfs_write_begin,
@@ -168,6 +169,7 @@ const struct address_space_operations hfs_btree_aops = {
 };
 
 const struct address_space_operations hfs_aops = {
+       .set_page_dirty = __set_page_dirty_buffers,
        .readpage       = hfs_readpage,
        .writepage      = hfs_writepage,
        .write_begin    = hfs_write_begin,

diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index 8ea447e..70e8374 100644 (file)
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -156,6 +156,7 @@ static int hfsplus_writepages(struct address_space *mapping,
 }
 
 const struct address_space_operations hfsplus_btree_aops = {
+       .set_page_dirty = __set_page_dirty_buffers,
        .readpage       = hfsplus_readpage,
        .writepage      = hfsplus_writepage,
        .write_begin    = hfsplus_write_begin,
@@ -165,6 +166,7 @@ const struct address_space_operations hfsplus_btree_aops = {
 };
 
 const struct address_space_operations hfsplus_aops = {
+       .set_page_dirty = __set_page_dirty_buffers,
        .readpage       = hfsplus_readpage,
        .writepage      = hfsplus_writepage,
        .write_begin    = hfsplus_write_begin,

diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c
index 077c251..c3a49aa 100644 (file)
--- a/fs/hpfs/file.c
+++ b/fs/hpfs/file.c
@@ -196,6 +196,7 @@ static int hpfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
 }
 
 const struct address_space_operations hpfs_aops = {
+       .set_page_dirty = __set_page_dirty_buffers,
        .readpage = hpfs_readpage,
        .writepage = hpfs_writepage,
        .readahead = hpfs_readahead,

diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index 6f65bfa..3663dd5 100644 (file)
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -356,6 +356,7 @@ static ssize_t jfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
 }
 
 const struct address_space_operations jfs_aops = {
+       .set_page_dirty = __set_page_dirty_buffers,
        .readpage       = jfs_readpage,
        .readahead      = jfs_readahead,
        .writepage      = jfs_writepage,

diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index a532a99..a71f1cf 100644 (file)
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -442,6 +442,7 @@ static sector_t minix_bmap(struct address_space *mapping, sector_t block)
 }
 
 static const struct address_space_operations minix_aops = {
+       .set_page_dirty = __set_page_dirty_buffers,
        .readpage = minix_readpage,
        .writepage = minix_writepage,
        .write_begin = minix_write_begin,

diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c
index c0361ce..97769fe 100644 (file)
--- a/fs/nilfs2/mdt.c
+++ b/fs/nilfs2/mdt.c
@@ -434,6 +434,7 @@ nilfs_mdt_write_page(struct page *page, struct writeback_control *wbc)
 
 
 static const struct address_space_operations def_mdt_aops = {
+       .set_page_dirty         = __set_page_dirty_buffers,
        .writepage              = nilfs_mdt_write_page,
 };
 

diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index e1c6fa5..68d11c2 100644 (file)
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -2453,6 +2453,7 @@ static ssize_t ocfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
 }
 
 const struct address_space_operations ocfs2_aops = {
+       .set_page_dirty         = __set_page_dirty_buffers,
        .readpage               = ocfs2_readpage,
        .readahead              = ocfs2_readahead,
        .writepage              = ocfs2_writepage,

diff --git a/fs/omfs/file.c b/fs/omfs/file.c
index 11e733a..89725b1 100644 (file)
--- a/fs/omfs/file.c
+++ b/fs/omfs/file.c
@@ -372,6 +372,7 @@ const struct inode_operations omfs_file_inops = {
 };
 
 const struct address_space_operations omfs_aops = {
+       .set_page_dirty = __set_page_dirty_buffers,
        .readpage = omfs_readpage,
        .readahead = omfs_readahead,
        .writepage = omfs_writepage,

diff --git a/fs/sysv/itree.c b/fs/sysv/itree.c
index 8b2e99b..7493850 100644 (file)
--- a/fs/sysv/itree.c
+++ b/fs/sysv/itree.c
@@ -495,6 +495,7 @@ static sector_t sysv_bmap(struct address_space *mapping, sector_t block)
 }
 
 const struct address_space_operations sysv_aops = {
+       .set_page_dirty = __set_page_dirty_buffers,
        .readpage = sysv_readpage,
        .writepage = sysv_writepage,
        .write_begin = sysv_write_begin,

diff --git a/fs/udf/file.c b/fs/udf/file.c
index 2846dcd..1baff8d 100644 (file)
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -125,6 +125,7 @@ static int udf_adinicb_write_end(struct file *file, struct address_space *mappin
 }
 
 const struct address_space_operations udf_adinicb_aops = {
+       .set_page_dirty = __set_page_dirty_buffers,
        .readpage       = udf_adinicb_readpage,
        .writepage      = udf_adinicb_writepage,
        .write_begin    = udf_adinicb_write_begin,

diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 0dd2f93..4917670 100644 (file)
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -235,6 +235,7 @@ static sector_t udf_bmap(struct address_space *mapping, sector_t block)
 }
 
 const struct address_space_operations udf_aops = {
+       .set_page_dirty = __set_page_dirty_buffers,
        .readpage       = udf_readpage,
        .readahead      = udf_readahead,
        .writepage      = udf_writepage,

diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index debc282..ac628de 100644 (file)
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -526,6 +526,7 @@ static sector_t ufs_bmap(struct address_space *mapping, sector_t block)
 }
 
 const struct address_space_operations ufs_aops = {
+       .set_page_dirty = __set_page_dirty_buffers,
        .readpage = ufs_readpage,
        .writepage = ufs_writepage,
        .write_begin = ufs_write_begin,

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index c2a849d..21f4b59 100644 (file)
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -32,7 +32,6 @@
 #include <linux/sysctl.h>
 #include <linux/cpu.h>
 #include <linux/syscalls.h>
-#include <linux/buffer_head.h> /* __set_page_dirty_buffers */
 #include <linux/pagevec.h>
 #include <linux/timer.h>
 #include <linux/sched/rt.h>
@@ -2555,13 +2554,9 @@ EXPORT_SYMBOL(redirty_page_for_writepage);
 /*
  * Dirty a page.
  *
- * For pages with a mapping this should be done under the page lock
- * for the benefit of asynchronous memory errors who prefer a consistent
- * dirty state. This rule can be broken in some special cases,
- * but should be better not to.
- *
- * If the mapping doesn't provide a set_page_dirty a_op, then
- * just fall through and assume that it wants buffer_heads.
+ * For pages with a mapping this should be done under the page lock for the
+ * benefit of asynchronous memory errors who prefer a consistent dirty state.
+ * This rule can be broken in some special cases, but should be better not to.
  */
 int set_page_dirty(struct page *page)
 {
@@ -2569,7 +2564,6 @@ int set_page_dirty(struct page *page)
 
        page = compound_head(page);
        if (likely(mapping)) {
-               int (*spd)(struct page *) = mapping->a_ops->set_page_dirty;
                /*
                 * readahead/lru_deactivate_page could remain
                 * PG_readahead/PG_reclaim due to race with end_page_writeback
@@ -2582,11 +2576,7 @@ int set_page_dirty(struct page *page)
                 */
                if (PageReclaim(page))
                        ClearPageReclaim(page);
-#ifdef CONFIG_BLOCK
-               if (!spd)
-                       spd = __set_page_dirty_buffers;
-#endif
-               return (*spd)(page);
+               return mapping->a_ops->set_page_dirty(page);
        }
        if (!PageDirty(page)) {
                if (!TestSetPageDirty(page))