mm: replace some BUG_ONs by VM_BUG_ONs

[people/ms/linux.git] / mm / swapfile.c

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 54a9f87e5162ab0a24a00e057be2fcd7f5498022..214e90b94946ab97cabf2e5cdb7fda6e61351d9f 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -333,7 +333,7 @@ int can_share_swap_page(struct page *page)
 {
        int count;
 
-       BUG_ON(!PageLocked(page));
+       VM_BUG_ON(!PageLocked(page));
        count = page_mapcount(page);
        if (count <= 1 && PageSwapCache(page))
                count += page_swapcount(page);
@@ -350,8 +350,7 @@ static int remove_exclusive_swap_page_count(struct page *page, int count)
        struct swap_info_struct * p;
        swp_entry_t entry;
 
-       BUG_ON(PagePrivate(page));
-       BUG_ON(!PageLocked(page));
+       VM_BUG_ON(!PageLocked(page));
 
        if (!PageSwapCache(page))
                return 0;
@@ -432,7 +431,6 @@ void free_swap_and_cache(swp_entry_t entry)
        if (page) {
                int one_user;
 
-               BUG_ON(PagePrivate(page));
                one_user = (page_count(page) == 2);
                /* Only cache user (+us), or swap space full? Free it! */
                /* Also recheck PageSwapCache after page is locked (above) */
@@ -1209,7 +1207,7 @@ int page_queue_congested(struct page *page)
 {
        struct backing_dev_info *bdi;
 
-       BUG_ON(!PageLocked(page));      /* It pins the swap_info_struct */
+       VM_BUG_ON(!PageLocked(page));   /* It pins the swap_info_struct */
 
        if (PageSwapCache(page)) {
                swp_entry_t entry = { .val = page_private(page) };