Simplify some redundant locking while unref'ing objects

There is no need to hold the mutex when unref'ing
virObject instances

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
(cherry picked from commit 7307c3c00c)
This commit is contained in:
Daniel P. Berrange 2012-09-24 15:19:34 +01:00 committed by Cole Robinson
parent c9791620a0
commit f4e3a2afa5
3 changed files with 3 additions and 8 deletions

View File

@ -741,9 +741,7 @@ static void
virDomainObjListDataFree(void *payload, const void *name ATTRIBUTE_UNUSED)
{
virDomainObjPtr obj = payload;
virDomainObjLock(obj);
if (virObjectUnref(obj))
virDomainObjUnlock(obj);
virObjectUnref(obj);
}
int virDomainObjListInit(virDomainObjListPtr doms)

View File

@ -3499,8 +3499,8 @@ endjob:
ignore_value(qemuDomainObjEndAsyncJob(driver, wdEvent->vm));
unlock:
if (virObjectUnref(wdEvent->vm))
virDomainObjUnlock(wdEvent->vm);
virDomainObjUnlock(wdEvent->vm);
virObjectUnref(wdEvent->vm);
qemuDriverUnlock(driver);
VIR_FREE(wdEvent);
}

View File

@ -191,10 +191,7 @@ static void virNetServerHandleJob(void *jobOpaque, void *opaque)
if (virNetServerProcessMsg(srv, job->client, job->prog, job->msg) < 0)
goto error;
virNetServerLock(srv);
virObjectUnref(job->prog);
virNetServerUnlock(srv);
virObjectUnref(job->client);
VIR_FREE(job);
return;