diff --git a/[refs] b/[refs]
index adcd9efc48e1..4e6a412622e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18ec90d63f43cf785f6e73e7a7db546bff3fa380
+refs/heads/master: f0bd95ea72644cbf9210606f6f8edfce13d65d47
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index d24b65014612..f92def2467a6 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -5505,7 +5505,8 @@ struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page,
 	write_unlock(&em_tree->lock);
 out:
 
-	trace_btrfs_get_extent(root, em);
+	if (em)
+		trace_btrfs_get_extent(root, em);
 
 	if (path)
 		btrfs_free_path(path);