On Fri, Dec 01, 2017 at 02:00:33PM -0500, Jason Baron wrote: > You could leave the annotation and do something like: > s/ep->lock/ep->wq->lock. And then that would remove the ep->lock saving > a bit of space. Looks like this isn't going to work due to ep_poll_safewake taking another waitqueue lock. If we had a strict lock order it might work, but the mess in ep_call_nested makes me fear it doesn't.