Merge branch 'master' into for-2.6.34

1 files changed, 5 insertions, 2 deletions

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index a9728680eca..ab7ab531874 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;
@@ -3762,7 +3764,8 @@ out:
                                        BTRFS_DATA_RELOC_TREE_OBJECTID);
                 if (IS_ERR(fs_root))
                         err = PTR_ERR(fs_root);
-                btrfs_orphan_cleanup(fs_root);
+                else
+                        btrfs_orphan_cleanup(fs_root);
         }
         return err;
 }