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

Commit 49023155 authored by Tom Tucker's avatar Tom Tucker Committed by J. Bruce Fields
Browse files

svc: Add a max payload value to the transport 



The svc_max_payload function currently looks at the socket type
to determine the max payload. Add a max payload value to svc_xprt_class
so it can be returned directly.

Signed-off-by: default avatarTom Tucker <tom@opengridcomputing.com>
Acked-by: default avatarNeil Brown <neilb@suse.de>
Reviewed-by: default avatarChuck Lever <chuck.lever@oracle.com>
Reviewed-by: default avatarGreg Banks <gnb@sgi.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 9f29868b

include/linux/sunrpc/svc_xprt.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ struct svc_xprt_class { 
	struct module		*xcl_owner;

	struct svc_xprt_ops	*xcl_ops;

	struct list_head	xcl_list;

	u32			xcl_max_payload;

};



struct svc_xprt {

net/sunrpc/svc.c

+1 −3
Original line number Diff line number Diff line
@@ -1055,10 +1055,8 @@ svc_process(struct svc_rqst *rqstp) 
 */

u32 svc_max_payload(const struct svc_rqst *rqstp)

{

	int max = RPCSVC_MAXPAYLOAD_TCP;

	u32 max = rqstp->rq_xprt->xpt_class->xcl_max_payload;



	if (rqstp->rq_sock->sk_sock->type == SOCK_DGRAM)

		max = RPCSVC_MAXPAYLOAD_UDP;

	if (rqstp->rq_server->sv_max_payload < max)

		max = rqstp->rq_server->sv_max_payload;

	return max;

net/sunrpc/svcsock.c

+2 −0
Original line number Diff line number Diff line
@@ -906,6 +906,7 @@ static struct svc_xprt_ops svc_udp_ops = { 
static struct svc_xprt_class svc_udp_class = {

	.xcl_name = "udp",

	.xcl_ops = &svc_udp_ops,

	.xcl_max_payload = RPCSVC_MAXPAYLOAD_UDP,

};



static void
@@ -1359,6 +1360,7 @@ static struct svc_xprt_ops svc_tcp_ops = { 
static struct svc_xprt_class svc_tcp_class = {

	.xcl_name = "tcp",

	.xcl_ops = &svc_tcp_ops,

	.xcl_max_payload = RPCSVC_MAXPAYLOAD_TCP,

};



void svc_init_xprt_sock(void)