diff options
| author | Benny Halevy <bhalevy@primarydata.com> | 2014-05-30 09:09:31 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-06-04 15:42:04 -0400 |
| commit | 3fb87d13ce29637e0ae005fa66a4f917cce6fede (patch) | |
| tree | c7f5736bc8beac637534dd42dfa5929e337fd61c /fs/nfsd/nfs4state.c | |
| parent | cdc975050077d707d5315e51c2b05a763d4895e5 (diff) | |
| download | linux-3fb87d13ce29637e0ae005fa66a4f917cce6fede.tar.gz linux-3fb87d13ce29637e0ae005fa66a4f917cce6fede.tar.bz2 linux-3fb87d13ce29637e0ae005fa66a4f917cce6fede.zip | |
nfsd4: hash deleg stateid only on successful nfs4_set_delegation
We don't want the stateid to be found in the hash table before the delegation
is granted.
Currently this is protected by the client_mutex, but we want to break that
up and this is a necessary step toward that goal.
Signed-off-by: Benny Halevy <bhalevy@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 63e764506bd2..e5197d947b9e 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -375,7 +375,6 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_ol_stateid *stp, struct sv 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 @@ -438,6 +437,7 @@ hash_delegation_locked(struct nfs4_delegation *dp, struct nfs4_file *fp) { lockdep_assert_held(&state_lock); + dp->dl_stid.sc_type = NFS4_DELEG_STID; list_add(&dp->dl_perfile, &fp->fi_delegations); list_add(&dp->dl_perclnt, &dp->dl_stid.sc_client->cl_delegations); } |