In the interest of pushing this series out in smaller pieces, these two patches clean up the delegation break callback. The basic idea here is to avoid taking the state_lock while holding the i_lock, as it's a highly contended global lock. Jeff Layton (2): nfsd: eliminate nfsd4_init_callback nfsd: Avoid taking state_lock while holding inode lock in nfsd_break_one_deleg fs/nfsd/nfs4callback.c | 23 +++++++++++++++----- fs/nfsd/nfs4state.c | 58 +++++++++++++++++++++++++++++++++----------------- fs/nfsd/state.h | 4 +++- 3 files changed, 59 insertions(+), 26 deletions(-) -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html