diff --git a/[refs] b/[refs]
index 3ff77100afd5..3368cb4c55d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34094537943113467faee98fe67c8a3d3f9a0a8b
+refs/heads/master: d611b22f1a5ddd0823e9d6a30bac91219f800e41
diff --git a/trunk/fs/nilfs2/page.c b/trunk/fs/nilfs2/page.c
index 4d2a1ee0eb47..9d2dc6b4348e 100644
--- a/trunk/fs/nilfs2/page.c
+++ b/trunk/fs/nilfs2/page.c
@@ -495,12 +495,14 @@ unsigned nilfs_page_count_clean_buffers(struct page *page,
 void nilfs_mapping_init(struct address_space *mapping,
 			struct backing_dev_info *bdi)
 {
+	static const struct address_space_operations empty_aops;
+
 	mapping->host = NULL;
 	mapping->flags = 0;
 	mapping_set_gfp_mask(mapping, GFP_NOFS);
 	mapping->assoc_mapping = NULL;
 	mapping->backing_dev_info = bdi;
-	mapping->a_ops = NULL;
+	mapping->a_ops = &empty_aops;
 }
 
 /*