KVM: lib: use jump label to handle resource release in irq_bypass_register_producer()
authorMiaohe Lin <linmiaohe@huawei.com>
Fri, 6 Dec 2019 02:53:53 +0000 (10:53 +0800)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 8 Jan 2020 17:16:01 +0000 (18:16 +0100)
Use out_err jump label to handle resource release. It's a
good practice to release resource in one place and help
eliminate some duplicated code.

Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
virt/lib/irqbypass.c

index cb0c801..28fda42 100644 (file)
@@ -85,6 +85,7 @@ int irq_bypass_register_producer(struct irq_bypass_producer *producer)
 {
        struct irq_bypass_producer *tmp;
        struct irq_bypass_consumer *consumer;
+       int ret;
 
        if (!producer->token)
                return -EINVAL;
@@ -98,20 +99,16 @@ int irq_bypass_register_producer(struct irq_bypass_producer *producer)
 
        list_for_each_entry(tmp, &producers, node) {
                if (tmp->token == producer->token) {
-                       mutex_unlock(&lock);
-                       module_put(THIS_MODULE);
-                       return -EBUSY;
+                       ret = -EBUSY;
+                       goto out_err;
                }
        }
 
        list_for_each_entry(consumer, &consumers, node) {
                if (consumer->token == producer->token) {
-                       int ret = __connect(producer, consumer);
-                       if (ret) {
-                               mutex_unlock(&lock);
-                               module_put(THIS_MODULE);
-                               return ret;
-                       }
+                       ret = __connect(producer, consumer);
+                       if (ret)
+                               goto out_err;
                        break;
                }
        }
@@ -121,6 +118,10 @@ int irq_bypass_register_producer(struct irq_bypass_producer *producer)
        mutex_unlock(&lock);
 
        return 0;
+out_err:
+       mutex_unlock(&lock);
+       module_put(THIS_MODULE);
+       return ret;
 }
 EXPORT_SYMBOL_GPL(irq_bypass_register_producer);