During the reorganization some of the multi-theaded locking assumptions were
accidently relaxed.  This patch moves us back towards a more conservative 
locking strategy.
Signed-off-by: NEric Van Hensbergen <ericvh@gmail.com>