From a03c26e9d71165be9eb6ec8c3a1fa0caa766f0ce Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Tue, 23 Aug 2011 15:17:50 -0400 Subject: [PATCH] --- yaml --- r: 267128 b: refs/heads/master c: 3cc9fda40a427aeb176bab898edca4e9a3ada524 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4state.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 76d88b10eb8c..0ed45a660cd2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b34f27aa5da75b0b6c054e76bb4b92aea7aac04b +refs/heads/master: 3cc9fda40a427aeb176bab898edca4e9a3ada524 diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c index d2bf80d8d85b..d2b637b717c3 100644 --- a/trunk/fs/nfsd/nfs4state.c +++ b/trunk/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))