diff --git a/[refs] b/[refs]
index 715f287405b0..5e99173fae90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cae681fc12a824631337906d6ba1dbd498e751a5
+refs/heads/master: 465fdd97cbe16ef8727221857e96ef62dd352017
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 59cba180fe83..dd86050190fc 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -5269,6 +5269,7 @@ static struct address_space_operations btrfs_aops = {
 	.invalidatepage = btrfs_invalidatepage,
 	.releasepage	= btrfs_releasepage,
 	.set_page_dirty	= btrfs_set_page_dirty,
+	.error_remove_page = generic_error_remove_page,
 };
 
 static struct address_space_operations btrfs_symlink_aops = {