Return-path: Received: from sacred.ru ([62.205.161.221]:57148 "EHLO sacred.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755612AbYEGQ1v (ORCPT ); Wed, 7 May 2008 12:27:51 -0400 Message-ID: <4821D7D6.1040005@openvz.org> (sfid-20080507_182658_571324_EB5BCE23) Date: Wed, 07 May 2008 20:24:54 +0400 From: Pavel Emelyanov MIME-Version: 1.0 To: Michael Buesch CC: Johannes Berg , "John W. Linville" , linux-wireless@vger.kernel.org, Linux Netdev List Subject: Re: [PATCH 7/7][MAC80211]: Consolidate hash kfree-ing in mesh.c. References: <4821D157.90403@openvz.org> <200805071803.11291.mb@bu3sch.de> In-Reply-To: <200805071803.11291.mb@bu3sch.de> Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-wireless-owner@vger.kernel.org List-ID: Michael Buesch wrote: > On Wednesday 07 May 2008 17:57:11 Pavel Emelyanov wrote: >> There are already two places, that kfree the mesh_table and >> its buckets. >> >> Signed-off-by: Pavel Emelyanov >> >> --- >> net/mac80211/mesh.c | 15 +++++++++------ >> 1 files changed, 9 insertions(+), 6 deletions(-) >> >> diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c >> index f46fbdb..876ec18 100644 >> --- a/net/mac80211/mesh.c >> +++ b/net/mac80211/mesh.c >> @@ -315,6 +315,13 @@ struct mesh_table *mesh_table_alloc(int size_order) >> return newtbl; >> } >> >> +static void __mesh_table_free(struct mesh_table *tbl) > > Why is this __double_underscored? To show, that this one is to be used "with care", i.e. - with all entries previously flushed. >> +{ >> + kfree(tbl->hash_buckets); >> + kfree(tbl->hashwlock); >> + kfree(tbl); >> +} >> + >> void mesh_table_free(struct mesh_table *tbl, bool free_leafs) >> { >> struct hlist_head *mesh_hash; >> @@ -330,9 +337,7 @@ void mesh_table_free(struct mesh_table *tbl, bool free_leafs) >> } >> spin_unlock(&tbl->hashwlock[i]); >> } >> - kfree(tbl->hash_buckets); >> - kfree(tbl->hashwlock); >> - kfree(tbl); >> + __mesh_table_free(tbl); >> } >> >> static void ieee80211_mesh_path_timer(unsigned long data) >> @@ -378,9 +383,7 @@ errcopy: >> hlist_for_each_safe(p, q, &newtbl->hash_buckets[i]) >> tbl->free_node(p, 0); >> } >> - kfree(newtbl->hash_buckets); >> - kfree(newtbl->hashwlock); >> - kfree(newtbl); >> + __mesh_table_free(tbl); >> endgrow: >> return NULL; >> } > > >