Updated patch for the the lock_sem deadlock

[Ronnie Sahlberg <lsahlber@xxxxxxxxxx>]

Steve, Pavel, Dave

This is a small update to Dave's patch to address Pavels recommendation
that we use a helper function for the trylock/sleep loop.