fs: Convert __set_page_dirty_no_writeback to noop_dirty_folio

This is a mechanical change.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Tested-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Acked-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Tested-by: Mike Marshall <hubcap@omnibond.com> # orangefs
Tested-by: David Howells <dhowells@redhat.com> # afs

diff --git a/drivers/dax/device.c b/drivers/dax/device.c
index 7a59ca51217e245a3eb9a695e01557ae622b1215..5494d745ced58ad9fc12bfa2e8fc0ab71ad3548c 100644 (file)
--- a/drivers/dax/device.c
+++ b/drivers/dax/device.c
@@ -346,7 +346,7 @@ static unsigned long dax_get_unmapped_area(struct file *filp,
 }
 
 static const struct address_space_operations dev_dax_aops = {
-       .set_page_dirty         = __set_page_dirty_no_writeback,
+       .dirty_folio    = noop_dirty_folio,
 };
 
 static int dax_open(struct inode *inode, struct file *filp)

diff --git a/fs/aio.c b/fs/aio.c
index 4ceba13a7db0f60510174c8b8d46f461ab3034ea..d6b7160c2a778b5eeb3b7c491cb96613e7e3e7b5 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -478,7 +478,7 @@ out:
 #endif
 
 static const struct address_space_operations aio_ctx_aops = {
-       .set_page_dirty = __set_page_dirty_no_writeback,
+       .dirty_folio    = noop_dirty_folio,
 #if IS_ENABLED(CONFIG_MIGRATION)
        .migratepage    = aio_migratepage,
 #endif

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index d9452a0511988251341883544ee18603bb034d04..52377a0ee735f9aafc2db83d8a707d598f7faa0f 100644 (file)
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -1000,7 +1000,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         = __set_page_dirty_no_writeback,
+       .dirty_folio            = noop_dirty_folio,
 };
 
 /*

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 4c34104a94f00b47615c10a9ada595edbbc0fa14..436efd31cc274e8a1b89d33d2eb7c25755837b8c 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3630,7 +3630,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         = __set_page_dirty_no_writeback,
+       .dirty_folio            = noop_dirty_folio,
        .bmap                   = ext4_bmap,
        .swap_activate          = ext4_iomap_swap_activate,
 };

diff --git a/fs/fuse/dax.c b/fs/fuse/dax.c
index b11fa10b88d8b6846822a681c37deb2e1b6b650c..d7d3a7f06862d85b1bed8a88f74ae42037559311 100644 (file)
--- a/fs/fuse/dax.c
+++ b/fs/fuse/dax.c
@@ -1326,7 +1326,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 = __set_page_dirty_no_writeback,
+       .dirty_folio    = noop_dirty_folio,
 };
 
 static bool fuse_should_enable_dax(struct inode *inode, unsigned int flags)

diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index a7c6c7498be0b30bf6d1c17278d991f99319f832..f544f622598d0764859c698b5b27572f20eca2db 100644 (file)
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -1144,7 +1144,7 @@ static void hugetlbfs_destroy_inode(struct inode *inode)
 static const struct address_space_operations hugetlbfs_aops = {
        .write_begin    = hugetlbfs_write_begin,
        .write_end      = hugetlbfs_write_end,
-       .set_page_dirty =  __set_page_dirty_no_writeback,
+       .dirty_folio    = noop_dirty_folio,
        .migratepage    = hugetlbfs_migrate_page,
        .error_remove_page      = hugetlbfs_error_remove_page,
 };

diff --git a/fs/libfs.c b/fs/libfs.c
index 4e047841e61dc41f2a3424ee566d49924e9a55a8..e64bdedef16835de44b0182a2c390d477a701b3e 100644 (file)
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -631,7 +631,7 @@ const struct address_space_operations ram_aops = {
        .readpage       = simple_readpage,
        .write_begin    = simple_write_begin,
        .write_end      = simple_write_end,
-       .set_page_dirty = __set_page_dirty_no_writeback,
+       .dirty_folio    = noop_dirty_folio,
 };
 EXPORT_SYMBOL(ram_aops);
 
@@ -1220,7 +1220,7 @@ EXPORT_SYMBOL(kfree_link);
 struct inode *alloc_anon_inode(struct super_block *s)
 {
        static const struct address_space_operations anon_aops = {
-               .set_page_dirty = __set_page_dirty_no_writeback,
+               .dirty_folio    = noop_dirty_folio,
        };
        struct inode *inode = new_inode_pseudo(s);
 

diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 37b03675b8c3542f585bebdaf4168a83a09b8cfb..90b7f4d127de3c98203b180dfb2ad7139dfce81b 100644 (file)
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -581,6 +581,6 @@ const struct address_space_operations xfs_address_space_operations = {
 const struct address_space_operations xfs_dax_aops = {
        .writepages             = xfs_dax_writepages,
        .direct_IO              = noop_direct_IO,
-       .set_page_dirty         = __set_page_dirty_no_writeback,
+       .dirty_folio            = noop_dirty_folio,
        .swap_activate          = xfs_iomap_swapfile_activate,
 };

diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 6a9617e9c6bc7d1864801b93c966eb99b1bdc79d..ab85d2856a37e18a19a75a8f06108dcb1de4b0a7 100644 (file)
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -919,7 +919,7 @@ static inline int __must_check write_one_page(struct page *page)
 }
 
 int __set_page_dirty_nobuffers(struct page *page);
-int __set_page_dirty_no_writeback(struct page *page);
+bool noop_dirty_folio(struct address_space *mapping, struct folio *folio);
 
 void page_endio(struct page *page, bool is_write, int err);
 

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index e890db239fae0b1908299d8732fc96c083639585..4557a8d3dfea1226989d5c06532c0fdb69b398bb 100644 (file)
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -2430,13 +2430,13 @@ EXPORT_SYMBOL(folio_write_one);
 /*
  * For address_spaces which do not use buffers nor write back.
  */
-int __set_page_dirty_no_writeback(struct page *page)
+bool noop_dirty_folio(struct address_space *mapping, struct folio *folio)
 {
-       if (!PageDirty(page))
-               return !TestSetPageDirty(page);
-       return 0;
+       if (!folio_test_dirty(folio))
+               return !folio_test_set_dirty(folio);
+       return false;
 }
-EXPORT_SYMBOL(__set_page_dirty_no_writeback);
+EXPORT_SYMBOL(noop_dirty_folio);
 
 /*
  * Helper function for set_page_dirty family.

diff --git a/mm/page_io.c b/mm/page_io.c
index 8f20f4dad289b7a9c88cf456eb1085cd91f64b2b..e3333973335e92c0b369b0386a66c19dcd621211 100644 (file)
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -453,6 +453,6 @@ bool swap_dirty_folio(struct address_space *mapping, struct folio *folio)
                        return aops->dirty_folio(mapping, folio);
                return aops->set_page_dirty(&folio->page);
        } else {
-               return __set_page_dirty_no_writeback(&folio->page);
+               return noop_dirty_folio(mapping, folio);
        }
 }

diff --git a/mm/secretmem.c b/mm/secretmem.c
index 22b310adb53d9dd80da640cf2dc87419390b7d7b..098638d3b8a41c08a6818e5bac4acccf75d80df3 100644 (file)
--- a/mm/secretmem.c
+++ b/mm/secretmem.c
@@ -152,7 +152,7 @@ static void secretmem_freepage(struct page *page)
 }
 
 const struct address_space_operations secretmem_aops = {
-       .set_page_dirty = __set_page_dirty_no_writeback,
+       .dirty_folio    = noop_dirty_folio,
        .freepage       = secretmem_freepage,
        .migratepage    = secretmem_migratepage,
        .isolate_page   = secretmem_isolate_page,

diff --git a/mm/shmem.c b/mm/shmem.c
index a09b29ec2b45c906fef4e8fcfc0d88a93ea99718..5944159bc43ea0ba49c04731df79f6cf39b273e3 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -3753,7 +3753,7 @@ static int shmem_error_remove_page(struct address_space *mapping,
 
 const struct address_space_operations shmem_aops = {
        .writepage      = shmem_writepage,
-       .set_page_dirty = __set_page_dirty_no_writeback,
+       .dirty_folio    = noop_dirty_folio,
 #ifdef CONFIG_TMPFS
        .write_begin    = shmem_write_begin,
        .write_end      = shmem_write_end,