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 <bhalevy@xxxxxxxxxxxxxxx> > --- > 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@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- 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
