summaryrefslogtreecommitdiff
path: root/mm/truncate.c
diff options
context:
space:
mode:
authorMatthew Wilcox (Oracle) <willy@infradead.org>2022-02-09 23:21:51 +0300
committerMatthew Wilcox (Oracle) <willy@infradead.org>2022-03-15 15:23:30 +0300
commitf50015a596fa106bf642bd85fbf6e6b52cc913d0 (patch)
tree68200cb691163bbd19db712d75b0ecffc0d92e81 /mm/truncate.c
parent58a2fdb61bbb2e7ad100fa9a14fefcbb1365e687 (diff)
downloadlinux-f50015a596fa106bf642bd85fbf6e6b52cc913d0.tar.xz
fs: Remove aops->invalidatepage
With all users migrated to ->invalidate_folio, remove the old operation. 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
Diffstat (limited to 'mm/truncate.c')
-rw-r--r--mm/truncate.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/mm/truncate.c b/mm/truncate.c
index 28650151091a..8010461a59bd 100644
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -19,8 +19,7 @@
#include <linux/highmem.h>
#include <linux/pagevec.h>
#include <linux/task_io_accounting_ops.h>
-#include <linux/buffer_head.h> /* grr. try_to_release_page,
- do_invalidatepage */
+#include <linux/buffer_head.h> /* grr. try_to_release_page */
#include <linux/shmem_fs.h>
#include <linux/rmap.h>
#include "internal.h"
@@ -155,16 +154,9 @@ static int invalidate_exceptional_entry2(struct address_space *mapping,
void folio_invalidate(struct folio *folio, size_t offset, size_t length)
{
const struct address_space_operations *aops = folio->mapping->a_ops;
- void (*invalidatepage)(struct page *, unsigned int, unsigned int);
- if (aops->invalidate_folio) {
+ if (aops->invalidate_folio)
aops->invalidate_folio(folio, offset, length);
- return;
- }
-
- invalidatepage = aops->invalidatepage;
- if (invalidatepage)
- (*invalidatepage)(&folio->page, offset, length);
}
EXPORT_SYMBOL_GPL(folio_invalidate);
@@ -334,7 +326,7 @@ int invalidate_inode_page(struct page *page)
* mapping is large, it is probably the case that the final pages are the most
* recently touched, and freeing happens in ascending file offset order.
*
- * Note that since ->invalidatepage() accepts range to invalidate
+ * Note that since ->invalidate_folio() accepts range to invalidate
* truncate_inode_pages_range is able to handle cases where lend + 1 is not
* page aligned properly.
*/