Commit 77340644 authored by Neil Brown's avatar Neil Brown Committed by Linus Torvalds

[PATCH] nfsd4: fix_release_state_owner prototype

Note that the second parameter is unused.
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fb1e8963
...@@ -1186,8 +1186,7 @@ move_to_close_lru(struct nfs4_stateowner *sop) ...@@ -1186,8 +1186,7 @@ move_to_close_lru(struct nfs4_stateowner *sop)
} }
void void
release_state_owner(struct nfs4_stateid *stp, struct nfs4_stateowner **sopp, release_state_owner(struct nfs4_stateid *stp, int flag)
int flag)
{ {
struct nfs4_stateowner *sop = stp->st_stateowner; struct nfs4_stateowner *sop = stp->st_stateowner;
struct nfs4_file *fp = stp->st_file; struct nfs4_file *fp = stp->st_file;
...@@ -2337,7 +2336,7 @@ nfsd4_close(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_clos ...@@ -2337,7 +2336,7 @@ nfsd4_close(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_clos
memcpy(&close->cl_stateid, &stp->st_stateid, sizeof(stateid_t)); memcpy(&close->cl_stateid, &stp->st_stateid, sizeof(stateid_t));
/* release_state_owner() calls nfsd_close() if needed */ /* release_state_owner() calls nfsd_close() if needed */
release_state_owner(stp, &close->cl_stateowner, OPEN_STATE); release_state_owner(stp, OPEN_STATE);
out: out:
if (close->cl_stateowner) if (close->cl_stateowner)
nfs4_get_stateowner(close->cl_stateowner); nfs4_get_stateowner(close->cl_stateowner);
...@@ -2780,7 +2779,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock ...@@ -2780,7 +2779,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
if (!seqid_mutating_err(status)) if (!seqid_mutating_err(status))
open_sop->so_seqid--; open_sop->so_seqid--;
release_state_owner(lock_stp, &lock->lk_stateowner, LOCK_STATE); release_state_owner(lock_stp, LOCK_STATE);
} }
out: out:
if (lock->lk_stateowner) if (lock->lk_stateowner)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment