diff options
author | Weston Andros Adamson <dros@netapp.com> | 2013-08-05 15:47:07 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2013-08-07 12:06:07 -0400 |
commit | 58cd57bfd9db3bc213bf9d6a10920f82095f0114 (patch) | |
tree | 231ef9a0cc18f0b631e9a33e3e7a66d167fc6186 /fs/nfsd/nfs4proc.c | |
parent | c47205914cf5a8cf564ca560aa6eaa2287867e58 (diff) | |
download | kernel_goldelico_gta04-58cd57bfd9db3bc213bf9d6a10920f82095f0114.zip kernel_goldelico_gta04-58cd57bfd9db3bc213bf9d6a10920f82095f0114.tar.gz kernel_goldelico_gta04-58cd57bfd9db3bc213bf9d6a10920f82095f0114.tar.bz2 |
nfsd: Fix SP4_MACH_CRED negotiation in EXCHANGE_ID
- don't BUG_ON() when not SP4_NONE
- calculate recv and send reserve sizes correctly
Signed-off-by: Weston Andros Adamson <dros@netapp.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4proc.c')
-rw-r--r-- | fs/nfsd/nfs4proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 0d4c410..419572f 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1524,7 +1524,7 @@ static inline u32 nfsd4_write_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op) static inline u32 nfsd4_exchange_id_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op) { return (op_encode_hdr_size + 2 + 1 + /* eir_clientid, eir_sequenceid */\ - 1 + 1 + 0 + /* eir_flags, spr_how, SP4_NONE (for now) */\ + 1 + 1 + 2 + /* eir_flags, spr_how, spo_must_enforce & _allow */\ 2 + /*eir_server_owner.so_minor_id */\ /* eir_server_owner.so_major_id<> */\ XDR_QUADLEN(NFS4_OPAQUE_LIMIT) + 1 +\ |