From: Cole Robinson <crobinso@redhat.com>
Date: Thu, 1 Oct 2009 18:51:39 +0000 (-0400)
Subject: nodedev: Add locking in nodeNumOfDevices
X-Git-Tag: v0.7.2~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=112746cdc52577463e7c587eae3731f8b30b95e6;p=thirdparty%2Flibvirt.git

nodedev: Add locking in nodeNumOfDevices

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---

diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index 93ca28c226..c902e7d943 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -153,10 +153,15 @@ static int nodeNumOfDevices(virConnectPtr conn,
     int ndevs = 0;
     unsigned int i;
 
-    for (i = 0; i < driver->devs.count; i++)
+    nodeDeviceLock(driver);
+    for (i = 0; i < driver->devs.count; i++) {
+        virNodeDeviceObjLock(driver->devs.objs[i]);
         if ((cap == NULL) ||
             dev_has_cap(driver->devs.objs[i], cap))
             ++ndevs;
+        virNodeDeviceObjUnlock(driver->devs.objs[i]);
+    }
+    nodeDeviceUnlock(driver);
 
     return ndevs;
 }