evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nfsd: Fix SP4_MACH_CRED negotiation in EXCHANGE_ID

Browse source 
- 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>
This commit is contained in:
Weston Andros Adamson 2013-08-05 15:47:07 -04:00 • committed by J. Bruce Fields
parent c47205914c
commit 58cd57bfd9
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/nfsd/nfs4proc.c
View file

@ -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) 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 */\ 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 */\ 2 + /*eir_server_owner.so_minor_id */\
/* eir_server_owner.so_major_id<> */\ /* eir_server_owner.so_major_id<> */\
XDR_QUADLEN(NFS4_OPAQUE_LIMIT) + 1 +\ XDR_QUADLEN(NFS4_OPAQUE_LIMIT) + 1 +\

5
fs/nfsd/nfs4xdr.c
View file

@ -3360,7 +3360,8 @@ nfsd4_encode_exchange_id(struct nfsd4_compoundres *resp, __be32 nfserr,
8 /* eir_clientid */ + 8 /* eir_clientid */ +
4 /* eir_sequenceid */ + 4 /* eir_sequenceid */ +
4 /* eir_flags */ + 4 /* eir_flags */ +
4 /* spr_how (SP4_NONE) */ + 4 /* spr_how */ +
8 /* spo_must_enforce, spo_must_allow */ +
8 /* so_minor_id */ + 8 /* so_minor_id */ +
4 /* so_major_id.len */ + 4 /* so_major_id.len */ +
(XDR_QUADLEN(major_id_sz) * 4) + (XDR_QUADLEN(major_id_sz) * 4) +
@ -3372,8 +3373,6 @@ nfsd4_encode_exchange_id(struct nfsd4_compoundres *resp, __be32 nfserr,
WRITE32(exid->seqid); WRITE32(exid->seqid);
WRITE32(exid->flags); WRITE32(exid->flags);
/* state_protect4_r. Currently only support SP4_NONE */
BUG_ON(exid->spa_how != SP4_NONE);
WRITE32(exid->spa_how); WRITE32(exid->spa_how);
switch (exid->spa_how) { switch (exid->spa_how) {
case SP4_NONE: case SP4_NONE: