fs: Remove aops->invalidatepage

With all users migrated to ->invalidate_folio, remove the old operation.

Matthew Wilcox (Oracle) committed 4 years ago

Commit f50015a1 parent 58a2fdb4 files · +3 −15Browse files

Unified · Split

4 files

 				struct page *page, void *fsdata);
 	sector_t (*bmap)(struct address_space *, sector_t);
 	void (*invalidate_folio) (struct folio *, size_t start, size_t len);
-	void (*invalidatepage) (struct page *, unsigned int, unsigned int);
 	int (*releasepage) (struct page *, int);
 	void (*freepage)(struct page *);
 	int (*direct_IO)(struct kiocb *, struct iov_iter *iter);
 write_end:		yes, unlocks		 exclusive
 bmap:
 invalidate_folio:	yes					exclusive
-invalidatepage:		yes					exclusive
 releasepage:		yes
 freepage:		yes
 direct_IO:

@@ -736,7 +736,6 @@ cache in your filesystem. The following members are defined: · 735 unmodified lines
736	struct page page, void fsdata);	736	struct page page, void fsdata);
737	sector_t (bmap)(struct address_space , sector_t);	737	sector_t (bmap)(struct address_space , sector_t);
738	void (invalidate_folio) (struct folio , size_t start, size_t len);	738	void (invalidate_folio) (struct folio , size_t start, size_t len);
739	void (invalidatepage) (struct page , unsigned int, unsigned int);
740	int (releasepage) (struct page , int);	739	int (releasepage) (struct page , int);
741	void (freepage)(struct page );	740	void (freepage)(struct page );
742	ssize_t (direct_IO)(struct kiocb , struct iov_iter *iter);	741	ssize_t (direct_IO)(struct kiocb , struct iov_iter *iter);

@@ -388,7 +388,6 @@ struct address_space_operations { · 387 unmodified lines
388	/* Unfortunately this kludge is needed for FIBMAP. Don't use it */	388	/* Unfortunately this kludge is needed for FIBMAP. Don't use it */
389	sector_t (bmap)(struct address_space , sector_t);	389	sector_t (bmap)(struct address_space , sector_t);
390	void (invalidate_folio) (struct folio , size_t offset, size_t len);	390	void (invalidate_folio) (struct folio , size_t offset, size_t len);
391	void (invalidatepage) (struct page , unsigned int, unsigned int);
392	int (releasepage) (struct page , gfp_t);	391	int (releasepage) (struct page , gfp_t);
393	void (freepage)(struct page );	392	void (freepage)(struct page );
394	ssize_t (direct_IO)(struct kiocb , struct iov_iter *iter);	393	ssize_t (direct_IO)(struct kiocb , struct iov_iter *iter);

 #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,
+#include <linux/buffer_head.h>	/* grr. try_to_release_page */
-				   do_invalidatepage */
 #include <linux/shmem_fs.h>
 #include <linux/rmap.h>
 #include "internal.h"
 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);
  * 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.
  */

Keyboard shortcuts