lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nfsd4: assume test_stateid always has session

Browse Source 
Test_stateid is 4.1-only and only allowed after a sequence operation, so
this check is unnecessary.

Cc: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields
2011-09-26 12:53:00 -04:00
parent 6136d2b409
commit 36279ac10c
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfsd/nfs4state.c
View File

@ -3256,7 +3256,7 @@ static int check_stateid_generation(stateid_t *in, stateid_t *ref, bool has_sess
return nfserr_old_stateid;
}
__be32 nfs4_validate_stateid(stateid_t *stateid, bool has_session)
__be32 nfs4_validate_stateid(stateid_t *stateid)
{
struct nfs4_stid *s;
struct nfs4_ol_stateid *ols;
@ -3268,7 +3268,7 @@ __be32 nfs4_validate_stateid(stateid_t *stateid, bool has_session)
s = find_stateid(stateid);
if (!s)
return nfserr_stale_stateid;
status = check_stateid_generation(stateid, &s->sc_stateid, has_session);
status = check_stateid_generation(stateid, &s->sc_stateid, 1);
if (status)
return status;
if (!(s->sc_type & (NFS4_OPEN_STID | NFS4_LOCK_STID)))
@ -3374,7 +3374,7 @@ __be32
nfsd4_test_stateid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
struct nfsd4_test_stateid *test_stateid)
{
test_stateid->ts_has_session = nfsd4_has_session(cstate);
/* real work is done during encoding */
return nfs_ok;
}