Clean up and check locking
Signed-off-by: NAlan Cox <alan@redhat.com>
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>