diff options
author | Tigran Mkrtchyan <kofemann@gmail.com> | 2012-02-13 16:55:31 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-02-15 11:20:44 -0500 |
commit | 9428fe1abb672c67169d3b6abf0faa120f020c32 (patch) | |
tree | a8f28e4b20a81656d71abfc9aef61976a10e2385 /fs/nfsd/nfs4state.c | |
parent | 1e97b5190d9538748cbf72c20a56b2c5cbd2f61d (diff) |
nfsd41: consume current stateid on DELEGRETURN and OPENDOWNGRADE
Signed-off-by: Tigran Mkrtchyan <kofemann@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
-rw-r--r-- | fs/nfsd/nfs4state.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 5258ac1f4cbd..7b0b6f0f69cb 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -4714,6 +4714,12 @@ put_stateid(struct nfsd4_compound_state *cstate, stateid_t *stateid) | |||
4714 | * functions to set current state id | 4714 | * functions to set current state id |
4715 | */ | 4715 | */ |
4716 | void | 4716 | void |
4717 | nfsd4_set_opendowngradestateid(struct nfsd4_compound_state *cstate, struct nfsd4_open_downgrade *odp) | ||
4718 | { | ||
4719 | put_stateid(cstate, &odp->od_stateid); | ||
4720 | } | ||
4721 | |||
4722 | void | ||
4717 | nfsd4_set_openstateid(struct nfsd4_compound_state *cstate, struct nfsd4_open *open) | 4723 | nfsd4_set_openstateid(struct nfsd4_compound_state *cstate, struct nfsd4_open *open) |
4718 | { | 4724 | { |
4719 | put_stateid(cstate, &open->op_stateid); | 4725 | put_stateid(cstate, &open->op_stateid); |
@@ -4736,6 +4742,18 @@ nfsd4_set_lockstateid(struct nfsd4_compound_state *cstate, struct nfsd4_lock *lo | |||
4736 | */ | 4742 | */ |
4737 | 4743 | ||
4738 | void | 4744 | void |
4745 | nfsd4_get_opendowngradestateid(struct nfsd4_compound_state *cstate, struct nfsd4_open_downgrade *odp) | ||
4746 | { | ||
4747 | get_stateid(cstate, &odp->od_stateid); | ||
4748 | } | ||
4749 | |||
4750 | void | ||
4751 | nfsd4_get_delegreturnstateid(struct nfsd4_compound_state *cstate, struct nfsd4_delegreturn *drp) | ||
4752 | { | ||
4753 | get_stateid(cstate, &drp->dr_stateid); | ||
4754 | } | ||
4755 | |||
4756 | void | ||
4739 | nfsd4_get_freestateid(struct nfsd4_compound_state *cstate, struct nfsd4_free_stateid *fsp) | 4757 | nfsd4_get_freestateid(struct nfsd4_compound_state *cstate, struct nfsd4_free_stateid *fsp) |
4740 | { | 4758 | { |
4741 | get_stateid(cstate, &fsp->fr_stateid); | 4759 | get_stateid(cstate, &fsp->fr_stateid); |