SUNRPC: Convert struct rpc_xprt to use atomic_t counters

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index bef0f535f7464608e4173c80d53d9c49a80384a4..a0f998c07c65ec142dc89bce5ff4c117ff5ad808 100644 (file)
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -12,7 +12,6 @@
 #include <linux/uio.h>
 #include <linux/socket.h>
 #include <linux/in.h>
-#include <linux/kref.h>
 #include <linux/ktime.h>
 #include <linux/sunrpc/sched.h>
 #include <linux/sunrpc/xdr.h>
@@ -146,7 +145,7 @@ enum xprt_transports {
 };
 
 struct rpc_xprt {
-       struct kref             kref;           /* Reference count */
+       atomic_t                count;          /* Reference count */
        struct rpc_xprt_ops *   ops;            /* transport methods */
 
        const struct rpc_timeout *timeout;      /* timeout parms */

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 8bdcdbe07b98f9de382ab182a5f2d2746825cfc9..4499b5a51763dc6982ded94aab150136d7f896ca 100644 (file)
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -964,7 +964,7 @@ struct rpc_xprt *xprt_alloc(struct net *net, int size, int max_req)
        xprt = kzalloc(size, GFP_KERNEL);
        if (xprt == NULL)
                goto out;
-       kref_init(&xprt->kref);
+       atomic_set(&xprt->count, 1);
 
        xprt->max_reqs = max_req;
        xprt->slot = kcalloc(max_req, sizeof(struct rpc_rqst), GFP_KERNEL);
@@ -1144,13 +1144,11 @@ found:
 
 /**
  * xprt_destroy - destroy an RPC transport, killing off all requests.
- * @kref: kref for the transport to destroy
+ * @xprt: transport to destroy
  *
  */
-static void xprt_destroy(struct kref *kref)
+static void xprt_destroy(struct rpc_xprt *xprt)
 {
-       struct rpc_xprt *xprt = container_of(kref, struct rpc_xprt, kref);
-
        dprintk("RPC:       destroying transport %p\n", xprt);
        xprt->shutdown = 1;
        del_timer_sync(&xprt->timer);
@@ -1174,7 +1172,8 @@ static void xprt_destroy(struct kref *kref)
  */
 void xprt_put(struct rpc_xprt *xprt)
 {
-       kref_put(&xprt->kref, xprt_destroy);
+       if (atomic_dec_and_test(&xprt->count))
+               xprt_destroy(xprt);
 }
 
 /**
@@ -1184,6 +1183,7 @@ void xprt_put(struct rpc_xprt *xprt)
  */
 struct rpc_xprt *xprt_get(struct rpc_xprt *xprt)
 {
-       kref_get(&xprt->kref);
-       return xprt;
+       if (atomic_inc_not_zero(&xprt->count))
+               return xprt;
+       return NULL;
 }