[libvirt] [PATCH 02/13] nodedev: Fix locking in virNodeDeviceObjRemove
The current mechanism doesn't lock each element in devs->objs as it's
looking at it, rather it keeps locking/unlocking the passed element for
which the removal is being attempted. Fix things to lock each element
as we're looking at them.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/conf/virnodedeviceobj.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
index 02ac544..1352720 100644
--- a/src/conf/virnodedeviceobj.c
+++ b/src/conf/virnodedeviceobj.c
@@ -281,16 +281,16 @@ virNodeDeviceObjRemove(virNodeDeviceObjListPtr devs,
virNodeDeviceObjUnlock(*dev);
for (i = 0; i < devs->count; i++) {
- virNodeDeviceObjLock(*dev);
+ virNodeDeviceObjLock(devs->objs[i]);
if (devs->objs[i] == *dev) {
- virNodeDeviceObjUnlock(*dev);
+ virNodeDeviceObjUnlock(devs->objs[i]);
virNodeDeviceObjFree(devs->objs[i]);
*dev = NULL;
VIR_DELETE_ELEMENT(devs->objs, i, devs->count);
break;
}
- virNodeDeviceObjUnlock(*dev);
+ virNodeDeviceObjUnlock(devs->objs[i]);
}
}
--
2.9.3