]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
mm/mmap.c: replace if (cond) BUG() with BUG_ON()
authorAlex Shi <alex.shi@linux.alibaba.com>
Thu, 31 Dec 2020 22:04:08 +0000 (22:04 +0000)
committerJohannes Weiner <hannes@cmpxchg.org>
Thu, 31 Dec 2020 22:04:08 +0000 (22:04 +0000)
coccinelle reports some warnings:
WARNING: Use BUG_ON instead of if condition followed by BUG.

It could be fixed by BUG_ON().

Link: https://lkml.kernel.org/r/e50574aa-87b8-8ddf-2235-ef98e22bcb7d@linux.alibaba.com
Reported-by: abaci@linux.alibaba.com
Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com>
Acked-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/mmap.c

index 482c0c0bbe06725042835ad3dc69154ad5775415..0b2bef9e9cc4eb0e0d9b1523ba19157d6bb8f27a 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -710,9 +710,8 @@ static void __insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
        struct vm_area_struct *prev;
        struct rb_node **rb_link, *rb_parent;
 
-       if (find_vma_links(mm, vma->vm_start, vma->vm_end,
-                          &prev, &rb_link, &rb_parent))
-               BUG();
+       BUG_ON(find_vma_links(mm, vma->vm_start, vma->vm_end,
+                          &prev, &rb_link, &rb_parent));
        __vma_link(mm, vma, prev, rb_link, rb_parent);
        mm->map_count++;
 }
@@ -3569,9 +3568,8 @@ static void vm_lock_anon_vma(struct mm_struct *mm, struct anon_vma *anon_vma)
                 * can't change from under us thanks to the
                 * anon_vma->root->rwsem.
                 */
-               if (__test_and_set_bit(0, (unsigned long *)
-                                      &anon_vma->root->rb_root.rb_root.rb_node))
-                       BUG();
+               BUG_ON(__test_and_set_bit(0, (unsigned long *)
+                       &anon_vma->root->rb_root.rb_root.rb_node));
        }
 }
 
@@ -3587,8 +3585,7 @@ static void vm_lock_mapping(struct mm_struct *mm, struct address_space *mapping)
                 * mm_all_locks_mutex, there may be other cpus
                 * changing other bitflags in parallel to us.
                 */
-               if (test_and_set_bit(AS_MM_ALL_LOCKS, &mapping->flags))
-                       BUG();
+               BUG_ON(test_and_set_bit(AS_MM_ALL_LOCKS, &mapping->flags));
                down_write_nest_lock(&mapping->i_mmap_rwsem, &mm->mmap_lock);
        }
 }
@@ -3685,9 +3682,8 @@ static void vm_unlock_anon_vma(struct anon_vma *anon_vma)
                 * can't change from under us until we release the
                 * anon_vma->root->rwsem.
                 */
-               if (!__test_and_clear_bit(0, (unsigned long *)
-                                         &anon_vma->root->rb_root.rb_root.rb_node))
-                       BUG();
+               BUG_ON(!__test_and_clear_bit(0, (unsigned long *)
+                               &anon_vma->root->rb_root.rb_root.rb_node));
                anon_vma_unlock_write(anon_vma);
        }
 }
@@ -3700,9 +3696,7 @@ static void vm_unlock_mapping(struct address_space *mapping)
                 * because we hold the mm_all_locks_mutex.
                 */
                i_mmap_unlock_write(mapping);
-               if (!test_and_clear_bit(AS_MM_ALL_LOCKS,
-                                       &mapping->flags))
-                       BUG();
+               BUG_ON(!test_and_clear_bit(AS_MM_ALL_LOCKS, &mapping->flags));
        }
 }