mm/mremap.c: clean up goto just return ERR_PTR

[linux-2.6-block.git] / mm / slub.c

diff --git a/mm/slub.c b/mm/slub.c
index 82c473780c9188ecf7bfc393703f47793a2fbfe9..0fdd6c1e1f82cf84dc909872e5b6ee3368dee7e4 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -374,7 +374,7 @@ static inline bool __cmpxchg_double_slab(struct kmem_cache *s, struct page *page
                if (cmpxchg_double(&page->freelist, &page->counters,
                                   freelist_old, counters_old,
                                   freelist_new, counters_new))
-                       return 1;
+                       return true;
        } else
 #endif
        {
@@ -384,7 +384,7 @@ static inline bool __cmpxchg_double_slab(struct kmem_cache *s, struct page *page
                        page->freelist = freelist_new;
                        set_page_slub_counters(page, counters_new);
                        slab_unlock(page);
-                       return 1;
+                       return true;
                }
                slab_unlock(page);
        }
@@ -396,7 +396,7 @@ static inline bool __cmpxchg_double_slab(struct kmem_cache *s, struct page *page
        pr_info("%s %s: cmpxchg double redo ", n, s->name);
 #endif
 
-       return 0;
+       return false;
 }
 
 static inline bool cmpxchg_double_slab(struct kmem_cache *s, struct page *page,
@@ -410,7 +410,7 @@ static inline bool cmpxchg_double_slab(struct kmem_cache *s, struct page *page,
                if (cmpxchg_double(&page->freelist, &page->counters,
                                   freelist_old, counters_old,
                                   freelist_new, counters_new))
-                       return 1;
+                       return true;
        } else
 #endif
        {
@@ -424,7 +424,7 @@ static inline bool cmpxchg_double_slab(struct kmem_cache *s, struct page *page,
                        set_page_slub_counters(page, counters_new);
                        slab_unlock(page);
                        local_irq_restore(flags);
-                       return 1;
+                       return true;
                }
                slab_unlock(page);
                local_irq_restore(flags);
@@ -437,7 +437,7 @@ static inline bool cmpxchg_double_slab(struct kmem_cache *s, struct page *page,
        pr_info("%s %s: cmpxchg double redo ", n, s->name);
 #endif
 
-       return 0;
+       return false;
 }
 
 #ifdef CONFIG_SLUB_DEBUG
@@ -1137,15 +1137,6 @@ static int __init setup_slub_debug(char *str)
                 */
                goto check_slabs;
 
-       if (tolower(*str) == 'o') {
-               /*
-                * Avoid enabling debugging on caches if its minimum order
-                * would increase as a result.
-                */
-               disable_higher_order_debug = 1;
-               goto out;
-       }
-
        slub_debug = 0;
        if (*str == '-')
                /*
@@ -1176,6 +1167,13 @@ static int __init setup_slub_debug(char *str)
                case 'a':
                        slub_debug |= SLAB_FAILSLAB;
                        break;
+               case 'o':
+                       /*
+                        * Avoid enabling debugging on caches if its minimum
+                        * order would increase as a result.
+                        */
+                       disable_higher_order_debug = 1;
+                       break;
                default:
                        pr_err("slub_debug option '%c' unknown. skipped\n",
                               *str);