So after this series there are 5 callers of nfs4_lock_state() left, and I can't see any coherent scheme of what it still protects, but this: --- snip --- /* Currently used for almost all code touching nfsv4 state: */ static DEFINE_MUTEX(client_mutex); --- snip --- is clearly wrong. I'd suggest you go all the way and remove it entirely. -- 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