s3-g_lock: Make g_lock_lock more robust