Skip to content

Commit

Permalink
[IPV4] ROUTE: Convert rt_hash_lock_init() macro into function
Browse files Browse the repository at this point in the history
There's no need in having this function exist in a form
of macro. Properly formatted function looks much better.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Pavel Emelyanov authored and David S. Miller committed Jan 28, 2008
1 parent 107f163 commit 1ff1cc2
Showing 1 changed file with 17 additions and 8 deletions.
25 changes: 17 additions & 8 deletions net/ipv4/route.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 1ff1cc2

Please sign in to comment.