Commit 30c5116b authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Uninline xprt_get(); It isn't performance critical. 



Also allow callers to pass NULL arguments to xprt_get() and xprt_put().

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 5edd1051

include/linux/sunrpc/xprt.h

+3 −13
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/socket.h>

#include <linux/in.h>

#include <linux/ktime.h>

#include <linux/kref.h>

#include <linux/sunrpc/sched.h>

#include <linux/sunrpc/xdr.h>

#include <linux/sunrpc/msg_prot.h>
@@ -166,7 +167,7 @@ enum xprt_transports { 
};



struct rpc_xprt {

	atomic_t		count;		/* Reference count */

	struct kref		kref;		/* Reference count */

	struct rpc_xprt_ops *	ops;		/* transport methods */



	const struct rpc_timeout *timeout;	/* timeout parms */
@@ -318,24 +319,13 @@ int xprt_adjust_timeout(struct rpc_rqst *req); 
void			xprt_release_xprt(struct rpc_xprt *xprt, struct rpc_task *task);

void			xprt_release_xprt_cong(struct rpc_xprt *xprt, struct rpc_task *task);

void			xprt_release(struct rpc_task *task);

struct rpc_xprt *	xprt_get(struct rpc_xprt *xprt);

void			xprt_put(struct rpc_xprt *xprt);

struct rpc_xprt *	xprt_alloc(struct net *net, size_t size,

				unsigned int num_prealloc,

				unsigned int max_req);

void			xprt_free(struct rpc_xprt *);



/**

 * xprt_get - return a reference to an RPC transport.

 * @xprt: pointer to the transport

 *

 */

static inline struct rpc_xprt *xprt_get(struct rpc_xprt *xprt)

{

	if (atomic_inc_not_zero(&xprt->count))

		return xprt;

	return NULL;

}



static inline __be32 *xprt_skip_transport_header(struct rpc_xprt *xprt, __be32 *p)

{

	return p + xprt->tsh_size;

net/sunrpc/xprt.c

+21 −3
Original line number Diff line number Diff line
@@ -1307,7 +1307,7 @@ void xprt_release(struct rpc_task *task) 


static void xprt_init(struct rpc_xprt *xprt, struct net *net)

{

	atomic_set(&xprt->count, 1);

	kref_init(&xprt->kref);



	spin_lock_init(&xprt->transport_lock);

	spin_lock_init(&xprt->reserve_lock);
@@ -1415,6 +1415,24 @@ static void xprt_destroy(struct rpc_xprt *xprt) 
	xprt->ops->destroy(xprt);

}



static void xprt_destroy_kref(struct kref *kref)

{

	xprt_destroy(container_of(kref, struct rpc_xprt, kref));

}



/**

 * xprt_get - return a reference to an RPC transport.

 * @xprt: pointer to the transport

 *

 */

struct rpc_xprt *xprt_get(struct rpc_xprt *xprt)

{

	if (xprt != NULL && kref_get_unless_zero(&xprt->kref))

		return xprt;

	return NULL;

}

EXPORT_SYMBOL_GPL(xprt_get);



/**

 * xprt_put - release a reference to an RPC transport.

 * @xprt: pointer to the transport
@@ -1422,7 +1440,7 @@ static void xprt_destroy(struct rpc_xprt *xprt) 
 */

void xprt_put(struct rpc_xprt *xprt)

{

	if (atomic_dec_and_test(&xprt->count))

		xprt_destroy(xprt);

	if (xprt != NULL)

		kref_put(&xprt->kref, xprt_destroy_kref);

}

EXPORT_SYMBOL_GPL(xprt_put);