From 3f1e47f044e4fb2ce96dc0e291df1fb125d277a5 Mon Sep 17 00:00:00 2001
From: Benny Halevy <bhalevy@tonian.com>
Date: Wed, 19 Oct 2011 19:13:13 -0700
Subject: [PATCH] --- yaml --- r: 267201 b: refs/heads/master c:
 c668fc6dfcce98f8222ce1c997f4e5c4ac63f3d0 h: refs/heads/master i:   267199:
 510bdd3ade342ca0e559c01f64a23e526dfdafac v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nfsd/nfs4xdr.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b446d23d3780..ed5648fa8b9d 100644
--- 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
index fdc09a52cd8d..706ada1956c1 100644
--- 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: