Deadlock avoidance

Deadlock avoidance