b=19906

b=19906
r=wangdi,ericm

Revise osc_lock_cancel_wait. In clio, we tend to cancel the conflicting locks
at the same client before enqueuing a new lock. In the old implementation, it
waits at osc layer with parent lock held, this is not good - so I moved the
wait to lov layer.