projects
/
platform
/
kernel
/
linux-rpi3.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
24906f3
)
nfsd4: read size estimate should include padding
author
J. Bruce Fields
<bfields@redhat.com>
Fri, 16 May 2014 18:38:20 +0000
(14:38 -0400)
committer
J. Bruce Fields
<bfields@redhat.com>
Fri, 23 May 2014 13:03:42 +0000
(09:03 -0400)
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/nfs4proc.c
patch
|
blob
|
history
diff --git
a/fs/nfsd/nfs4proc.c
b/fs/nfsd/nfs4proc.c
index
2c1ee70
..
77c4369
100644
(file)
--- a/
fs/nfsd/nfs4proc.c
+++ b/
fs/nfsd/nfs4proc.c
@@
-1489,7
+1489,7
@@
static inline u32 nfsd4_read_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op)
if (rlen > maxcount)
rlen = maxcount;
- return (op_encode_hdr_size + 2
) * sizeof(__be32) + rlen
;
+ return (op_encode_hdr_size + 2
+ XDR_QUADLEN(rlen)) * sizeof(__be32)
;
}
static inline u32 nfsd4_readdir_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op)