evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'rhashtable-fixes'

Browse source 
Thomas Graf says:

====================
rhashtable rehashing fixes

Some rhashtable rehashing bugs found while testing with the
next rhashtable self-test queued up for the next devel cycle:

https://github.com/tgraf/net-next/commits/rht

v2:
 - Moved schedule_work() call into rhashtable_insert_rehash()
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2015-04-22 14:17:23 -04:00
commit a2c3935aaa
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/rhashtable.c
View file

@ -405,13 +405,18 @@ int rhashtable_insert_rehash(struct rhashtable *ht)
if (rht_grow_above_75(ht, tbl)) if (rht_grow_above_75(ht, tbl))
size *= 2; size *= 2;
/* More than two rehashes (not resizes) detected. */ /* Do not schedule more than one rehash */
else if (WARN_ON(old_tbl != tbl && old_tbl->size == size)) else if (old_tbl != tbl)
return -EBUSY; return -EBUSY;
new_tbl = bucket_table_alloc(ht, size, GFP_ATOMIC); new_tbl = bucket_table_alloc(ht, size, GFP_ATOMIC);
if (new_tbl == NULL) if (new_tbl == NULL) {
/* Schedule async resize/rehash to try allocation
* non-atomic context.
*/
schedule_work(&ht->run_work);
return -ENOMEM; return -ENOMEM;
}
err = rhashtable_rehash_attach(ht, tbl, new_tbl); err = rhashtable_rehash_attach(ht, tbl, new_tbl);
if (err) { if (err) {