diff options
| author | Chris Mason <clm@fb.com> | 2017-01-11 06:26:12 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2017-01-11 06:26:12 -0800 |
| commit | 0bf70aebf12d8fa0d06967b72ca4b257eb6adf06 (patch) | |
| tree | 13f6063275339627603ed85ae25d5898bf5981a7 /fs/btrfs/inode.c | |
| parent | 3dda13a8ad787f3d4c4f18c8c05f8eebc7ea135a (diff) | |
| parent | 562a7a07bf61e2949f7cbdb6ac7537ad9e2794d1 (diff) | |
| download | linux-stable-0bf70aebf12d8fa0d06967b72ca4b257eb6adf06.tar.gz linux-stable-0bf70aebf12d8fa0d06967b72ca4b257eb6adf06.tar.bz2 linux-stable-0bf70aebf12d8fa0d06967b72ca4b257eb6adf06.zip | |
Merge branch 'tracepoint-updates-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.10
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 81b9d9d0450c..128e52489f81 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -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) { |