slab: use struct freelist_counters for local variables instead of struct slab

In several functions we declare local struct slab variables so we can
work with the freelist and counters fields (including the sub-counters
that are in the union) comfortably.

With struct freelist_counters containing the full counters definition,
we can now reduce the local variables to that type as we don't need the
other fields in struct slab.

Reviewed-by: Harry Yoo <harry.yoo@oracle.com>
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>

diff --git a/mm/slub.c b/mm/slub.c
index 8330e4f8b3b24ce6a0163daf662da75219b5f8af..a55e0af26ec776c08915be0df60488330faedeb6 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3725,8 +3725,7 @@ static void deactivate_slab(struct kmem_cache *s, struct slab *slab,
        void *nextfree, *freelist_iter, *freelist_tail;
        int tail = DEACTIVATE_TO_HEAD;
        unsigned long flags = 0;
-       struct slab new;
-       struct slab old;
+       struct freelist_counters old, new;
 
        if (READ_ONCE(slab->freelist)) {
                stat(s, DEACTIVATE_REMOTE_FREES);
@@ -4390,7 +4389,7 @@ __update_cpu_freelist_fast(struct kmem_cache *s,
  */
 static inline void *get_freelist(struct kmem_cache *s, struct slab *slab)
 {
-       struct slab new;
+       struct freelist_counters new;
        unsigned long counters;
        void *freelist;
 
@@ -4418,7 +4417,7 @@ static inline void *get_freelist(struct kmem_cache *s, struct slab *slab)
  */
 static inline void *freeze_slab(struct kmem_cache *s, struct slab *slab)
 {
-       struct slab new;
+       struct freelist_counters new;
        unsigned long counters;
        void *freelist;
 
@@ -5867,7 +5866,7 @@ static void __slab_free(struct kmem_cache *s, struct slab *slab,
 {
        void *old_head;
        bool was_frozen, was_full;
-       struct slab new;
+       struct freelist_counters new;
        unsigned long counters;
        struct kmem_cache_node *n = NULL;
        unsigned long flags;