K 10 svn:author V 5 mmacy K 8 svn:date V 27 2018-05-14T00:14:00.952504Z K 7 svn:log V 337 epoch(9): allow sx locks to be held across epoch_wait() The INVARIANTS checks in epoch_wait() were intended to prevent the block handler from returning with locks held. What it in fact did was preventing anything except Giant from being held across it. Check that the number of locks held has not changed instead. Approved by: sbruno@ END