All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tom Tucker <tom@opengridcomputing.com>
To: nfs@lists.sourceforge.net
Subject: [RFC,PATCH 05/20] svc: svc_max_payload
Date: Tue, 10 Jul 2007 00:34:30 -0500	[thread overview]
Message-ID: <20070710053430.28979.69319.stgit@dell3.ogc.int> (raw)
In-Reply-To: <20070710052711.28979.70843.stgit@dell3.ogc.int>


Store the svc_max_payload delegate in svc_sock_ops
instead of reaching into the socket (beause later the NFS/RDMA
transport will not even have a socket).

Signed-off-by: Greg Banks <gnb@melbourne.sgi.com>
Signed-off-by: Peter Leckie <pleckie@melbourne.sgi.com>
Signed-off-by: Tom Tucker <tom@opengridcomputing.com>
---

 include/linux/sunrpc/svcsock.h |    6 ++++++
 net/sunrpc/svc.c               |    5 ++---
 net/sunrpc/svcsock.c           |    6 ++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index e4f2936..ce93b10 100644
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -35,6 +35,12 @@ struct svc_sock_ops {
 	 * Return 1 if sufficient space to write reply to network.
 	 */
 	int			(*sko_has_wspace)(struct svc_sock *);
+	/*
+	 * Stores the largest payload (i.e. READ, WRITE or READDIR
+	 * data length not including NFS headers) supported by the
+	 * svc_sock.
+	 */
+	u32			sko_max_payload;
 };
 
 /*
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index f852587..eea0439 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1036,10 +1036,9 @@ err_bad:
  */
 u32 svc_max_payload(const struct svc_rqst *rqstp)
 {
-	int max = RPCSVC_MAXPAYLOAD_TCP;
+	struct svc_sock *svsk = rqstp->rq_sock;
+	int max = svsk->sk_ops->sko_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 a959824..1a6a933 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -896,7 +896,8 @@ static const struct svc_sock_ops svc_udp
 	.sko_sendto = svc_udp_sendto,
 	.sko_detach = svc_tcpip_detach,
 	.sko_free = svc_tcpip_free,
-	.sko_has_wspace = svc_udp_has_wspace
+	.sko_has_wspace = svc_udp_has_wspace,
+	.sko_max_payload = RPCSVC_MAXPAYLOAD_UDP
 };
 
 static void
@@ -1367,7 +1368,8 @@ static const struct svc_sock_ops svc_tcp
 	.sko_detach = svc_tcpip_detach,
 	.sko_free = svc_tcpip_free,
 	.sko_prep_reply_hdr = svc_tcp_prep_reply_hdr,
-	.sko_has_wspace = svc_tcp_has_wspace
+	.sko_has_wspace = svc_tcp_has_wspace,
+	.sko_max_payload = RPCSVC_MAXPAYLOAD_TCP
 };
 
 static void

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
NFS maillist  -  NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs

  parent reply	other threads:[~2007-07-10  5:34 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-10  5:27 [RFC,PATCH 00/20] svc: sunrpc server side transport switch Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 01/20] svc: Add svc_sock_ops Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 02/20] svc: sko_detach and sko_free Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 03/20] svc: svc_prep_reply_hdr Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 04/20] svc: sko_has_wspace Tom Tucker
2007-07-10  5:34 ` Tom Tucker [this message]
2007-07-10  5:34 ` [RFC, PATCH 06/20] svc: export svc_sock_enqueue, svc_sock_received Tom Tucker
2007-07-10 23:08   ` Trond Myklebust
2007-07-11  0:45     ` Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 07/20] svc: centralise close handling Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 08/20] svc: centralise accept handling Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 09/20] svc: Add SK_LISTENER sock flag Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 10/20] svc: Add generic refcount services Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 11/20] svc: cleanup svc_sock initialization Tom Tucker
2007-07-10  5:34 ` [RFC, PATCH 12/20] scv: Create transport neutral debug bit RPCDBG_SVCTRANS Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 13/20] svc: Add svc_[un]register_transport Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 14/20] svc: Register TCP/UDP Transports Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 15/20] svc: transport file implementation Tom Tucker
2007-07-10 23:30   ` Trond Myklebust
2007-07-10  5:34 ` [RFC,PATCH 16/20] svc: sko_create_svc Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 17/20] svc: Add sko_get_name service Tom Tucker
2007-07-10  5:34 ` [RFC,PATCH 18/20] svc: Add sko_defer routine Tom Tucker
2007-07-10  5:35 ` [RFC,PATCH 19/20] knfsd: call svc_create_svcsock Tom Tucker
2007-07-10 23:32   ` Trond Myklebust
2007-07-11  0:48     ` Tom Tucker
2007-07-11  0:59     ` Tom Tucker
2007-07-10  5:35 ` [RFC,PATCH 20/20] knfsd: create listener via portlist write Tom Tucker
2007-07-10 23:36   ` [RFC, PATCH " Trond Myklebust
2007-07-11  1:04     ` Tom Tucker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070710053430.28979.69319.stgit@dell3.ogc.int \
    --to=tom@opengridcomputing.com \
    --cc=nfs@lists.sourceforge.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.