---

yaml --- r: 102518 b: refs/heads/master c: 4e3e6dc h: refs/heads/master v: v3
git-mirror · May 12, 2008 · 2337655 · 2337655
1 parent ed2e4b2
commit 2337655
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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;
 }