mm/slub.c: record final state of slub action in deactivate_slab()

If __cmpxchg_double_slab() fails and (l != m), current code records
transition states of slub action.

Update the action after __cmpxchg_double_slab() success to record the
final state.

[[email protected]: more whitespace cleanup]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Wei Yang <[email protected]>
Reviewed-by: Andrew Morton <[email protected]>
Cc: Christoph Lameter <[email protected]>
Cc: Pekka Enberg <[email protected]>
Cc: David Rientjes <[email protected]>
Cc: Joonsoo Kim <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/mm/slub.c b/mm/slub.c
index 011e53e5845b2b9744616fa21cbb03ab608fcdfc..36c0befeebd8083187f6b869f1aa975d23ee6651 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2131,26 +2131,15 @@ redo:
        }
 
        if (l != m) {
-
                if (l == M_PARTIAL)
-
                        remove_partial(n, page);
-
                else if (l == M_FULL)
-
                        remove_full(s, n, page);
 
-               if (m == M_PARTIAL) {
-
+               if (m == M_PARTIAL)
                        add_partial(n, page, tail);
-                       stat(s, tail);
-
-               } else if (m == M_FULL) {
-
-                       stat(s, DEACTIVATE_FULL);
+               else if (m == M_FULL)
                        add_full(s, n, page);
-
-               }
        }
 
        l = m;
@@ -2163,7 +2152,11 @@ redo:
        if (lock)
                spin_unlock(&n->list_lock);
 
-       if (m == M_FREE) {
+       if (m == M_PARTIAL)
+               stat(s, tail);
+       else if (m == M_FULL)
+               stat(s, DEACTIVATE_FULL);
+       else if (m == M_FREE) {
                stat(s, DEACTIVATE_EMPTY);
                discard_slab(s, page);
                stat(s, FREE_SLAB);