aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/sunrpc
diff options
context:
space:
mode:
authorTom Tucker <tom@opengridcomputing.com>2007-12-30 22:07:55 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2008-02-01 16:42:11 -0500
commit7a90e8cc21ad80529b3a3371dc97acc8832cc592 (patch)
tree3a5527b0cce3c046067c72705d6acd5d6bc1184b /include/linux/sunrpc
parent7a18208383ab3f3ce4a1f4e0536acc9372523d81 (diff)
svc: Move sk_reserved to svc_xprt
This functionally trivial patch moves the sk_reserved field to the transport independent svc_xprt structure. 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>
Diffstat (limited to 'include/linux/sunrpc')
-rw-r--r--include/linux/sunrpc/svc_xprt.h1
-rw-r--r--include/linux/sunrpc/svcsock.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index 0a3e09b42a83..0b8ee06f99c0 100644
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -53,6 +53,7 @@ struct svc_xprt {
53 53
54 struct svc_pool *xpt_pool; /* current pool iff queued */ 54 struct svc_pool *xpt_pool; /* current pool iff queued */
55 struct svc_serv *xpt_server; /* service for transport */ 55 struct svc_serv *xpt_server; /* service for transport */
56 atomic_t xpt_reserved; /* space on outq that is rsvd */
56}; 57};
57 58
58int svc_reg_xprt_class(struct svc_xprt_class *); 59int svc_reg_xprt_class(struct svc_xprt_class *);
diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index 060508ba358b..ba41f11788f2 100644
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -20,8 +20,6 @@ struct svc_sock {
20 struct socket * sk_sock; /* berkeley socket layer */ 20 struct socket * sk_sock; /* berkeley socket layer */
21 struct sock * sk_sk; /* INET layer */ 21 struct sock * sk_sk; /* INET layer */
22 22
23 atomic_t sk_reserved; /* space on outq that is reserved */
24
25 spinlock_t sk_lock; /* protects sk_deferred and 23 spinlock_t sk_lock; /* protects sk_deferred and
26 * sk_info_authunix */ 24 * sk_info_authunix */
27 struct list_head sk_deferred; /* deferred requests that need to 25 struct list_head sk_deferred; /* deferred requests that need to