mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-10 17:57:25 +03:00
admin: Remove unnecessary @conn object locking
The only place we change the @conn object is actually virAdmConnectOpen routine, thus at the moment we don't really need to lock it, given the fact that what we're trying to do here is to change the closeCallback object which is a lockable object itself, so that should be enough to avoid races. Signed-off-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
parent
b98b3b742b
commit
d46a1e5d45
@ -465,7 +465,6 @@ int virAdmConnectRegisterCloseCallback(virAdmConnectPtr conn,
|
||||
|
||||
virObjectRef(conn);
|
||||
|
||||
virObjectLock(conn);
|
||||
virObjectLock(conn->closeCallback);
|
||||
|
||||
virCheckNonNullArgGoto(cb, error);
|
||||
@ -482,13 +481,11 @@ int virAdmConnectRegisterCloseCallback(virAdmConnectPtr conn,
|
||||
conn->closeCallback->freeCallback = freecb;
|
||||
|
||||
virObjectUnlock(conn->closeCallback);
|
||||
virObjectUnlock(conn);
|
||||
|
||||
return 0;
|
||||
|
||||
error:
|
||||
virObjectUnlock(conn->closeCallback);
|
||||
virObjectUnlock(conn);
|
||||
virDispatchError(NULL);
|
||||
virObjectUnref(conn);
|
||||
return -1;
|
||||
@ -517,7 +514,6 @@ int virAdmConnectUnregisterCloseCallback(virAdmConnectPtr conn,
|
||||
|
||||
virCheckAdmConnectReturn(conn, -1);
|
||||
|
||||
virObjectLock(conn);
|
||||
virObjectLock(conn->closeCallback);
|
||||
|
||||
virCheckNonNullArgGoto(cb, error);
|
||||
@ -534,14 +530,12 @@ int virAdmConnectUnregisterCloseCallback(virAdmConnectPtr conn,
|
||||
conn->closeCallback->freeCallback = NULL;
|
||||
|
||||
virObjectUnlock(conn->closeCallback);
|
||||
virObjectUnlock(conn);
|
||||
virObjectUnref(conn);
|
||||
|
||||
return 0;
|
||||
|
||||
error:
|
||||
virObjectUnlock(conn->closeCallback);
|
||||
virObjectUnlock(conn);
|
||||
virDispatchError(NULL);
|
||||
return -1;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user