diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 9198a23bb58b1c514a61785830486fb646e33d0b..64cf6a340ba6e3afc08e65bf5255248952fb387b 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -584,9 +584,8 @@ nfs_lock_and_join_requests(struct page *page)
 
 static void nfs_write_error_remove_page(struct nfs_page *req)
 {
+	SetPageError(req->wb_page);
 	nfs_end_page_writeback(req);
-	generic_error_remove_page(page_file_mapping(req->wb_page),
-				  req->wb_page);
 	nfs_release_request(req);
 }