[PATCH] kNFSd: When looking for a shareowner in the nfsd open, make sure we don't...

From: NeilBrown <neilb@cse.unsw.edu.au>

When looking for a shareowner in the nfsd open, make sure we don't get a
lockowner instead.

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 87f86ed7a7bfbe79f6c3aeb2bb78d8642abfb2d3..70c2b1a9e4e5050ba18c34f9a1b4c1e6c1808073 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1120,6 +1120,9 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
                                stp = stq;
                                continue;
                        }
+                       /* ignore lock owners */
+                       if (stq->st_stateowner->so_is_open_owner == 0)
+                               continue;
                        if (!test_share(stq,open))      
                                goto out;
                }