diff --git a/[refs] b/[refs]
index 94931f0a12a3..1caffc657085 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa261f549d7652258331ebb12795f3bc4395d213
+refs/heads/master: f590f333fb15444d2971f979d434ecad56c09698
diff --git a/trunk/fs/nfs/file.c b/trunk/fs/nfs/file.c
index 5021b75d2d1e..86d6b4db1096 100644
--- a/trunk/fs/nfs/file.c
+++ b/trunk/fs/nfs/file.c
@@ -525,6 +525,7 @@ const struct address_space_operations nfs_file_aops = {
 	.direct_IO = nfs_direct_IO,
 	.migratepage = nfs_migrate_page,
 	.launder_page = nfs_launder_page,
+	.error_remove_page = generic_error_remove_page,
 };
 
 /*