diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2011-09-09 11:26:58 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-09-13 18:30:35 -0400 |
| commit | 97b7e3b6d4ae838694b43f66b4f0b32b5ec7635b (patch) | |
| tree | 7bb209faaea34e873a2648efaf3acb12919f7dfa | |
| parent | f459e4535904e16ca9f0cc202c78345c332bbbad (diff) | |
| download | linux-3.10-97b7e3b6d4ae838694b43f66b4f0b32b5ec7635b.tar.gz linux-3.10-97b7e3b6d4ae838694b43f66b4f0b32b5ec7635b.tar.bz2 linux-3.10-97b7e3b6d4ae838694b43f66b4f0b32b5ec7635b.zip | |
nfsd4: fix test_stateid for delegation stateid's
Test_stateid should handle delegation stateid's as well.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| -rw-r--r-- | fs/nfsd/nfs4state.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 24685a02690..30387f3d988 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3261,28 +3261,26 @@ static int is_delegation_stateid(stateid_t *stateid) __be32 nfs4_validate_stateid(stateid_t *stateid, bool has_session) { - struct nfs4_ol_stateid *stp = NULL; - __be32 status = nfserr_stale_stateid; + struct nfs4_stid *s; + struct nfs4_ol_stateid *ols; + __be32 status; if (STALE_STATEID(stateid)) - goto out; - - status = nfserr_expired; - stp = find_ol_stateid(stateid); - if (!stp) - goto out; - status = nfserr_bad_stateid; - if (stp->st_stateowner->so_is_open_owner - && !openowner(stp->st_stateowner)->oo_confirmed) - goto out; + return nfserr_stale_stateid; - status = check_stateid_generation(stateid, &stp->st_stid.sc_stateid, has_session); + s = find_stateid(stateid); + if (!s) + return nfserr_stale_stateid; + status = check_stateid_generation(stateid, &s->sc_stateid, has_session); if (status) - goto out; - - status = nfs_ok; -out: - return status; + return status; + if (!(s->sc_type & (NFS4_OPEN_STID | NFS4_LOCK_STID))) + return nfs_ok; + ols = openlockstateid(s); + if (ols->st_stateowner->so_is_open_owner + && !openowner(ols->st_stateowner)->oo_confirmed) + return nfserr_bad_stateid; + return nfs_ok; } /* |