diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2018-01-17 16:25:59 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2018-02-05 17:13:17 -0500 |
| commit | 2502072058b35e2297f4ad7b211a45ad95a6a3d5 (patch) | |
| tree | e8e0b8703113765b54f9f4f300c37bef809091f8 /fs | |
| parent | 4f1764172a0aa7395d12b96cae640ca1438c5085 (diff) | |
| download | op-kernel-dev-2502072058b35e2297f4ad7b211a45ad95a6a3d5.zip op-kernel-dev-2502072058b35e2297f4ad7b211a45ad95a6a3d5.tar.gz | |
nfsd4: don't set lock stateid's sc_type to CLOSED
There's no point I can see to
stp->st_stid.sc_type = NFS4_CLOSED_STID;
given release_lock_stateid immediately sets sc_type to 0.
That set of sc_type to 0 should be enough to prevent it being used where
we don't want it to be; NFS4_CLOSED_STID should only be needed for
actual open stateid's that are actually closed.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 5a75135..150521c 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -5183,7 +5183,6 @@ nfsd4_free_lock_stateid(stateid_t *stateid, struct nfs4_stid *s) lockowner(stp->st_stateowner))) goto out; - stp->st_stid.sc_type = NFS4_CLOSED_STID; release_lock_stateid(stp); ret = nfs_ok; @@ -6079,10 +6078,8 @@ out: * If this is a new, never-before-used stateid, and we are * returning an error, then just go ahead and release it. */ - if (status && new) { - lock_stp->st_stid.sc_type = NFS4_CLOSED_STID; + if (status && new) release_lock_stateid(lock_stp); - } mutex_unlock(&lock_stp->st_mutex); |
