fs: Remove noop_invalidatepage()

We used to have to use noop_invalidatepage() to prevent
block_invalidatepage() from being called, but that behaviour is now gone.

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 d33a0613ed0c518843eb2bdce05974309939bb9e..7a59ca51217e245a3eb9a695e01557ae622b1215 100644 (file)
--- a/drivers/dax/device.c
+++ b/drivers/dax/device.c
@@ -347,7 +347,6 @@ 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,
-       .invalidatepage         = noop_invalidatepage,
 };
 
 static int dax_open(struct inode *inode, struct file *filp)

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 1e14777c3ca68c84d717cd98eddcb6c681c319b3..9b579ee56eafcc0e8d2a85108423d60e8c0f1caa 100644 (file)
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -1001,7 +1001,6 @@ 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,
-       .invalidatepage         = noop_invalidatepage,
 };
 
 /*

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 07ef3f84db9ea2b2f2d62ae431d563f806eabb88..d7086209572aadcdb6e1548c639ca260f15eea57 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3632,7 +3632,6 @@ static const struct address_space_operations ext4_dax_aops = {
        .direct_IO              = noop_direct_IO,
        .set_page_dirty         = __set_page_dirty_no_writeback,
        .bmap                   = ext4_bmap,
-       .invalidatepage         = noop_invalidatepage,
        .swap_activate          = ext4_iomap_swap_activate,
 };
 

diff --git a/fs/fuse/dax.c b/fs/fuse/dax.c
index 182b24a14804cadc3773f8fd7a69911efdffd1d0..b11fa10b88d8b6846822a681c37deb2e1b6b650c 100644 (file)
--- a/fs/fuse/dax.c
+++ b/fs/fuse/dax.c
@@ -1327,7 +1327,6 @@ 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,
-       .invalidatepage = noop_invalidatepage,
 };
 
 static bool fuse_should_enable_dax(struct inode *inode, unsigned int flags)

diff --git a/fs/libfs.c b/fs/libfs.c
index 974125270a42820152bdac2d2d9cc79dac9de622..4e047841e61dc41f2a3424ee566d49924e9a55a8 100644 (file)
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -1198,17 +1198,6 @@ int noop_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 }
 EXPORT_SYMBOL(noop_fsync);
 
-void noop_invalidatepage(struct page *page, unsigned int offset,
-               unsigned int length)
-{
-       /*
-        * There is no page cache to invalidate in the dax case, however
-        * we need this callback defined to prevent falling back to
-        * block_invalidatepage() in do_invalidatepage().
-        */
-}
-EXPORT_SYMBOL_GPL(noop_invalidatepage);
-
 ssize_t noop_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
 {
        /*

diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 51a040b658cbe462d163335a084f581b9eb1fa2b..7dd314f2288f5e357f229cbd440da4de332916c5 100644 (file)
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -582,6 +582,5 @@ 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,
-       .invalidatepage         = noop_invalidatepage,
        .swap_activate          = xfs_iomap_swapfile_activate,
 };

diff --git a/include/linux/fs.h b/include/linux/fs.h
index bcdb613cd6526386e8855b84642b489383607712..a40ea82248dacaeeb5ba1c59ccd1ea1ded46ce9e 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -3323,8 +3323,6 @@ extern int simple_rename(struct user_namespace *, struct inode *,
 extern void simple_recursive_removal(struct dentry *,
                               void (*callback)(struct dentry *));
 extern int noop_fsync(struct file *, loff_t, loff_t, int);
-extern void noop_invalidatepage(struct page *page, unsigned int offset,
-               unsigned int length);
 extern ssize_t noop_direct_IO(struct kiocb *iocb, struct iov_iter *iter);
 extern int simple_empty(struct dentry *);
 extern int simple_write_begin(struct file *file, struct address_space *mapping,