We should return EDEADLK, not deadlock the calling thread. Change-Id: I1243483f709c11b2a60e41142725c54c7dbfcbc9