Commit 6cca7289 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

tipc: Use inlined rhashtable interface 



This patch converts tipc to the inlined rhashtable interface.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b182aa6e

net/tipc/socket.c

+18 −14
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ static const struct nla_policy tipc_nl_sock_policy[TIPC_NLA_SOCK_MAX + 1] = { 
	[TIPC_NLA_SOCK_HAS_PUBL]	= { .type = NLA_FLAG }

};



static const struct rhashtable_params tsk_rht_params;



/*

 * Revised TIPC socket locking policy:

 *
@@ -2245,7 +2247,7 @@ static struct tipc_sock *tipc_sk_lookup(struct net *net, u32 portid) 
	struct tipc_sock *tsk;



	rcu_read_lock();

	tsk = rhashtable_lookup(&tn->sk_rht, &portid);

	tsk = rhashtable_lookup_fast(&tn->sk_rht, &portid, tsk_rht_params);

	if (tsk)

		sock_hold(&tsk->sk);

	rcu_read_unlock();
@@ -2267,7 +2269,8 @@ static int tipc_sk_insert(struct tipc_sock *tsk) 
			portid = TIPC_MIN_PORT;

		tsk->portid = portid;

		sock_hold(&tsk->sk);

		if (rhashtable_lookup_insert(&tn->sk_rht, &tsk->node))

		if (!rhashtable_lookup_insert_fast(&tn->sk_rht, &tsk->node,

						   tsk_rht_params))

			return 0;

		sock_put(&tsk->sk);

	}
@@ -2280,16 +2283,13 @@ static void tipc_sk_remove(struct tipc_sock *tsk) 
	struct sock *sk = &tsk->sk;

	struct tipc_net *tn = net_generic(sock_net(sk), tipc_net_id);



	if (rhashtable_remove(&tn->sk_rht, &tsk->node)) {

	if (!rhashtable_remove_fast(&tn->sk_rht, &tsk->node, tsk_rht_params)) {

		WARN_ON(atomic_read(&sk->sk_refcnt) == 1);

		__sock_put(sk);

	}

}



int tipc_sk_rht_init(struct net *net)

{

	struct tipc_net *tn = net_generic(net, tipc_net_id);

	struct rhashtable_params rht_params = {

static const struct rhashtable_params tsk_rht_params = {

	.nelem_hint = 192,

	.head_offset = offsetof(struct tipc_sock, node),

	.key_offset = offsetof(struct tipc_sock, portid),
@@ -2299,7 +2299,11 @@ int tipc_sk_rht_init(struct net *net) 
	.min_size = 256,

};



	return rhashtable_init(&tn->sk_rht, &rht_params);

int tipc_sk_rht_init(struct net *net)

{

	struct tipc_net *tn = net_generic(net, tipc_net_id);



	return rhashtable_init(&tn->sk_rht, &tsk_rht_params);

}



void tipc_sk_rht_destroy(struct net *net)