mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
mm/vmalloc.c: switch to WARN_ON() and move it under unlink_va()
Trigger a warning if an object that is about to be freed is detached. We used to have a BUG_ON(), but even though it is considered as faulty behaviour that is not a good reason to break a system. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Uladzislau Rezki (Sony) <[email protected]> Cc: Roman Gushchin <[email protected]> Cc: Hillf Danton <[email protected]> Cc: Michal Hocko <[email protected]> Cc: Matthew Wilcox <[email protected]> Cc: Oleksiy Avramchenko <[email protected]> Cc: Steven Rostedt <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
54f63d9d8a
commit
460e42d19a
1 changed files with 10 additions and 15 deletions
25
mm/vmalloc.c
25
mm/vmalloc.c
|
|
@ -534,20 +534,17 @@ link_va(struct vmap_area *va, struct rb_root *root,
|
|||
static __always_inline void
|
||||
unlink_va(struct vmap_area *va, struct rb_root *root)
|
||||
{
|
||||
/*
|
||||
* During merging a VA node can be empty, therefore
|
||||
* not linked with the tree nor list. Just check it.
|
||||
*/
|
||||
if (!RB_EMPTY_NODE(&va->rb_node)) {
|
||||
if (root == &free_vmap_area_root)
|
||||
rb_erase_augmented(&va->rb_node,
|
||||
root, &free_vmap_area_rb_augment_cb);
|
||||
else
|
||||
rb_erase(&va->rb_node, root);
|
||||
if (WARN_ON(RB_EMPTY_NODE(&va->rb_node)))
|
||||
return;
|
||||
|
||||
list_del(&va->list);
|
||||
RB_CLEAR_NODE(&va->rb_node);
|
||||
}
|
||||
if (root == &free_vmap_area_root)
|
||||
rb_erase_augmented(&va->rb_node,
|
||||
root, &free_vmap_area_rb_augment_cb);
|
||||
else
|
||||
rb_erase(&va->rb_node, root);
|
||||
|
||||
list_del(&va->list);
|
||||
RB_CLEAR_NODE(&va->rb_node);
|
||||
}
|
||||
|
||||
#if DEBUG_AUGMENT_PROPAGATE_CHECK
|
||||
|
|
@ -1162,8 +1159,6 @@ EXPORT_SYMBOL_GPL(unregister_vmap_purge_notifier);
|
|||
|
||||
static void __free_vmap_area(struct vmap_area *va)
|
||||
{
|
||||
BUG_ON(RB_EMPTY_NODE(&va->rb_node));
|
||||
|
||||
/*
|
||||
* Remove from the busy tree/list.
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in a new issue