diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-02-27 00:50:11 +0100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-02-27 00:50:11 +0100 |
commit | f851013cb2238a82782da03ac82a14447933f90d (patch) | |
tree | f97835f69d244865c4a5397d0e6d45d1276a919d /fs/btrfs/free-space-cache.c | |
parent | powerpc/perf: Move perf core & PMU code into a subdirectory (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-f851013cb2238a82782da03ac82a14447933f90d.tar.xz linux-f851013cb2238a82782da03ac82a14447933f90d.zip |
Merge remote-tracking branch 'origin/master' into next
Diffstat (limited to 'fs/btrfs/free-space-cache.c')
-rw-r--r-- | fs/btrfs/free-space-cache.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index c2f20594c9f7..710ea380c7ed 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -777,6 +777,7 @@ int load_free_space_cache(struct btrfs_fs_info *fs_info, spin_lock(&block_group->lock); if (block_group->disk_cache_state != BTRFS_DC_WRITTEN) { spin_unlock(&block_group->lock); + btrfs_free_path(path); goto out; } spin_unlock(&block_group->lock); |