From bc6e77cf146f86b6cac3398776ecf89714476eff Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Mon, 10 Oct 2011 17:34:31 -0400 Subject: [PATCH] --- yaml --- r: 267183 b: refs/heads/master c: c30e92df30d7d5fe65262fbce5d1b7de675fe34e h: refs/heads/master i: 267181: e9a7dba388b70195ddbcd63681b8cb7b795498e2 267179: 3d4d3e75344c657984223335b5912ee2cacd0c31 267175: 4fd3bf12e602e0584aed3fae85c5e0ae5cd7fdf9 267167: 184ac332802f460fea051143c8624b04069b5178 v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4state.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0841459f2172..8ed16f46f2f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dcbf8c30344dfa01915c34f88318d464e116f004 +refs/heads/master: c30e92df30d7d5fe65262fbce5d1b7de675fe34e diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c index 683885b18ceb..a39a542d8be5 100644 --- a/trunk/fs/nfsd/nfs4state.c +++ b/trunk/fs/nfsd/nfs4state.c @@ -3574,6 +3574,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(); status = nfs4_preprocess_confirmed_seqid_op(cstate, od->od_seqid,