Each function touches state in some way, so getting the lock earlier
can help simplify code.
Signed-off-by: NBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>