From patchwork Thu Mar 21 08:44:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiu Jianfeng X-Patchwork-Id: 13598512 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 578F1C54E58 for ; Thu, 21 Mar 2024 08:50:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BCB626B0083; Thu, 21 Mar 2024 04:50:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B7A116B0085; Thu, 21 Mar 2024 04:50:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A41516B0087; Thu, 21 Mar 2024 04:50:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 93FD56B0083 for ; Thu, 21 Mar 2024 04:50:11 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 6726EA1192 for ; Thu, 21 Mar 2024 08:50:11 +0000 (UTC) X-FDA: 81920424222.03.1B6B9EA Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by imf27.hostedemail.com (Postfix) with ESMTP id 7E14F4001A for ; Thu, 21 Mar 2024 08:50:07 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf27.hostedemail.com: domain of xiujianfeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=xiujianfeng@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711011009; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references; bh=pdglKKUwRu/Qm7lldR3ecd43kRoYQ/IOeQyzwwkSN/0=; b=D/wTWT92A48rsiwgL0Wl5E4E9HUCYeK4TdzRmF+FgBoYx6+p3sFGCLDbK5NnzvW5EFUjHx sjkA/18dLwzOGkFselCtXKJmJXW5KXYEPhbXHy9bgNsJFEfeG+RhjbfQoeVpuEoAnUACOY BBg1Eo/jWoOEetic6HX8b2NvrKMOGNU= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf27.hostedemail.com: domain of xiujianfeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=xiujianfeng@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711011009; a=rsa-sha256; cv=none; b=zyVe48NEg7S1ofdq0tTjCNuLvzqbnBWWRdJNfZxkY+mvrMqxPA4AuxqKZeAoxMWNW74WLj AFxeeR2WraHnE8A86BmiAgflcI7bUFfdOVkmS8wC0c0mOAtpp6OLnmJYtfTwbUcJHk3dWH AaW4QjOA1Z7Xh3RSqfAIjc4WrqJCxaw= Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4V0fKX4dbRz4f3m6w for ; Thu, 21 Mar 2024 16:49:52 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id 9568D1A0A17 for ; Thu, 21 Mar 2024 16:50:00 +0800 (CST) Received: from huaweicloud.com (unknown [10.67.174.26]) by APP1 (Coremail) with SMTP id cCh0CgAX6RG49Ptl_QV8Hg--.35067S4; Thu, 21 Mar 2024 16:50:00 +0800 (CST) From: Xiu Jianfeng To: cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, akpm@linux-foundation.org, vbabka@suse.cz, roman.gushchin@linux.dev, 42.hyeyoo@gmail.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, xiujianfeng@huawei.com Subject: [PATCH -next] mm/slub: remove dummy slabinfo functions Date: Thu, 21 Mar 2024 08:44:15 +0000 Message-Id: <20240321084415.265643-1-xiujianfeng@huaweicloud.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CM-TRANSID: cCh0CgAX6RG49Ptl_QV8Hg--.35067S4 X-Coremail-Antispam: 1UD129KBjvJXoW7tryxJw4fWw1kZw1rWF1xKrg_yoW8uF1xpF 4fGw1fJa48Kr10gr4DGF48ZrySv3ZIkFW5GrZ2qasavr1UJw1vgrn5t3ykZ398WF95u397 Xw4v9FyrX34DJrDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkIb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4 vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7Cj xVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x 0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG 6I80ewAv7VC0I7IYx2IY67AKxVWUXVWUAwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFV Cjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4IIrI8v6xkF7I0E8cxan2IY04v7MxAIw28I cxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2 IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI 42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42 IY6xAIw20EY4v20xvaj40_Wr1j6rW3Jr1lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2 z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU189N3UUUUU== X-CM-SenderInfo: x0lxyxpdqiv03j6k3tpzhluzxrxghudrp/ X-Rspamd-Queue-Id: 7E14F4001A X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: d3k3mhzf7igussbsj4k94a43qdgnthq7 X-HE-Tag: 1711011007-622149 X-HE-Meta: U2FsdGVkX19GY6bzJEQ0NgIEdbJEie2Opluf1EuL4SQJZlSff8rUUUDS8vTiKPFlEef8tUdlYqJ08MDP8BZgp4OcJSKf+5YiLcOPpow4yDFQV70Od+G3Z36B3jVqPwCLKXR4g1FfYLqIckZguVXDPtDGjKZqzAr1ANweC8gHnxu5adYYCWiVfuTdK29vYXBqkcJdn+OGrySxgMmAoOVNdywfKdOafdhwGppCghBKQWH4qCpR3XvdyJHxmV2U2na44GaTkPMcGEPY5z5Fm5P0elbpt1Te0BblZ6fAJ7rfFJdf5lAa14MKnwRtbcYrGyNlfxNkNyGK7cHDDvdeSxP8uv5qWmYQ7xRPniGsg3sw8MuRpkkz7HBFzr+KYogLXzWeuiNQ75OZ/iy8ono5ijGZHbtarMgRavfdvRozcndlb+Us2RTzyBZYM4gcd71UMbHfvrIPDni4OUxxW1stClL9iwWYJZRbdPBee4I2Cw5gUDU5rAVhu7UA6Q9FV83YUkLQ4aDDo5uOeceqg/rwkyZAHjmmMJ5Ixh2GBvDwM8UYbxwuf+LfdSrx97Alheo2h/O61zpxxGnGqe1AxMOwqnFRInYgluHCI0MZPKtdhj7LunAa1ZzWH9Pz3su1NJIclG8i+zJdT11qaZgX7lNOWpddApf+vOUuyk/iqCIXFIplk3kaB2QLmip2a9v2G6q1AOAJO42Rb/vB59JJj1jFbkbYNLnm9OliDyB5XB6aAigdsucgkhjBFBda/3z7mpoeh+RVKsRUvUrsUELlUfo7vZiLGPUz0jMsVyPMrNl7BWgI5K24Xd19w+1rL3eCpCwQO/cixpYsJXk2XLEOwtnVigITOc5HGz06LI9w09vPGZuNwJQRL05ei2IpsEKkUkJqEw3FDknVGt95mZeNMiXUKnd2VVruUydHGqOZ8V0JoR8ZQvLdjbQrVBHNhN9UCUsJtc9N08xQ/5Ug/gLL5TPVL11 PidoYpLB zO0bd X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Xiu Jianfeng Slab has been removed since 6.5, so there is no other versions of slabinfo_show_stats() and slabinfo_write(), then we can remove these two dummy functions. Signed-off-by: Xiu Jianfeng --- 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 */