Apply the sysfs pattern xxx_slabs[[_total]_objects] to PARTIAL slabs. Signed-off-by: Wei Yang <richard.weiyang@xxxxxxxxx> --- mm/slub.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 443dacbf214e..eb0eaa0239fd 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -4946,11 +4946,11 @@ static ssize_t aliases_show(struct kmem_cache *s, char *buf) } SLAB_ATTR_RO(aliases); -static ssize_t partial_show(struct kmem_cache *s, char *buf) +static ssize_t partial_slabs_show(struct kmem_cache *s, char *buf) { return show_slab_objects(s, buf, SO_PARTIAL); } -SLAB_ATTR_RO(partial); +SLAB_ATTR_RO(partial_slabs); static ssize_t cpu_slabs_show(struct kmem_cache *s, char *buf) { @@ -4976,17 +4976,17 @@ static ssize_t slabs_objects_show(struct kmem_cache *s, char *buf) } SLAB_ATTR_RO(slabs_objects); -static ssize_t objects_partial_show(struct kmem_cache *s, char *buf) +static ssize_t partial_slabs_objects_show(struct kmem_cache *s, char *buf) { return show_slab_objects(s, buf, SO_PARTIAL|SO_OBJECTS); } -SLAB_ATTR_RO(objects_partial); +SLAB_ATTR_RO(partial_slabs_objects); -static ssize_t total_objects_partial_show(struct kmem_cache *s, char *buf) +static ssize_t partial_slabs_total_objects_show(struct kmem_cache *s, char *buf) { return show_slab_objects(s, buf, SO_PARTIAL|SO_TOTAL); } -SLAB_ATTR_RO(total_objects_partial); +SLAB_ATTR_RO(partial_slabs_total_objects); static ssize_t slabs_cpu_partial_show(struct kmem_cache *s, char *buf) { @@ -5363,9 +5363,9 @@ static struct attribute *slab_attrs[] = { &min_partial_attr.attr, &cpu_partial_attr.attr, &slabs_objects_attr.attr, - &objects_partial_attr.attr, - &total_objects_partial_attr.attr, - &partial_attr.attr, + &partial_slabs_objects_attr.attr, + &partial_slabs_total_objects_attr.attr, + &partial_slabs_attr.attr, &cpu_slabs_objects_attr.attr, &cpu_slabs_total_objects_attr.attr, &cpu_slabs_attr.attr, -- 2.11.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>