Merge branch 'tracepoint-updates-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.10

This commit is contained in:
Chris Mason
2017-01-11 06:26:12 -08:00
3 changed files with 91 additions and 72 deletions

View File

@@ -7059,7 +7059,7 @@ insert:
write_unlock(&em_tree->lock);
out:
trace_btrfs_get_extent(root, em);
trace_btrfs_get_extent(root, inode, em);
btrfs_free_path(path);
if (trans) {