btrfs: fix unbalanced unlock in qgroup_account_snapshot()

naota · kdave · commit 44365827cccc · 2021-06-22T14:11:57.000+02:00
qgroup_account_snapshot() is trying to unlock the not taken tree_log_mutex in a error path. Since ret != 0 in this case, we can just return from here. Fixes: 2a4d84c ("btrfs: move delayed ref flushing for qgroup into qgroup helper") CC: stable@vger.kernel.org # 5.12+ Reviewed-by: Qu Wenruo <wqu@suse.com> Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
@@ -1478,7 +1478,7 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans,
 	ret = btrfs_run_delayed_refs(trans, (unsigned long)-1);
 	if (ret) {
 		btrfs_abort_transaction(trans, ret);
-		goto out;
+		return ret;
 	}
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -1478,7 +1478,7 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans,`
`1478`	`1478`	`ret = btrfs_run_delayed_refs(trans, (unsigned long)-1);`
`1479`	`1479`	`if (ret) {`
`1480`	`1480`	`btrfs_abort_transaction(trans, ret);`
`1481`		`- goto out;`
	`1481`	`+ return ret;`
`1482`	`1482`	`}`
`1483`	`1483`
`1484`	`1484`	`/*`