summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2011-08-23 21:17:50 +0200
committerJ. Bruce Fields <bfields@redhat.com>2011-08-27 20:21:29 +0200
commit3cc9fda40a427aeb176bab898edca4e9a3ada524 (patch)
tree5edede4c34ab33d4ffeae3ab55b4e36908274865 /fs/nfsd
parentnfsd4: get lock checks out of preprocess_seqid_op (diff)
downloadlinux-3cc9fda40a427aeb176bab898edca4e9a3ada524.tar.xz
linux-3cc9fda40a427aeb176bab898edca4e9a3ada524.zip
nfsd4: remove redundant is_open_owner check
When called with OPEN_STATE, preprocess_seqid_op only returns an open stateid, hence only an open owner. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-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 d2bf80d8d85b..d2b637b717c3 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4017,8 +4017,6 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
goto out;
status = nfserr_bad_stateid;
open_sop = lock->lk_replay_owner;
- if (!open_sop->so_is_open_owner)
- goto out;
if (!nfsd4_has_session(cstate) &&
!same_clid(&open_sop->so_client->cl_clientid,
&lock->v.new.clientid))