---

yaml --- r: 332599 b: refs/heads/master c: f0bd95e h: refs/heads/master i: 332597: 0bdfe2e 332595: 0d2572f 332591: dd4cb48 v: v3
git-mirror · Oct 9, 2012 · e1857a1 · e1857a1
1 parent adbe9eb
commit e1857a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);