You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
mac80211: Prepare mesh_table_grow to failing copy_node callback.
The mesh_path_node_copy() performs kmalloc() and thus - may fail (well, it does not now, but I'm fixing this right now). Its caller - the mesh_table_grow() - isn't prepared for such a trick yet. This preparation is just flush the new hash and make copy_node() return an int value. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
committed by
John W. Linville
parent
5194ee82b4
commit
4caf86c692
+13
-2
@@ -349,7 +349,7 @@ struct mesh_table *mesh_table_grow(struct mesh_table *tbl)
|
||||
{
|
||||
struct mesh_table *newtbl;
|
||||
struct hlist_head *oldhash;
|
||||
struct hlist_node *p;
|
||||
struct hlist_node *p, *q;
|
||||
int err = 0;
|
||||
int i;
|
||||
|
||||
@@ -373,13 +373,24 @@ struct mesh_table *mesh_table_grow(struct mesh_table *tbl)
|
||||
oldhash = tbl->hash_buckets;
|
||||
for (i = 0; i <= tbl->hash_mask; i++)
|
||||
hlist_for_each(p, &oldhash[i])
|
||||
tbl->copy_node(p, newtbl);
|
||||
if (tbl->copy_node(p, newtbl) < 0)
|
||||
goto errcopy;
|
||||
|
||||
endgrow:
|
||||
if (err)
|
||||
return NULL;
|
||||
else
|
||||
return newtbl;
|
||||
|
||||
errcopy:
|
||||
for (i = 0; i <= newtbl->hash_mask; i++) {
|
||||
hlist_for_each_safe(p, q, &newtbl->hash_buckets[i])
|
||||
tbl->free_node(p, 0);
|
||||
}
|
||||
kfree(newtbl->hash_buckets);
|
||||
kfree(newtbl->hashwlock);
|
||||
kfree(newtbl);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user