From 23376555c8bc6b5423c3788606363b5c73e2f1bf Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Mon, 12 May 2008 15:41:53 -0700 Subject: [PATCH] --- yaml --- r: 102518 b: refs/heads/master c: 4e3e6dcb43c3669a8817cb3d0f920f91661afd98 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/tipc/name_table.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f0c9dd0ca240..b9b47b184e0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20c2c1fd6c842caf70dcb1d94b9d58861949fd3d +refs/heads/master: 4e3e6dcb43c3669a8817cb3d0f920f91661afd98 diff --git a/trunk/net/tipc/name_table.c b/trunk/net/tipc/name_table.c index ac7dfdda7973..892373e498e4 100644 --- a/trunk/net/tipc/name_table.c +++ b/trunk/net/tipc/name_table.c @@ -1050,15 +1050,12 @@ void tipc_nametbl_dump(void) int tipc_nametbl_init(void) { - int array_size = sizeof(struct hlist_head) * tipc_nametbl_size; - - table.types = kzalloc(array_size, GFP_ATOMIC); + table.types = kcalloc(tipc_nametbl_size, sizeof(struct hlist_head), + GFP_ATOMIC); if (!table.types) return -ENOMEM; - write_lock_bh(&tipc_nametbl_lock); table.local_publ_count = 0; - write_unlock_bh(&tipc_nametbl_lock); return 0; }