From 110aaa7f468de619bdaaa570f7a3609726a2b143 Mon Sep 17 00:00:00 2001
From: Glauber Costa <glommer@redhat.com>
Date: Wed, 17 Sep 2008 23:16:59 -0300
Subject: [PATCH] --- yaml --- r: 115327 b: refs/heads/master c:
 7d8fece678c1abc2ca3e1ceda2277c3538a9161c h: refs/heads/master i:   115325:
 7cfce772b9ae0ae267a7e1616c48b93c943acf07   115323:
 dca3897ba7fc2192558e18a1cbce68f72b1eb81a   115319:
 81ba406c093b6bfb3831185e09b84c671d5ac91f   115311:
 1d88f637cb94cb4777777a7550fe5b5be959c487   115295:
 f8f4a1faca41ae9683b8f76bbe85b8f307ed79e4   115263:
 34a9d92f67d47abf5c9032a1ecfe68c87e497fed   115199:
 294948659397279fd0ffc27f79fd09925cbb404a v: v3

---
 [refs]                    | 2 +-
 trunk/virt/kvm/kvm_main.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index be0310b18917..7002664e3f6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af2152f5457448bd90cb019c108e0a85e716fdbe
+refs/heads/master: 7d8fece678c1abc2ca3e1ceda2277c3538a9161c
diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c
index cd34f73513d3..ef9a121bbd13 100644
--- a/trunk/virt/kvm/kvm_main.c
+++ b/trunk/virt/kvm/kvm_main.c
@@ -1089,12 +1089,11 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, int n)
 
 	r = kvm_arch_vcpu_setup(vcpu);
 	if (r)
-		goto vcpu_destroy;
+		return r;
 
 	mutex_lock(&kvm->lock);
 	if (kvm->vcpus[n]) {
 		r = -EEXIST;
-		mutex_unlock(&kvm->lock);
 		goto vcpu_destroy;
 	}
 	kvm->vcpus[n] = vcpu;
@@ -1110,8 +1109,8 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, int n)
 unlink:
 	mutex_lock(&kvm->lock);
 	kvm->vcpus[n] = NULL;
-	mutex_unlock(&kvm->lock);
 vcpu_destroy:
+	mutex_unlock(&kvm->lock);
 	kvm_arch_vcpu_destroy(vcpu);
 	return r;
 }