summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2012-03-30 15:46:21 +0200
committerJ. Bruce Fields <bfields@redhat.com>2012-04-11 23:54:58 +0200
commit03af42c59e5fc073fa93b7fe44e80161acb22772 (patch)
tree49223a7baa044ae615a3559075a8995dfb1befb0
parentnfsd: don't fail unchecked creates of non-special files (diff)
downloadlinux-03af42c59e5fc073fa93b7fe44e80161acb22772.tar.xz
linux-03af42c59e5fc073fa93b7fe44e80161acb22772.zip
nfsd: trivial: remove unused variable from nfsd4_lock
..."fp" is set but never used. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r--fs/nfsd/nfs4state.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 1841f8bf845e..a822e31de4f8 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4055,7 +4055,6 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
struct nfs4_openowner *open_sop = NULL;
struct nfs4_lockowner *lock_sop = NULL;
struct nfs4_ol_stateid *lock_stp;
- struct nfs4_file *fp;
struct file *filp = NULL;
struct file_lock file_lock;
struct file_lock conflock;
@@ -4123,7 +4122,6 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
goto out;
}
lock_sop = lockowner(lock_stp->st_stateowner);
- fp = lock_stp->st_file;
lkflg = setlkflg(lock->lk_type);
status = nfs4_check_openmode(lock_stp, lkflg);