Home » Mailing list archives » linux-nfs » 2007 » December » 11

[PATCH 04/38] svc: Add a max payload value to the transport

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Tom Tucker <tom@...>
To: <bfields@...>
Cc: <neilb@...>, <linux-nfs@...>
Subject: [PATCH 04/38] svc: Add a max payload value to the transport
Date: Tuesday, December 11, 2007 - 7:32 pm

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: Tom Tucker <tom@opengridcomputing.com>
---

 include/linux/sunrpc/svc_xprt.h |    1 +
 net/sunrpc/svc.c                |    4 +---
 net/sunrpc/svcsock.c            |    2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index a8b1da8..b4ce054 100644
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -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 {
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index a4a6bf7..ea3fa86 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1054,10 +1054,8 @@ err_bad:
  */
 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;
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 4755467..ca9b8d8 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -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)
-
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 00/38] svc: SVC Transport Switch, Tom Tucker, (Tue Dec 11, 7:31 pm)
[PATCH 33/38] svc: Move the xprt independent code to the svc..., Tom Tucker, (Tue Dec 11, 7:33 pm)
[PATCH 32/38] svc: Make svc_check_conn_limits xprt independent, Tom Tucker, (Tue Dec 11, 7:33 pm)
[PATCH 36/38] svc: Add svc API that queries for a transport ..., Tom Tucker, (Tue Dec 11, 7:33 pm)
[PATCH 35/38] svc: Add /proc/sys/sunrpc/transport files, Tom Tucker, (Tue Dec 11, 7:33 pm)
[PATCH 38/38] svc: Add svc_xprt_names service to replace svc..., Tom Tucker, (Tue Dec 11, 7:33 pm)
Re: [PATCH 38/38] svc: Add svc_xprt_names service to replace..., J. Bruce Fields, (Fri Dec 14, 8:03 pm)
[PATCH 37/38] knfsd: Support adding transports by writing po..., Tom Tucker, (Tue Dec 11, 7:33 pm)
[PATCH 34/38] svc: Add transport hdr size for defer/revisit, Tom Tucker, (Tue Dec 11, 7:33 pm)
[PATCH 31/38] svc: Removing remaining references to rq_sock ..., Tom Tucker, (Tue Dec 11, 7:33 pm)
Re: [PATCH 34/38] svc: Add transport hdr size for defer/revi..., J. Bruce Fields, (Fri Dec 14, 7:37 pm)
Re: [PATCH 34/38] svc: Add transport hdr size for defer/revi..., Tom Tucker, (Sat Dec 15, 2:16 pm)
[PATCH 30/38] svc: Move common create logic to common code, Tom Tucker, (Tue Dec 11, 7:33 pm)
Re: [PATCH 30/38] svc: Move common create logic to common code, J. Bruce Fields, (Fri Dec 14, 7:19 pm)
Re: [PATCH 30/38] svc: Move common create logic to common code, Tom Tucker, (Sat Dec 15, 6:14 pm)
[PATCH 29/38] svc: Make svc_age_temp_sockets svc_age_temp_tr..., Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 28/38] svc: Make svc_recv transport neutral, Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 27/38] svc: Make svc_sock_release svc_xprt_release, Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 26/38] svc: Move the sockaddr information to svc_xprt, Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 25/38] svc: Make deferral processing xprt independent, Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 23/38] svc: Remove sk_lastrecv, Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 24/38] svc: Move the authinfo cache to svc_xprt., Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 21/38] svc: Change svc_sock_received to svc_xprt_rece..., Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 14/38] svc: Change sk_inuse to a kref, Tom Tucker, (Tue Dec 11, 7:32 pm)
Re: [PATCH 14/38] svc: Change sk_inuse to a kref, J. Bruce Fields, (Fri Dec 14, 4:52 pm)
[PATCH 22/38] svc: Move accept call to svc_xprt_received to ..., Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 19/38] svc: Make the enqueue service transport neutra..., Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 15/38] svc: Move sk_flags to the svc_xprt structure, Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 16/38] svc: Move sk_server and sk_pool to svc_xprt, Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 20/38] svc: Make svc_send transport neutral, Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 17/38] svc: Make close transport independent, Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 18/38] svc: Move sk_reserved to svc_xprt, Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 12/38] svc: Add a generic transport svc_create_xprt f..., Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 13/38] svc: Change services to use new svc_create_xpr..., Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 11/38] svc: Add xpo_accept transport function, Tom Tucker, (Tue Dec 11, 7:32 pm)
Re: [PATCH 11/38] svc: Add xpo_accept transport function, J. Bruce Fields, (Fri Dec 14, 3:55 pm)
Re: [PATCH 11/38] svc: Add xpo_accept transport function, Tom Tucker, (Sat Dec 15, 1:22 am)
Re: [PATCH 11/38] svc: Add xpo_accept transport function, J. Bruce Fields, (Fri Dec 14, 3:01 pm)
Re: [PATCH 11/38] svc: Add xpo_accept transport function, Tom Tucker, (Fri Dec 14, 3:14 pm)
[PATCH 10/38] svc: Move close processing to a single place, Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 09/38] svc: Add a transport function that checks for ..., Tom Tucker, (Tue Dec 11, 7:32 pm)
Re: [PATCH 09/38] svc: Add a transport function that checks ..., Chuck Lever, (Wed Dec 12, 2:10 pm)
Re: [PATCH 09/38] svc: Add a transport function that checks ..., J. Bruce Fields, (Thu Dec 13, 5:33 pm)
Re: [PATCH 09/38] svc: Add a transport function that checks ..., Chuck Lever, (Thu Dec 13, 5:45 pm)
Re: [PATCH 09/38] svc: Add a transport function that checks ..., Tom Tucker, (Thu Dec 13, 6:20 pm)
Re: [PATCH 09/38] svc: Add a transport function that checks ..., Chuck Lever, (Fri Dec 14, 10:27 am)
Re: [PATCH 09/38] svc: Add a transport function that checks ..., J. Bruce Fields, (Thu Dec 13, 6:28 pm)
Re: [PATCH 09/38] svc: Add a transport function that checks ..., Chuck Lever, (Fri Dec 14, 9:59 am)
Re: [PATCH 09/38] svc: Add a transport function that checks ..., Tom Tucker, (Wed Dec 12, 4:00 pm)
[PATCH 08/38] svc: Add xpo_prep_reply_hdr, Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 07/38] svc: Add per-transport delete functions, Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 06/38] svc: Add transport specific xpo_release function, Tom Tucker, (Tue Dec 11, 7:32 pm)
Re: [PATCH 06/38] svc: Add transport specific xpo_release fu..., J. Bruce Fields, (Thu Dec 13, 3:31 pm)
[PATCH 05/38] svc: Move sk_sendto and sk_recvfrom to svc_xpr..., Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 04/38] svc: Add a max payload value to the transport, Tom Tucker, (Tue Dec 11, 7:32 pm)
[PATCH 03/38] svc: Change the svc_sock in the rqstp structur..., Tom Tucker, (Tue Dec 11, 7:31 pm)
[PATCH 02/38] svc: Make svc_sock the tcp/udp transport, Tom Tucker, (Tue Dec 11, 7:31 pm)
Re: [PATCH 02/38] svc: Make svc_sock the tcp/udp transport, J. Bruce Fields, (Thu Dec 13, 3:01 pm)
[PATCH 01/38] svc: Add an svc transport class, Tom Tucker, (Tue Dec 11, 7:31 pm)
Re: [PATCH 01/38] svc: Add an svc transport class, J. Bruce Fields, (Thu Dec 13, 2:45 pm)