Commit 12fc0a96 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Anna Schumaker
Browse files

nfs: Remove writepage 



NFS already has writepages and migrate_folio, so it does not need to
implement writepage.  The writepage operation is deprecated as it leads
to worse performance under high memory pressure due to folios being
written out in LRU order rather than sequentially within a file.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 1fd5394e

fs/nfs/file.c

+0 −1
Original line number Diff line number Diff line
@@ -558,7 +558,6 @@ const struct address_space_operations nfs_file_aops = { 
	.read_folio = nfs_read_folio,

	.readahead = nfs_readahead,

	.dirty_folio = filemap_dirty_folio,

	.writepage = nfs_writepage,

	.writepages = nfs_writepages,

	.write_begin = nfs_write_begin,

	.write_end = nfs_write_end,

fs/nfs/write.c

+0 −11
Original line number Diff line number Diff line
@@ -680,17 +680,6 @@ static int nfs_writepage_locked(struct folio *folio, 
	return err;

}



int nfs_writepage(struct page *page, struct writeback_control *wbc)

{

	struct folio *folio = page_folio(page);

	int ret;



	ret = nfs_writepage_locked(folio, wbc);

	if (ret != AOP_WRITEPAGE_ACTIVATE)

		unlock_page(page);

	return ret;

}



static int nfs_writepages_callback(struct folio *folio,

				   struct writeback_control *wbc, void *data)

{

include/linux/nfs_fs.h

+0 −1
Original line number Diff line number Diff line
@@ -595,7 +595,6 @@ extern void nfs_complete_unlink(struct dentry *dentry, struct inode *); 
 * linux/fs/nfs/write.c

 */

extern int  nfs_congestion_kb;

extern int  nfs_writepage(struct page *page, struct writeback_control *wbc);

extern int  nfs_writepages(struct address_space *, struct writeback_control *);

extern int  nfs_flush_incompatible(struct file *file, struct folio *folio);

extern int  nfs_update_folio(struct file *file, struct folio *folio,