Commit 1ff1cc20 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[IPV4] ROUTE: Convert rt_hash_lock_init() macro into function 



There's no need in having this function exist in a form
of macro. Properly formatted function looks much better.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 107f1634

net/ipv4/route.c

+17 −8
Original line number Diff line number Diff line
@@ -235,16 +235,25 @@ struct rt_hash_bucket { 


static spinlock_t	*rt_hash_locks;

# define rt_hash_lock_addr(slot) &rt_hash_locks[(slot) & (RT_HASH_LOCK_SZ - 1)]

# define rt_hash_lock_init()	{ \

		int i; \

		rt_hash_locks = kmalloc(sizeof(spinlock_t) * RT_HASH_LOCK_SZ, GFP_KERNEL); \

		if (!rt_hash_locks) panic("IP: failed to allocate rt_hash_locks\n"); \

		for (i = 0; i < RT_HASH_LOCK_SZ; i++) \

			spin_lock_init(&rt_hash_locks[i]); \



static __init void rt_hash_lock_init(void)

{

	int i;



	rt_hash_locks = kmalloc(sizeof(spinlock_t) * RT_HASH_LOCK_SZ,

			GFP_KERNEL);

	if (!rt_hash_locks)

		panic("IP: failed to allocate rt_hash_locks\n");



	for (i = 0; i < RT_HASH_LOCK_SZ; i++)

		spin_lock_init(&rt_hash_locks[i]);

}

#else

# define rt_hash_lock_addr(slot) NULL

# define rt_hash_lock_init()



static inline void rt_hash_lock_init(void)

{

}

#endif



static struct rt_hash_bucket 	*rt_hash_table;