Return-Path: linux-nfs-owner@vger.kernel.org Received: from mail-qa0-f41.google.com ([209.85.216.41]:56722 "EHLO mail-qa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934272AbaGPOdp (ORCPT ); Wed, 16 Jul 2014 10:33:45 -0400 Received: by mail-qa0-f41.google.com with SMTP id j7so781254qaq.0 for ; Wed, 16 Jul 2014 07:33:44 -0700 (PDT) From: Jeff Layton Date: Wed, 16 Jul 2014 10:33:43 -0400 To: bfields@fieldses.org Cc: hch@infradead.org, linux-nfs@vger.kernel.org Subject: Re: [PATCH v2 0/8] nfsd: more delegation fixes to prepare for client_mutex removal Message-ID: <20140716103343.76205f59@tlielax.poochiereds.net> In-Reply-To: <1405521125-2303-1-git-send-email-jlayton@primarydata.com> References: <1405521125-2303-1-git-send-email-jlayton@primarydata.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-nfs-owner@vger.kernel.org List-ID: On Wed, 16 Jul 2014 10:31:55 -0400 Jeff Layton wrote: > Here's a respin of the delegation fixes that I sent yesterday. The main > change is to move the remove_stid calls into the caller in the second > patch instead of keeping it in nfs4_free_stid, per Christoph's > suggestion. > > Unfortunately, that causes a pile of merge conflicts in the later > patches, so I need to resend the whole set. > > I also include the patch that converts the num_delegations counter to an > atomic_long_t, as I missed that in the earlier series. > > There is one more patch that fixes up handling of the cl_revoked list > that comes later, but it can't easily be moved here as it depends on > some locking changes that come later. > > Jeff Layton (6): > nfsd: eliminate nfsd4_init_callback > nfsd: Avoid taking state_lock while holding inode lock in > nfsd_break_one_deleg > nfsd: nfs4_alloc_init_lease should take a nfs4_file arg > locks: add file_has_lease to prevent delegation break races > nfsd: Protect the nfs4_file delegation fields using the fi_lock > nfsd: Fix delegation revocation > > Trond Myklebust (4): > nfsd: Ensure stateids remain unique until they are freed > nfsd: Move the delegation reference counter into the struct nfs4_stid > nfsd: Simplify stateid management > nfsd: Convert delegation counter to an atomic_long_t type > > fs/locks.c | 26 +++++++ > fs/nfsd/nfs4callback.c | 23 ++++-- > fs/nfsd/nfs4state.c | 197 +++++++++++++++++++++++++++++++------------------ > fs/nfsd/state.h | 7 +- > include/linux/fs.h | 6 ++ > 5 files changed, 179 insertions(+), 80 deletions(-) > Sorry...obviously the subject here should have read "0/10" and not "0/8". -- Jeff Layton