---

yaml --- r: 267201 b: refs/heads/master c: c668fc6 h: refs/heads/master i: 267199: 510bdd3 v: v3
git-mirror · Oct 24, 2011 · 3f1e47f · 3f1e47f
1 parent 05c6c27
commit 3f1e47f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc0c3dd13bac0675cdedc4e0d0641aa8a22e82de
+refs/heads/master: c668fc6dfcce98f8222ce1c997f4e5c4ac63f3d0
diff --git a/trunk/fs/nfsd/nfs4xdr.c b/trunk/fs/nfsd/nfs4xdr.c
@@ -677,6 +677,8 @@ static __be32 nfsd4_decode_share_access(struct nfsd4_compoundargs *argp, u32 *x)
 	switch (w) {
 	case NFS4_SHARE_SIGNAL_DELEG_WHEN_RESRC_AVAIL:
 	case NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED:
+	case (NFS4_SHARE_SIGNAL_DELEG_WHEN_RESRC_AVAIL |
+	      NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED):
 		return nfs_ok;
 	}
 xdr_error: