diff options
| author | Benny Halevy <bhalevy@tonian.com> | 2011-10-19 19:13:13 -0700 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-10-24 04:24:28 -0400 |
| commit | c668fc6dfcce98f8222ce1c997f4e5c4ac63f3d0 (patch) | |
| tree | 5e4b637fbe6e0a060fe9c22fe9167caec8b66d27 /fs/nfsd | |
| parent | fc0c3dd13bac0675cdedc4e0d0641aa8a22e82de (diff) | |
| download | linux-3.10-c668fc6dfcce98f8222ce1c997f4e5c4ac63f3d0.tar.gz linux-3.10-c668fc6dfcce98f8222ce1c997f4e5c4ac63f3d0.tar.bz2 linux-3.10-c668fc6dfcce98f8222ce1c997f4e5c4ac63f3d0.zip | |
nfsd4: allow NFS4_SHARE_SIGNAL_DELEG_WHEN_RESRC_AVAIL | NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED
RFC5661 says:
The client may set one or both of
OPEN4_SHARE_ACCESS_WANT_SIGNAL_DELEG_WHEN_RESRC_AVAIL and
OPEN4_SHARE_ACCESS_WANT_PUSH_DELEG_WHEN_UNCONTENDED.
Signed-off-by: Benny Halevy <bhalevy@tonian.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index fdc09a52cd8..706ada1956c 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/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: |