aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2011-10-10 17:34:31 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-11 09:43:16 -0800
commit3a1f47cef0246bfcbd8719f2191754c3a7b86c0b (patch)
treeda69af79b888f48e447ed44916c3deb800dddc67 /fs
parent68251a1702ee17bd375a5b7907ce8794d7dadf6d (diff)
downloadlinux-linaro-precise-3a1f47cef0246bfcbd8719f2191754c3a7b86c0b.tar.gz
nfsd4: ignore WANT bits in open downgrade
commit c30e92df30d7d5fe65262fbce5d1b7de675fe34e upstream. We don't use WANT bits yet--and sending them can probably trigger a BUG() further down. Signed-off-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/nfs4state.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index cd2a43d4893..6f8bcc733f7 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -3570,6 +3570,8 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp,
if (!access_valid(od->od_share_access, cstate->minorversion)
|| !deny_valid(od->od_share_deny))
return nfserr_inval;
+ /* We don't yet support WANT bits: */
+ od->od_share_access &= NFS4_SHARE_ACCESS_MASK;
nfs4_lock_state();
if ((status = nfs4_preprocess_seqid_op(cstate,