Re: [PATCH -next] mm/slub: remove dummy slabinfo functions

From: xiujianfeng
Date: Thu Mar 21 2024 - 09:10:49 EST


Hi,

On 2024/3/21 20:20, Song, Xiongwei wrote:
>
>
>> From: Xiu Jianfeng <xiujianfeng@xxxxxxxxxx>
>>
>> Slab has been removed since 6.5, so there is no other versions of
>
> Removed since 6.8. The changes looks good.

Yes, thanks for correcting!

>
> Regards,
> Xiongwei
>
>> slabinfo_show_stats() and slabinfo_write(), then we can remove these
>> two dummy functions.
>>
>> Signed-off-by: Xiu Jianfeng <xiujianfeng@xxxxxxxxxx>
>> ---
>> mm/slab.h | 3 ---
>> mm/slab_common.c | 2 --
>> mm/slub.c | 10 ----------
>> 3 files changed, 15 deletions(-)
>>
>> diff --git a/mm/slab.h b/mm/slab.h
>> index d2bc9b191222..78e205b46e19 100644
>> --- a/mm/slab.h
>> +++ b/mm/slab.h
>> @@ -496,9 +496,6 @@ struct slabinfo {
>> };
>>
>> void get_slabinfo(struct kmem_cache *s, struct slabinfo *sinfo);
>> -void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *s);
>> -ssize_t slabinfo_write(struct file *file, const char __user *buffer,
>> - size_t count, loff_t *ppos);
>>
>> #ifdef CONFIG_SLUB_DEBUG
>> #ifdef CONFIG_SLUB_DEBUG_ON
>> diff --git a/mm/slab_common.c b/mm/slab_common.c
>> index f5234672f03c..67c03d6bd26c 100644
>> --- a/mm/slab_common.c
>> +++ b/mm/slab_common.c
>> @@ -1078,7 +1078,6 @@ static void cache_show(struct kmem_cache *s, struct seq_file *m)
>> sinfo.limit, sinfo.batchcount, sinfo.shared);
>> seq_printf(m, " : slabdata %6lu %6lu %6lu",
>> sinfo.active_slabs, sinfo.num_slabs, sinfo.shared_avail);
>> - slabinfo_show_stats(m, s);
>> seq_putc(m, '\n');
>> }
>>
>> @@ -1155,7 +1154,6 @@ static const struct proc_ops slabinfo_proc_ops = {
>> .proc_flags = PROC_ENTRY_PERMANENT,
>> .proc_open = slabinfo_open,
>> .proc_read = seq_read,
>> - .proc_write = slabinfo_write,
>> .proc_lseek = seq_lseek,
>> .proc_release = seq_release,
>> };
>> diff --git a/mm/slub.c b/mm/slub.c
>> index 1bb2a93cf7b6..cc7e68fbdbba 100644
>> --- a/mm/slub.c
>> +++ b/mm/slub.c
>> @@ -7099,14 +7099,4 @@ void get_slabinfo(struct kmem_cache *s, struct slabinfo *sinfo)
>> sinfo->objects_per_slab = oo_objects(s->oo);
>> sinfo->cache_order = oo_order(s->oo);
>> }
>> -
>> -void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *s)
>> -{
>> -}
>> -
>> -ssize_t slabinfo_write(struct file *file, const char __user *buffer,
>> - size_t count, loff_t *ppos)
>> -{
>> - return -EIO;
>> -}
>> #endif /* CONFIG_SLUB_DEBUG */
>> --
>> 2.34.1
>>
>