diff --git a/[refs] b/[refs]
index baf3e896586c..c297e2d93af9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d396c6f554d182b7bce4e2bb2acb47f80430c05f
+refs/heads/master: b06355f0fe04a62d08238438654ec453e05304ba
diff --git a/trunk/fs/btrfs/extent_map.c b/trunk/fs/btrfs/extent_map.c
index ff2b1dd25bf9..162766773a32 100644
--- a/trunk/fs/btrfs/extent_map.c
+++ b/trunk/fs/btrfs/extent_map.c
@@ -1607,7 +1607,12 @@ int extent_write_full_page(struct extent_map_tree *tree, struct page *page,
 			continue;
 		}
 		clear_extent_dirty(tree, cur, cur + iosize - 1, GFP_NOFS);
-		ret = tree->ops->writepage_io_hook(page, cur, cur + iosize - 1);
+		if (tree->ops && tree->ops->writepage_io_hook) {
+			ret = tree->ops->writepage_io_hook(page, cur,
+						cur + iosize - 1);
+		} else {
+			ret = 0;
+		}
 		if (ret)
 			SetPageError(page);
 		else {