From e1857a1e29abe52669817f300aa158f7b34ccbe4 Mon Sep 17 00:00:00 2001 From: Tsutomu Itoh Date: Mon, 1 Oct 2012 03:08:37 -0600 Subject: [PATCH] --- yaml --- r: 332599 b: refs/heads/master c: f0bd95ea72644cbf9210606f6f8edfce13d65d47 h: refs/heads/master i: 332597: 0bdfe2e2af577f1fac36817e4a52a1b1b4936efd 332595: 0d2572f76e8fdc8b707c17fcef0d45e0aac5a9cb 332591: dd4cb48fd68b42fe685fe3e59ad54abf24c5e31b v: v3 --- [refs] | 2 +- trunk/fs/btrfs/inode.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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);