Re: [PATCH 7/7][MAC80211]: Consolidate hash kfree-ing in mesh.c.

[Pavel Emelyanov <xemul@openvz.org>]

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 <xemul@openvz.org>
>>
>> ---
>>  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;
>>  }
> 
> 
>