From dbc1dbaec9984bbddb4b2ac54e9b3d92a8483f16 Mon Sep 17 00:00:00 2001
From: Andy Adamson <andros@netapp.com>
Date: Fri, 3 Apr 2009 08:28:56 +0300
Subject: [PATCH] --- yaml --- r: 142207 b: refs/heads/master c:
 84459a1162801fb84734e5f9e6dc5194f791d69b h: refs/heads/master i:   142205:
 8543a0c659fbe76376f30f037356ed17f4e14cf9   142203:
 92f905dc68e148d0995b714bfd123a3d1abae7b7   142199:
 c58f00f7f75eb4f4bd2a5728ab3d26f1ca46e32b   142191:
 4c2a247c444cbe68c35f316473425d8046e832c7   142175:
 9742489e29e5522683d5145d83672c4e7570c8a2   142143:
 d887655eaed3881faebb98f4b53735947857bc30   142079:
 6909a868339bdfc0fbc9a203d814d2e8de3455e5 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/nfsd/nfs4state.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4d937d878bc2..d5877e9132af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d87a8ade95288f28c729e076cd74929f3f199b6c
+refs/heads/master: 84459a1162801fb84734e5f9e6dc5194f791d69b
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
index 374aaf3808e8..c65a27b76a9d 100644
--- a/trunk/fs/nfsd/nfs4state.c
+++ b/trunk/fs/nfsd/nfs4state.c
@@ -1889,7 +1889,8 @@ init_stateid(struct nfs4_stateid *stp, struct nfs4_file *fp, struct nfsd4_open *
 	stp->st_stateid.si_generation = 0;
 	stp->st_access_bmap = 0;
 	stp->st_deny_bmap = 0;
-	__set_bit(open->op_share_access, &stp->st_access_bmap);
+	__set_bit(open->op_share_access & ~NFS4_SHARE_WANT_MASK,
+		  &stp->st_access_bmap);
 	__set_bit(open->op_share_deny, &stp->st_deny_bmap);
 	stp->st_openstp = NULL;
 }