Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7323f0d2 authored by Kinglong Mee's avatar Kinglong Mee Committed by J. Bruce Fields
Browse files

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: default avatarKinglong Mee <kinglongmee@gmail.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 2282cd2c

fs/nfsd/nfs4xdr.c

+5 −5
Original line number Diff line number Diff line
@@ -1941,12 +1941,12 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) 
		} else

			max_reply += nfsd4_max_reply(argp->rqstp, op);

		/*

		 * OP_LOCK may return a conflicting lock.  (Special case

		 * because it will just skip encoding this if it runs

		 * out of xdr buffer space, and it is the only operation

		 * that behaves this way.)

		 * OP_LOCK and OP_LOCKT may return a conflicting lock.

		 * (Special case because it will just skip encoding this

		 * if it runs out of xdr buffer space, and it is the only

		 * operation that behaves this way.)

		 */

		if (op->opnum == OP_LOCK)

		if (op->opnum == OP_LOCK || op->opnum == OP_LOCKT)

			max_reply += NFS4_OPAQUE_LIMIT;



		if (op->status) {