dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

SUNRPC: Convert struct rpc_xprt to use atomic_t counters 

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2011-03-15 19:56:30 -04:00
parent e020c6800c
commit a8de240a90
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/sunrpc/xprt.h
View File

@ -12,7 +12,6 @@
#include <linux/uio.h> #include <linux/uio.h>
#include <linux/socket.h> #include <linux/socket.h>
#include <linux/in.h> #include <linux/in.h>
#include <linux/kref.h>
#include <linux/ktime.h> #include <linux/ktime.h>
#include <linux/sunrpc/sched.h> #include <linux/sunrpc/sched.h>
#include <linux/sunrpc/xdr.h> #include <linux/sunrpc/xdr.h>
@ -146,7 +145,7 @@ enum xprt_transports {
}; };
struct rpc_xprt { struct rpc_xprt {
struct kref kref; /* Reference count */ atomic_t count; /* Reference count */
struct rpc_xprt_ops * ops; /* transport methods */ struct rpc_xprt_ops * ops; /* transport methods */
const struct rpc_timeout *timeout; /* timeout parms */ const struct rpc_timeout *timeout; /* timeout parms */

16
net/sunrpc/xprt.c
View File

@ -964,7 +964,7 @@ struct rpc_xprt *xprt_alloc(struct net *net, int size, int max_req)
xprt = kzalloc(size, GFP_KERNEL); xprt = kzalloc(size, GFP_KERNEL);
if (xprt == NULL) if (xprt == NULL)
goto out; goto out;
kref_init(&xprt->kref); atomic_set(&xprt->count, 1);
xprt->max_reqs = max_req; xprt->max_reqs = max_req;
xprt->slot = kcalloc(max_req, sizeof(struct rpc_rqst), GFP_KERNEL); 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. * 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); dprintk("RPC: destroying transport %p\n", xprt);
xprt->shutdown = 1; xprt->shutdown = 1;
del_timer_sync(&xprt->timer); del_timer_sync(&xprt->timer);
@ -1174,7 +1172,8 @@ static void xprt_destroy(struct kref *kref)
*/ */
void xprt_put(struct rpc_xprt *xprt) 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) struct rpc_xprt *xprt_get(struct rpc_xprt *xprt)
{ {
kref_get(&xprt->kref); if (atomic_inc_not_zero(&xprt->count))
return xprt; return xprt;
return NULL;
} }