nfsd4: remove redundant is_open_owner check
authorJ. Bruce Fields <bfields@redhat.com>
Tue, 23 Aug 2011 19:17:50 +0000 (15:17 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Sat, 27 Aug 2011 18:21:29 +0000 (14:21 -0400)
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>
fs/nfsd/nfs4state.c

index d2bf80d8d85b93b8f4d91dbff2658fb1ebf3f6e2..d2b637b717c3f617b774b8492bd5a611ff340e23 100644 (file)
@@ -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))