From: Tom Tucker <tom@opengridcomputing.com>
To: nfs@lists.sourceforge.net
Subject: [RFC,PATCH 01/20] svc: Add svc_sock_ops
Date: Tue, 10 Jul 2007 00:34:22 -0500 [thread overview]
Message-ID: <20070710053422.28979.37799.stgit@dell3.ogc.int> (raw)
In-Reply-To: <20070710052711.28979.70843.stgit@dell3.ogc.int>
Start moving to a transport switch for knfsd. Add a svc_sock_ops
operations vector and move the sk_sendto and sk_recvfrom function
pointers into it.
Signed-off-by: Greg Banks <gnb@melbourne.sgi.com>
Signed-off-by: Peter Leckie <pleckie@melbourne.sgi.com>
---
include/linux/sunrpc/svcsock.h | 9 +++++++--
net/sunrpc/svcsock.c | 22 ++++++++++++++++------
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index e21dd93..3c926b9 100644
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -11,6 +11,12 @@ #define SUNRPC_SVCSOCK_H
#include <linux/sunrpc/svc.h>
+struct svc_sock_ops {
+ const char *sko_name;
+ int (*sko_recvfrom)(struct svc_rqst *rqstp);
+ int (*sko_sendto)(struct svc_rqst *rqstp);
+};
+
/*
* RPC server socket.
*/
@@ -43,8 +49,7 @@ #define SK_DETACHED 10 /* detached fro
* be revisted */
struct mutex sk_mutex; /* to serialize sending data */
- int (*sk_recvfrom)(struct svc_rqst *rqstp);
- int (*sk_sendto)(struct svc_rqst *rqstp);
+ const struct svc_sock_ops *sk_ops;
/* We keep the old state_change and data_ready CB's here */
void (*sk_ostate)(struct sock *);
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 5baf48d..ce325f2 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -885,6 +885,12 @@ svc_udp_sendto(struct svc_rqst *rqstp)
return error;
}
+static const struct svc_sock_ops svc_udp_ops = {
+ .sko_name = "udp",
+ .sko_recvfrom = svc_udp_recvfrom,
+ .sko_sendto = svc_udp_sendto
+};
+
static void
svc_udp_init(struct svc_sock *svsk)
{
@@ -893,8 +899,7 @@ svc_udp_init(struct svc_sock *svsk)
svsk->sk_sk->sk_data_ready = svc_udp_data_ready;
svsk->sk_sk->sk_write_space = svc_write_space;
- svsk->sk_recvfrom = svc_udp_recvfrom;
- svsk->sk_sendto = svc_udp_sendto;
+ svsk->sk_ops = &svc_udp_ops;
/* initialise setting must have enough space to
* receive and respond to one request.
@@ -1322,14 +1327,19 @@ svc_tcp_sendto(struct svc_rqst *rqstp)
return sent;
}
+static const struct svc_sock_ops svc_tcp_ops = {
+ .sko_name = "tcp",
+ .sko_recvfrom = svc_tcp_recvfrom,
+ .sko_sendto = svc_tcp_sendto
+};
+
static void
svc_tcp_init(struct svc_sock *svsk)
{
struct sock *sk = svsk->sk_sk;
struct tcp_sock *tp = tcp_sk(sk);
- svsk->sk_recvfrom = svc_tcp_recvfrom;
- svsk->sk_sendto = svc_tcp_sendto;
+ svsk->sk_ops = &svc_tcp_ops;
if (sk->sk_state == TCP_LISTEN) {
dprintk("setting up TCP socket for listening\n");
@@ -1477,7 +1487,7 @@ svc_recv(struct svc_rqst *rqstp, long ti
dprintk("svc: server %p, pool %u, socket %p, inuse=%d\n",
rqstp, pool->sp_id, svsk, atomic_read(&svsk->sk_inuse));
- len = svsk->sk_recvfrom(rqstp);
+ len = svsk->sk_ops->sko_recvfrom(rqstp);
dprintk("svc: got len=%d\n", len);
/* No data, incomplete (TCP) read, or accept() */
@@ -1537,7 +1547,7 @@ svc_send(struct svc_rqst *rqstp)
if (test_bit(SK_DEAD, &svsk->sk_flags))
len = -ENOTCONN;
else
- len = svsk->sk_sendto(rqstp);
+ len = svsk->sk_ops->sko_sendto(rqstp);
mutex_unlock(&svsk->sk_mutex);
svc_sock_release(rqstp);
-------------------------------------------------------------------------
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
next prev 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 ` Tom Tucker [this message]
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 ` [RFC,PATCH 05/20] svc: svc_max_payload Tom Tucker
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=20070710053422.28979.37799.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.