From: Andy Adamson <andros@netapp.com>
Date: Fri, 3 Apr 2009 05:28:56 +0000 (+0300)
Subject: nfsd41: add OPEN4_SHARE_ACCESS_WANT nfs4_stateid bmap
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=84459a1162801fb84734e5f9e6dc5194f791d69b;p=linux-2.6-omap-h63xx.git

nfsd41: add OPEN4_SHARE_ACCESS_WANT nfs4_stateid bmap

Separate the access bits from the want bits and enable __set_bit to
work correctly with st_access_bmap.

Signed-off-by: Andy Adamson<andros@netapp.com>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
---

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 374aaf3808e..c65a27b76a9 100644
--- a/fs/nfsd/nfs4state.c
+++ b/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;
 }