diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-05-16 11:36:42 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-05-16 11:36:42 +1000 |
commit | f3b943d8250be20874d5ae4190cb85da1b71ed4e (patch) | |
tree | 6c82099bc3e84db8836082eb5dbb6641bf66bc1c | |
parent | a7ec0d429fcc6edcf6c2b8fecc160dc1e026113a (diff) | |
parent | 4187505b88bf7eb04d82d1e89e4e19be7922da8c (diff) |
Merge commit 'nfsd/nfsd-next'
-rw-r--r-- | fs/nfsd/nfs4state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 8799b8708188..5c97d47676ae 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1579,8 +1579,8 @@ nfs4_upgrade_open(struct svc_rqst *rqstp, struct svc_fh *cur_fh, struct nfs4_sta } /* remember the open */ filp->f_mode |= open->op_share_access; - set_bit(open->op_share_access, &stp->st_access_bmap); - set_bit(open->op_share_deny, &stp->st_deny_bmap); + __set_bit(open->op_share_access, &stp->st_access_bmap); + __set_bit(open->op_share_deny, &stp->st_deny_bmap); return nfs_ok; } |