diff options
| author |   Trond Myklebust <trond.myklebust@primarydata.com> | 2017-11-03 08:00:12 -0400 |
|---|---|---|
| committer |   J. Bruce Fields <bfields@redhat.com> | 2017-11-27 16:45:10 -0500 |
| commit | fb500a7cfee7f2f447d2bbf30cb59629feab6ac1 (patch) | |
| tree | 58c87dc6f4e66139a7f20f278cff9df85bed0dc4 /fs/nfsd/nfs4state.c | |
| parent | nfsd: Fix another OPEN stateid race (diff) | |
| download | linux-dev-fb500a7cfee7f2f447d2bbf30cb59629feab6ac1.tar.xz linux-dev-fb500a7cfee7f2f447d2bbf30cb59629feab6ac1.zip | |
nfsd: CLOSE SHOULD return the invalid special stateid for NFSv4.x (x>0)
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 457f0e7ece74..afc04b9784a0 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -63,6 +63,9 @@ static const stateid_t zero_stateid = { static const stateid_t currentstateid = { .si_generation = 1, }; +static const stateid_t close_stateid = { + .si_generation = 0xffffffffU, +}; static u64 current_sessionid = 1; @@ -5461,6 +5464,11 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, nfsd4_close_open_stateid(stp); mutex_unlock(&stp->st_mutex); + /* See RFC5661 sectionm 18.2.4 */ + if (stp->st_stid.sc_client->cl_minorversion) + memcpy(&close->cl_stateid, &close_stateid, + sizeof(close->cl_stateid)); + /* put reference from nfs4_preprocess_seqid_op */ nfs4_put_stid(&stp->st_stid); out: |