Re: [libvirt] [PATCH 2/7] node_device: Unlock obj in case of an error too

2017-05-25 Thread John Ferlan


On 05/22/2017 02:38 AM, Bjoern Walk wrote:
> From: Marc Hartmayer 
> 
> Unlock @obj in case of an error too.
> 
> Reviewed-by: Bjoern Walk 
> Reviewed-by: Boris Fiuczynski 
> Signed-off-by: Marc Hartmayer 
> ---
>  src/node_device/node_device_driver.c | 6 +-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 

Reviewed-by: John Ferlan 

John

A patch beyond one I've posted also caught this, but I must not have
been thinking about pulling the unlock out for earlier patch...

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list


[libvirt] [PATCH 2/7] node_device: Unlock obj in case of an error too

2017-05-22 Thread Bjoern Walk
From: Marc Hartmayer 

Unlock @obj in case of an error too.

Reviewed-by: Bjoern Walk 
Reviewed-by: Boris Fiuczynski 
Signed-off-by: Marc Hartmayer 
---
 src/node_device/node_device_driver.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/node_device/node_device_driver.c 
b/src/node_device/node_device_driver.c
index 002c7616f..74507c214 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -282,7 +282,7 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn,
 STREQ(cap->data.scsi_host.wwpn, wwpn)) {
 
 if (virNodeDeviceLookupSCSIHostByWWNEnsureACL(conn, 
obj->def) < 0)
-goto out;
+goto error;
 
 if ((dev = virGetNodeDevice(conn, obj->def->name))) {
 if (VIR_STRDUP(dev->parent, obj->def->parent) < 0)
@@ -302,6 +302,10 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn,
  out:
 nodeDeviceUnlock();
 return dev;
+
+ error:
+virNodeDeviceObjUnlock(obj);
+goto out;
 }
 
 
-- 
2.11.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list