diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 18:28:05 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 18:28:05 +0300 |
| commit | 30a0f5e1fb510f17c25ff159a9fffbe01ae0f34e (patch) | |
| tree | 3392e115d4d5767c8bdaeac8696a2465d65a1e91 /fs/btrfs/relocation.c | |
| parent | 88f5004430babb836cfce886d5d54c82166f8ba4 (diff) | |
| parent | 11dfe35a0108097f2df1f042c485fa7f758c2cdf (diff) | |
| download | linux-30a0f5e1fb510f17c25ff159a9fffbe01ae0f34e.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: fix possible panic on unmount
Btrfs: deal with NULL acl sent to btrfs_set_acl
Btrfs: fix regression in orphan cleanup
Btrfs: Fix race in btrfs_mark_extent_written
Btrfs, fix memory leaks in error paths
Btrfs: align offsets for btrfs_ordered_update_i_size
btrfs: fix missing last-entry in readdir(3)
Diffstat (limited to 'fs/btrfs/relocation.c')
| -rw-r--r-- | fs/btrfs/relocation.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index a9728680eca8..ed3e4a2ec2c8 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -3281,8 +3281,10 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc) return -ENOMEM; path = btrfs_alloc_path(); - if (!path) + if (!path) { + kfree(cluster); return -ENOMEM; + } rc->extents_found = 0; rc->extents_skipped = 0; |