From: Chuck Lever Subject: [PATCH 06/10] SUNRPC: Move the UDP socket bufsize parameters to a private data structure Date: Wed, 25 Oct 2006 12:47:11 -0400 Message-ID: <20061025164711.6410.10291.stgit@localhost.localdomain> References: <20061025164602.6410.27449.stgit@localhost.localdomain> Reply-To: Chuck Lever Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Cc: nfs@lists.sourceforge.net Return-path: Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.91] helo=mail.sourceforge.net) by sc8-sf-list2-new.sourceforge.net with esmtp (Exim 4.43) id 1GcrQl-0006UP-BZ for nfs@lists.sourceforge.net; Wed, 25 Oct 2006 15:41:03 -0700 Received: from rgminet01.oracle.com ([148.87.113.118]) by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256) (Exim 4.44) id 1GcrQm-0003iY-6I for nfs@lists.sourceforge.net; Wed, 25 Oct 2006 15:41:04 -0700 To: trond.myklebust@fys.uio.no In-Reply-To: <20061025164602.6410.27449.stgit@localhost.localdomain> List-Id: "Discussion of NFS under Linux development, interoperability, and testing." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: nfs-bounces@lists.sourceforge.net Errors-To: nfs-bounces@lists.sourceforge.net Move the socket-specific buffer size parameters for UDP sockets to a private data structure maintained in net/sunrpc/xprtsock.c. Signed-off-by: Chuck Lever --- include/linux/sunrpc/xprt.h | 3 --- net/sunrpc/xprtsock.c | 24 ++++++++++++++++-------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h index 18bf72c..21beb56 100644 --- a/include/linux/sunrpc/xprt.h +++ b/include/linux/sunrpc/xprt.h @@ -137,9 +137,6 @@ struct rpc_xprt { unsigned long cong; /* current congestion */ unsigned long cwnd; /* congestion window */ - size_t rcvsize, /* transport rcv buffer size */ - sndsize; /* transport send buffer size */ - size_t max_payload; /* largest RPC payload size, in bytes */ unsigned int tsh_size; /* size of transport specific diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 091b39a..b9b51b5 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -151,6 +151,12 @@ struct sock_xprt { */ struct work_struct connect_worker; unsigned short port; + + /* + * UDP socket buffer size parameters + */ + size_t rcvsize, + sndsize; }; /* @@ -1003,13 +1009,13 @@ static void xs_udp_do_set_buffer_size(st struct sock_xprt *sx = container_of(xprt, struct sock_xprt, xprt); struct sock *sk = sx->inet; - if (xprt->rcvsize) { + if (sx->rcvsize) { sk->sk_userlocks |= SOCK_RCVBUF_LOCK; - sk->sk_rcvbuf = xprt->rcvsize * xprt->max_reqs * 2; + sk->sk_rcvbuf = sx->rcvsize * xprt->max_reqs * 2; } - if (xprt->sndsize) { + if (sx->sndsize) { sk->sk_userlocks |= SOCK_SNDBUF_LOCK; - sk->sk_sndbuf = xprt->sndsize * xprt->max_reqs * 2; + sk->sk_sndbuf = sx->sndsize * xprt->max_reqs * 2; sk->sk_write_space(sk); } } @@ -1024,12 +1030,14 @@ static void xs_udp_do_set_buffer_size(st */ static void xs_udp_set_buffer_size(struct rpc_xprt *xprt, size_t sndsize, size_t rcvsize) { - xprt->sndsize = 0; + struct sock_xprt *sx = container_of(xprt, struct sock_xprt, xprt); + + sx->sndsize = 0; if (sndsize) - xprt->sndsize = sndsize + 1024; - xprt->rcvsize = 0; + sx->sndsize = sndsize + 1024; + sx->rcvsize = 0; if (rcvsize) - xprt->rcvsize = rcvsize + 1024; + sx->rcvsize = rcvsize + 1024; xs_udp_do_set_buffer_size(xprt); } ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ NFS maillist - NFS@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/nfs