Return-Path: linux-nfs-owner@vger.kernel.org Received: from fieldses.org ([174.143.236.118]:47394 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753264Ab3J2Py2 (ORCPT ); Tue, 29 Oct 2013 11:54:28 -0400 Date: Tue, 29 Oct 2013 11:54:27 -0400 To: Benny Halevy Cc: bfields@redhat.com, linux-nfs@vger.kernel.org Subject: Re: [PATCH 4/7] nfsd4: hash deleg stateid only on successful nfs4_set_delegation Message-ID: <20131029155427.GU31322@fieldses.org> References: <526F81DE.6060704@primarydata.com> <1383039561-27308-1-git-send-email-bhalevy@primarydata.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1383039561-27308-1-git-send-email-bhalevy@primarydata.com> From: "J. Bruce Fields" Sender: linux-nfs-owner@vger.kernel.org List-ID: On Tue, Oct 29, 2013 at 11:39:21AM +0200, Benny Halevy wrote: > We don't want the stateid to be found in the hash table before the delegation > is granted. With all this code and any find_stateid calls under the state lock, this isn't currently an issue, right? The changelog needs to make clear whether this is fixing a current bug or preparing to allow dropping of the state lock somewhere. If the latter, it needs to outline what the expected change is that we're preparing for. --b. > > Signed-off-by: Benny Halevy > --- > fs/nfsd/nfs4state.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index 405649f..64fcdd6 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -375,7 +375,6 @@ static struct nfs4_ol_stateid * nfs4_alloc_stateid(struct nfs4_client *clp) > dp = delegstateid(nfs4_alloc_stid(clp, deleg_slab)); > if (dp == NULL) > return dp; > - dp->dl_stid.sc_type = NFS4_DELEG_STID; > /* > * delegation seqid's are never incremented. The 4.1 special > * meaning of seqid 0 isn't meaningful, really, but let's avoid > @@ -3079,6 +3078,7 @@ static int nfs4_set_delegation(struct nfs4_delegation *dp, struct nfs4_file *fp) > atomic_inc(&fp->fi_delegees); > hash_delegation_locked(dp, fp); > spin_unlock(&recall_lock); > + dp->dl_stid.sc_type = NFS4_DELEG_STID; > return 0; > out_free: > put_nfs4_file(fp); > -- > 1.8.3.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-nfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html