From: Filipe Manana <fdmanana@suse.com>
Date: Thu, 10 Dec 2015 11:08:59 +0000 (+0000)
Subject: Btrfs: fix transaction handle leak in balance
X-Git-Tag: firefly_0821_release~176^2~545^2^2~1
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=8a7d656f3dfb7889316ba57502f1eaa6106fd6f8;p=firefly-linux-kernel-4.4.55.git

Btrfs: fix transaction handle leak in balance

If we fail to allocate a new data chunk, we were jumping to the error path
without release the transaction handle we got before. Fix this by always
releasing it before doing the jump.

Fixes: 2c9fe8355258 ("btrfs: Fix lost-data-profile caused by balance bg")
Signed-off-by: Filipe Manana <fdmanana@suse.com>
---

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 750285e4f274..86124cde907a 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -3548,12 +3548,11 @@ again:
 
 			ret = btrfs_force_chunk_alloc(trans, chunk_root,
 						      BTRFS_BLOCK_GROUP_DATA);
+			btrfs_end_transaction(trans, chunk_root);
 			if (ret < 0) {
 				mutex_unlock(&fs_info->delete_unused_bgs_mutex);
 				goto error;
 			}
-
-			btrfs_end_transaction(trans, chunk_root);
 			chunk_reserved = 1;
 		}