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

[PATCH 21/38] svc: Change svc_sock_received to svc_xprt_received and export it

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Tom Tucker
Subject: [PATCH 21/38] svc: Change svc_sock_received to svc_xprt_received and export it
Date: Tuesday, December 11, 2007 - 4:32 pm

All fields touched by svc_sock_received are now transport independent.
Change it to use svc_xprt directly. This function is called from
transport dependent code, so export it. 

Signed-off-by: Tom Tucker <tom@opengridcomputing.com>
---

 include/linux/sunrpc/svc_xprt.h |    2 +-
 net/sunrpc/svcsock.c            |   35 +++++++++++++++++------------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index d5ef902..c416d05 100644
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -62,8 +62,8 @@ int	svc_unreg_xprt_class(struct svc_xprt_class *);
 void	svc_xprt_init(struct svc_xprt_class *, struct svc_xprt *,
 		      struct svc_serv *);
 int	svc_create_xprt(struct svc_serv *, char *, unsigned short, int);
+void	svc_xprt_received(struct svc_xprt *);
 void	svc_xprt_put(struct svc_xprt *xprt);
-
 static inline void svc_xprt_get(struct svc_xprt *xprt)
 {
 	kref_get(&xprt->xpt_ref);
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index d546709..d8d88c1 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -330,14 +330,13 @@ svc_sock_dequeue(struct svc_pool *pool)
  * Note: XPT_DATA only gets cleared when a read-attempt finds
  * no (or insufficient) data.
  */
-static inline void
-svc_sock_received(struct svc_sock *svsk)
+void svc_xprt_received(struct svc_xprt *xprt)
 {
-	svsk->sk_xprt.xpt_pool = NULL;
-	clear_bit(XPT_BUSY, &svsk->sk_xprt.xpt_flags);
-	svc_xprt_enqueue(&svsk->sk_xprt);
+	xprt->xpt_pool = NULL;
+	clear_bit(XPT_BUSY, &xprt->xpt_flags);
+	svc_xprt_enqueue(xprt);
 }
-
+EXPORT_SYMBOL_GPL(svc_xprt_received);
 
 /**
  * svc_reserve - change the space reserved for the reply to a request.
@@ -766,7 +765,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)
 				(serv->sv_nrthreads+3) * serv->sv_max_mesg);
 
 	if ((rqstp->rq_deferred = svc_deferred_dequeue(svsk))) {
-		svc_sock_received(svsk);
+		svc_xprt_received(&svsk->sk_xprt);
 		return svc_deferred_recv(rqstp);
 	}
 
@@ -783,7 +782,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)
 			dprintk("svc: recvfrom returned error %d\n", -err);
 			set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags);
 		}
-		svc_sock_received(svsk);
+		svc_xprt_received(&svsk->sk_xprt);
 		return -EAGAIN;
 	}
 	rqstp->rq_addrlen = sizeof(rqstp->rq_addr);
@@ -798,7 +797,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)
 	/*
 	 * Maybe more packets - kick another thread ASAP.
 	 */
-	svc_sock_received(svsk);
+	svc_xprt_received(&svsk->sk_xprt);
 
 	len  = skb->len - sizeof(struct udphdr);
 	rqstp->rq_arg.len = len;
@@ -1104,7 +1103,7 @@ static struct svc_xprt *svc_tcp_accept(struct svc_xprt *xprt)
 	}
 	memcpy(&newsvsk->sk_local, sin, slen);
 
-	svc_sock_received(newsvsk);
+	svc_xprt_received(&newsvsk->sk_xprt);
 
 	if (serv->sv_stats)
 		serv->sv_stats->nettcpconn++;
@@ -1134,7 +1133,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)
 		test_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags));
 
 	if ((rqstp->rq_deferred = svc_deferred_dequeue(svsk))) {
-		svc_sock_received(svsk);
+		svc_xprt_received(&svsk->sk_xprt);
 		return svc_deferred_recv(rqstp);
 	}
 
@@ -1174,7 +1173,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)
 		if (len < want) {
 			dprintk("svc: short recvfrom while reading record length (%d of %lu)\n",
 				len, want);
-			svc_sock_received(svsk);
+			svc_xprt_received(&svsk->sk_xprt);
 			return -EAGAIN; /* record header not complete */
 		}
 
@@ -1210,7 +1209,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)
 	if (len < svsk->sk_reclen) {
 		dprintk("svc: incomplete TCP record (%d of %d)\n",
 			len, svsk->sk_reclen);
-		svc_sock_received(svsk);
+		svc_xprt_received(&svsk->sk_xprt);
 		return -EAGAIN;	/* record not complete */
 	}
 	len = svsk->sk_reclen;
@@ -1250,7 +1249,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)
 	svsk->sk_reclen = 0;
 	svsk->sk_tcplen = 0;
 
-	svc_sock_received(svsk);
+	svc_xprt_received(&svsk->sk_xprt);
 	if (serv->sv_stats)
 		serv->sv_stats->nettcpcnt++;
 
@@ -1263,7 +1262,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)
  error:
 	if (len == -EAGAIN) {
 		dprintk("RPC: TCP recvfrom got EAGAIN\n");
-		svc_sock_received(svsk);
+		svc_xprt_received(&svsk->sk_xprt);
 	} else {
 		printk(KERN_NOTICE "%s: recvfrom returned errno %d\n",
 		       svsk->sk_xprt.xpt_server->sv_name, -len);
@@ -1595,7 +1594,7 @@ svc_recv(struct svc_rqst *rqstp, long timeout)
 			__module_get(newxpt->xpt_class->xcl_owner);
 			svc_check_conn_limits(svsk->sk_xprt.xpt_server);
 		}
-		svc_sock_received(svsk);
+		svc_xprt_received(&svsk->sk_xprt);
 	} else {
 		dprintk("svc: server %p, pool %u, socket %p, inuse=%d\n",
 			rqstp, pool->sp_id, svsk,
@@ -1814,7 +1813,7 @@ int svc_addsock(struct svc_serv *serv,
 	else {
 		svsk = svc_setup_socket(serv, so, &err, SVC_SOCK_DEFAULTS);
 		if (svsk) {
-			svc_sock_received(svsk);
+			svc_xprt_received(&svsk->sk_xprt);
 			err = 0;
 		}
 	}
@@ -1870,7 +1869,7 @@ static struct svc_xprt *svc_create_socket(struct svc_serv *serv,
 	}
 
 	if ((svsk = svc_setup_socket(serv, sock, &error, flags)) != NULL) {
-		svc_sock_received(svsk);
+		svc_xprt_received(&svsk->sk_xprt);
 		return (struct svc_xprt *)svsk;
 	}
 
-
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, 4:31 pm)
[PATCH 01/38] svc: Add an svc transport class, Tom Tucker, (Tue Dec 11, 4:31 pm)
[PATCH 02/38] svc: Make svc_sock the tcp/udp transport, Tom Tucker, (Tue Dec 11, 4:31 pm)
[PATCH 03/38] svc: Change the svc_sock in the rqstp struct ..., Tom Tucker, (Tue Dec 11, 4:31 pm)
[PATCH 04/38] svc: Add a max payload value to the transport, Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 05/38] svc: Move sk_sendto and sk_recvfrom to svc_x ..., Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 06/38] svc: Add transport specific xpo_release function, Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 07/38] svc: Add per-transport delete functions, Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 08/38] svc: Add xpo_prep_reply_hdr, Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 09/38] svc: Add a transport function that checks fo ..., Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 10/38] svc: Move close processing to a single place, Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 11/38] svc: Add xpo_accept transport function, Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 12/38] svc: Add a generic transport svc_create_xprt ..., Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 13/38] svc: Change services to use new svc_create_x ..., Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 14/38] svc: Change sk_inuse to a kref, Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 15/38] svc: Move sk_flags to the svc_xprt structure, Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 16/38] svc: Move sk_server and sk_pool to svc_xprt, Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 17/38] svc: Make close transport independent, Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 18/38] svc: Move sk_reserved to svc_xprt, Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 19/38] svc: Make the enqueue service transport neut ..., Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 20/38] svc: Make svc_send transport neutral, Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 21/38] svc: Change svc_sock_received to svc_xprt_re ..., Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 22/38] svc: Move accept call to svc_xprt_received t ..., Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 23/38] svc: Remove sk_lastrecv, Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 24/38] svc: Move the authinfo cache to svc_xprt., Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 25/38] svc: Make deferral processing xprt independent, Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 26/38] svc: Move the sockaddr information to svc_xprt, Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 27/38] svc: Make svc_sock_release svc_xprt_release, Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 28/38] svc: Make svc_recv transport neutral, Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 29/38] svc: Make svc_age_temp_sockets svc_age_temp_ ..., Tom Tucker, (Tue Dec 11, 4:32 pm)
[PATCH 30/38] svc: Move common create logic to common code, Tom Tucker, (Tue Dec 11, 4:33 pm)
[PATCH 31/38] svc: Removing remaining references to rq_soc ..., Tom Tucker, (Tue Dec 11, 4:33 pm)
[PATCH 32/38] svc: Make svc_check_conn_limits xprt independent, Tom Tucker, (Tue Dec 11, 4:33 pm)
[PATCH 33/38] svc: Move the xprt independent code to the s ..., Tom Tucker, (Tue Dec 11, 4:33 pm)
[PATCH 34/38] svc: Add transport hdr size for defer/revisit, Tom Tucker, (Tue Dec 11, 4:33 pm)
[PATCH 35/38] svc: Add /proc/sys/sunrpc/transport files, Tom Tucker, (Tue Dec 11, 4:33 pm)
[PATCH 36/38] svc: Add svc API that queries for a transpor ..., Tom Tucker, (Tue Dec 11, 4:33 pm)
[PATCH 37/38] knfsd: Support adding transports by writing ..., Tom Tucker, (Tue Dec 11, 4:33 pm)
[PATCH 38/38] svc: Add svc_xprt_names service to replace s ..., Tom Tucker, (Tue Dec 11, 4:33 pm)
Re: [PATCH 09/38] svc: Add a transport function that check ..., Chuck Lever, (Wed Dec 12, 11:10 am)
Re: [PATCH 09/38] svc: Add a transport function that check ..., Tom Tucker, (Wed Dec 12, 1:00 pm)
Re: [PATCH 01/38] svc: Add an svc transport class, J. Bruce Fields, (Thu Dec 13, 11:45 am)
Re: [PATCH 02/38] svc: Make svc_sock the tcp/udp transport, J. Bruce Fields, (Thu Dec 13, 12:01 pm)
Re: [PATCH 06/38] svc: Add transport specific xpo_release ..., J. Bruce Fields, (Thu Dec 13, 12:31 pm)
Re: [PATCH 09/38] svc: Add a transport function that check ..., J. Bruce Fields, (Thu Dec 13, 2:33 pm)
Re: [PATCH 09/38] svc: Add a transport function that check ..., Chuck Lever, (Thu Dec 13, 2:45 pm)
Re: [PATCH 09/38] svc: Add a transport function that check ..., Tom Tucker, (Thu Dec 13, 3:20 pm)
Re: [PATCH 09/38] svc: Add a transport function that check ..., J. Bruce Fields, (Thu Dec 13, 3:28 pm)
Re: [PATCH 09/38] svc: Add a transport function that check ..., Chuck Lever, (Fri Dec 14, 6:59 am)
Re: [PATCH 09/38] svc: Add a transport function that check ..., Chuck Lever, (Fri Dec 14, 7:27 am)
Re: [PATCH 11/38] svc: Add xpo_accept transport function, J. Bruce Fields, (Fri Dec 14, 12:01 pm)
Re: [PATCH 11/38] svc: Add xpo_accept transport function, Tom Tucker, (Fri Dec 14, 12:14 pm)
Re: [PATCH 11/38] svc: Add xpo_accept transport function, J. Bruce Fields, (Fri Dec 14, 12:55 pm)
Re: [PATCH 14/38] svc: Change sk_inuse to a kref, J. Bruce Fields, (Fri Dec 14, 1:52 pm)
Re: [PATCH 30/38] svc: Move common create logic to common code, J. Bruce Fields, (Fri Dec 14, 4:19 pm)
Re: [PATCH 34/38] svc: Add transport hdr size for defer/re ..., J. Bruce Fields, (Fri Dec 14, 4:37 pm)
Re: [PATCH 38/38] svc: Add svc_xprt_names service to repla ..., J. Bruce Fields, (Fri Dec 14, 5:03 pm)
Re: [PATCH 11/38] svc: Add xpo_accept transport function, Tom Tucker, (Fri Dec 14, 10:22 pm)
Re: [PATCH 34/38] svc: Add transport hdr size for defer/re ..., Tom Tucker, (Sat Dec 15, 11:16 am)
Re: [PATCH 30/38] svc: Move common create logic to common code, Tom Tucker, (Sat Dec 15, 3:14 pm)