[PATCH] knfsd: nfsd4: move replay_owner to cstate

Tuck away the replay_owner in the cstate while we're at it.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 10 insertions, 12 deletions

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index f0a994e3b2c5..db701c47a342 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2242,8 +2242,7 @@ check_replay:
 
 __be32
 nfsd4_open_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
-                   struct nfsd4_open_confirm *oc,
-                   struct nfs4_stateowner **replay_owner)
+                   struct nfsd4_open_confirm *oc)
 {
         __be32 status;
         struct nfs4_stateowner *sop;
@@ -2280,7 +2279,7 @@ nfsd4_open_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 out:
         if (oc->oc_stateowner) {
                 nfs4_get_stateowner(oc->oc_stateowner);
-                *replay_owner = oc->oc_stateowner;
+                cstate->replay_owner = oc->oc_stateowner;
         }
         nfs4_unlock_state();
         return status;
@@ -2314,8 +2313,7 @@ reset_union_bmap_deny(unsigned long deny, unsigned long *bmap)
 __be32
 nfsd4_open_downgrade(struct svc_rqst *rqstp,
                      struct nfsd4_compound_state *cstate,
-                     struct nfsd4_open_downgrade *od,
-                     struct nfs4_stateowner **replay_owner)
+                     struct nfsd4_open_downgrade *od)
 {
         __be32 status;
         struct nfs4_stateid *stp;
@@ -2361,7 +2359,7 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp,
 out:
         if (od->od_stateowner) {
                 nfs4_get_stateowner(od->od_stateowner);
-                *replay_owner = od->od_stateowner;
+                cstate->replay_owner = od->od_stateowner;
         }
         nfs4_unlock_state();
         return status;
@@ -2372,7 +2370,7 @@ out:
  */
 __be32
 nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
-            struct nfsd4_close *close, struct nfs4_stateowner **replay_owner)
+            struct nfsd4_close *close)
 {
         __be32 status;
         struct nfs4_stateid *stp;
@@ -2405,7 +2403,7 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 out:
         if (close->cl_stateowner) {
                 nfs4_get_stateowner(close->cl_stateowner);
-                *replay_owner = close->cl_stateowner;
+                cstate->replay_owner = close->cl_stateowner;
         }
         nfs4_unlock_state();
         return status;
@@ -2646,7 +2644,7 @@ check_lock_length(u64 offset, u64 length)
  */
 __be32
 nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
-           struct nfsd4_lock *lock, struct nfs4_stateowner **replay_owner)
+           struct nfsd4_lock *lock)
 {
         struct nfs4_stateowner *open_sop = NULL;
         struct nfs4_stateowner *lock_sop = NULL;
@@ -2796,7 +2794,7 @@ out:
                 release_stateowner(lock_sop);
         if (lock->lk_replay_owner) {
                 nfs4_get_stateowner(lock->lk_replay_owner);
-                *replay_owner = lock->lk_replay_owner;
+                cstate->replay_owner = lock->lk_replay_owner;
         }
         nfs4_unlock_state();
         return status;
@@ -2888,7 +2886,7 @@ out:
 
 __be32
 nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
-            struct nfsd4_locku *locku, struct nfs4_stateowner **replay_owner)
+            struct nfsd4_locku *locku)
 {
         struct nfs4_stateid *stp;
         struct file *filp = NULL;
@@ -2946,7 +2944,7 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 out:
         if (locku->lu_stateowner) {
                 nfs4_get_stateowner(locku->lu_stateowner);
-                *replay_owner = locku->lu_stateowner;
+                cstate->replay_owner = locku->lu_stateowner;
         }
         nfs4_unlock_state();
         return status;