提交 7323f0d2 编写于 作者: K Kinglong Mee 提交者: J. Bruce Fields

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: NKinglong Mee <kinglongmee@gmail.com>
Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
上级 2282cd2c
...@@ -1941,12 +1941,12 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) ...@@ -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) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册