From: J. Bruce Fields <bfields@redhat.com>
Date: Tue, 23 Aug 2011 19:17:50 +0000 (-0400)
Subject: nfsd4: remove redundant is_open_owner check
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3cc9fda40a427aeb176bab898edca4e9a3ada524;p=deliverable%2Flinux.git

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>
---

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))