This is a respin of the patch that I sent over the weekend. It's a bit more obvious to just call locks_delete_block from free_blocked_lock, and that allows us to remove that call from some other sites. Still though, I think we probably do want to wake blocked lock requests prior to sending a callback to ensure that they can make progress when the callback isn't getting a reply. The second patch does this. Jeff Layton (2): nfsd: wake waiters blocked on file_lock before deleting it nfsd: wake blocked file lock waiters before sending callback fs/nfsd/nfs4state.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -- 2.20.1