hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NFSD: Reserve adequate space for LOCKT operation 

After tightening the OP_LOCKT reply size estimate, we can get warnings
like:

[11512.783519] RPC request reserved 124 but used 152
[11512.813624] RPC request reserved 108 but used 136

Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Kinglong Mee 2017-02-03 22:51:46 +08:00 committed by J. Bruce Fields
parent 2282cd2c05
commit 7323f0d288
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/nfsd/nfs4xdr.c
View File

@ -1941,12 +1941,12 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp)
} else } else
max_reply += nfsd4_max_reply(argp->rqstp, op); max_reply += nfsd4_max_reply(argp->rqstp, op);
/* /*
* OP_LOCK may return a conflicting lock. (Special case * OP_LOCK and OP_LOCKT may return a conflicting lock.
* because it will just skip encoding this if it runs * (Special case because it will just skip encoding this
* out of xdr buffer space, and it is the only operation * if it runs out of xdr buffer space, and it is the only
* that behaves this way.) * operation that behaves this way.)
*/ */
if (op->opnum == OP_LOCK) if (op->opnum == OP_LOCK || op->opnum == OP_LOCKT)
max_reply += NFS4_OPAQUE_LIMIT; max_reply += NFS4_OPAQUE_LIMIT;
if (op->status) { if (op->status) {