aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/sunrpc/svcsock.h
diff options
context:
space:
mode:
authorTom Tucker <tom@opengridcomputing.com>2007-12-30 22:07:53 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2008-02-01 16:42:11 -0500
commit7a18208383ab3f3ce4a1f4e0536acc9372523d81 (patch)
tree851a1cc29d753297c2e7cf4cb4a95c4af7868427 /include/linux/sunrpc/svcsock.h
parentbb5cf160b282644c4491afbf76fbc66f5dc35030 (diff)
svc: Make close transport independent
Move sk_list and sk_ready to svc_xprt. This involves close because these lists are walked by svcs when closing all their transports. So I combined the moving of these lists to svc_xprt with making close transport independent. The svc_force_sock_close has been changed to svc_close_all and takes a list as an argument. This removes some svc internals knowledge from the svcs. This code races with module removal and transport addition. Thanks to Simon Holm Thøgersen for a compile fix. Signed-off-by: Tom Tucker <tom@opengridcomputing.com> Acked-by: Neil Brown <neilb@suse.de> Reviewed-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-by: Greg Banks <gnb@sgi.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Cc: Simon Holm Thøgersen <odie@cs.aau.dk>
Diffstat (limited to 'include/linux/sunrpc/svcsock.h')
-rw-r--r--include/linux/sunrpc/svcsock.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index 92d4cc99c60d..060508ba358b 100644
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -17,8 +17,6 @@
17 */ 17 */
18struct svc_sock { 18struct svc_sock {
19 struct svc_xprt sk_xprt; 19 struct svc_xprt sk_xprt;
20 struct list_head sk_ready; /* list of ready sockets */
21 struct list_head sk_list; /* list of all sockets */
22 struct socket * sk_sock; /* berkeley socket layer */ 20 struct socket * sk_sock; /* berkeley socket layer */
23 struct sock * sk_sk; /* INET layer */ 21 struct sock * sk_sk; /* INET layer */
24 22
@@ -51,7 +49,7 @@ struct svc_sock {
51/* 49/*
52 * Function prototypes. 50 * Function prototypes.
53 */ 51 */
54void svc_force_close_socket(struct svc_sock *); 52void svc_close_all(struct list_head *);
55int svc_recv(struct svc_rqst *, long); 53int svc_recv(struct svc_rqst *, long);
56int svc_send(struct svc_rqst *); 54int svc_send(struct svc_rqst *);
57void svc_drop(struct svc_rqst *); 55void svc_drop(struct svc_rqst *);