mm/slub: Convert show_slab_objects() to struct slab

Adds a little bit of type safety.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

diff --git a/mm/slub.c b/mm/slub.c
index d849b644d0edebcade630ccbf114dac18f438ae4..fdf3dbd4665f0e9df6762e7f46149837a6d9511f 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -5219,32 +5219,32 @@ static ssize_t show_slab_objects(struct kmem_cache *s,
                        struct kmem_cache_cpu *c = per_cpu_ptr(s->cpu_slab,
                                                               cpu);
                        int node;
-                       struct page *page;
+                       struct slab *slab;
 
-                       page = slab_page(READ_ONCE(c->slab));
-                       if (!page)
+                       slab = READ_ONCE(c->slab);
+                       if (!slab)
                                continue;
 
-                       node = page_to_nid(page);
+                       node = slab_nid(slab);
                        if (flags & SO_TOTAL)
-                               x = page->objects;
+                               x = slab->objects;
                        else if (flags & SO_OBJECTS)
-                               x = page->inuse;
+                               x = slab->inuse;
                        else
                                x = 1;
 
                        total += x;
                        nodes[node] += x;
 
-                       page = slab_page(slub_percpu_partial_read_once(c));
-                       if (page) {
-                               node = page_to_nid(page);
+                       slab = slub_percpu_partial_read_once(c);
+                       if (slab) {
+                               node = slab_nid(slab);
                                if (flags & SO_TOTAL)
                                        WARN_ON_ONCE(1);
                                else if (flags & SO_OBJECTS)
                                        WARN_ON_ONCE(1);
                                else
-                                       x = page->pages;
+                                       x = slab->slabs;
                                total += x;
                                nodes[node] += x;
                        }