Skip to content

Commit 81bd317

Browse files
Xiongwei Songtehcaster
authored andcommitted
slub: Put objects_show() into CONFIG_SLUB_DEBUG enabled block
The SO_ALL|SO_OBJECTS pair is only used when enabling CONFIG_SLUB_DEBUG option, so the objects_show() definition should be surrounded by CONFIG_SLUB_DEBUG too. Signed-off-by: Xiongwei Song <xiongwei.song@windriver.com> Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
1 parent 3597323 commit 81bd317

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

mm/slub.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5612,12 +5612,6 @@ static ssize_t cpu_slabs_show(struct kmem_cache *s, char *buf)
56125612
}
56135613
SLAB_ATTR_RO(cpu_slabs);
56145614

5615-
static ssize_t objects_show(struct kmem_cache *s, char *buf)
5616-
{
5617-
return show_slab_objects(s, buf, SO_ALL|SO_OBJECTS);
5618-
}
5619-
SLAB_ATTR_RO(objects);
5620-
56215615
static ssize_t objects_partial_show(struct kmem_cache *s, char *buf)
56225616
{
56235617
return show_slab_objects(s, buf, SO_PARTIAL|SO_OBJECTS);
@@ -5712,6 +5706,12 @@ static ssize_t total_objects_show(struct kmem_cache *s, char *buf)
57125706
}
57135707
SLAB_ATTR_RO(total_objects);
57145708

5709+
static ssize_t objects_show(struct kmem_cache *s, char *buf)
5710+
{
5711+
return show_slab_objects(s, buf, SO_ALL|SO_OBJECTS);
5712+
}
5713+
SLAB_ATTR_RO(objects);
5714+
57155715
static ssize_t sanity_checks_show(struct kmem_cache *s, char *buf)
57165716
{
57175717
return sysfs_emit(buf, "%d\n", !!(s->flags & SLAB_CONSISTENCY_CHECKS));
@@ -5943,7 +5943,6 @@ static struct attribute *slab_attrs[] = {
59435943
&order_attr.attr,
59445944
&min_partial_attr.attr,
59455945
&cpu_partial_attr.attr,
5946-
&objects_attr.attr,
59475946
&objects_partial_attr.attr,
59485947
&partial_attr.attr,
59495948
&cpu_slabs_attr.attr,
@@ -5957,6 +5956,7 @@ static struct attribute *slab_attrs[] = {
59575956
&slabs_cpu_partial_attr.attr,
59585957
#ifdef CONFIG_SLUB_DEBUG
59595958
&total_objects_attr.attr,
5959+
&objects_attr.attr,
59605960
&slabs_attr.attr,
59615961
&sanity_checks_attr.attr,
59625962
&trace_attr.attr,

0 commit comments

Comments
 (0)