v3: - use alternate method for checking for delegation break races after getting a lease (just check fi_had_conflict instead) - drop file_has_lease patch -- no longer needed - move cl_revoked handling patch into this set. It means altering a few of the later patches, but it keeps the set more topically coherent v2: - move remove_stid call from nfs4_free_stid and into callers Here's a respin of the delegation fixes that Bruce hasn't yet merged into his nfsd-next branch. I think this should address most of the review comments so far. I'm still not 100% thrilled with the delegation handling as a whole, but I think it's getting a bit tighter now. I tend to think that we'll need to rework this at some point in the future (and maybe the generic lease code as well). I'd prefer to wait until after the rest of the scalability work is complete before doing that if possible though. Jeff Layton (3): nfsd: Protect the nfs4_file delegation fields using the fi_lock nfsd: Fix delegation revocation nfsd: ensure that clp->cl_revoked list is protected by clp->cl_lock Trond Myklebust (3): nfsd: Move the delegation reference counter into the struct nfs4_stid nfsd: simplify stateid allocation and file handling nfsd: Convert delegation counter to an atomic_long_t type fs/nfsd/nfs4state.c | 148 +++++++++++++++++++++++++++++++++------------------- fs/nfsd/state.h | 2 +- 2 files changed, 96 insertions(+), 54 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
