From patchwork Fri Mar 10 23:45:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 67859 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp29328wrd; Fri, 10 Mar 2023 15:47:09 -0800 (PST) X-Google-Smtp-Source: AK7set+dyaY/iH6e8FHpECnVbUZml+eCGTkBS13UP1fLJL9g9QqVi7LnhqVTOA1utrZsPdjsRCLI X-Received: by 2002:a17:902:f68a:b0:19e:6084:da58 with SMTP id l10-20020a170902f68a00b0019e6084da58mr33734315plg.4.1678492028789; Fri, 10 Mar 2023 15:47:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678492028; cv=none; d=google.com; s=arc-20160816; b=ic56vrw0R4fFfRs3fv2WJ7ud0qG7mUAQ6Y4GVg4M3CQqpqihFhbiEyIvqNnbR4q2T/ mtMdl5Q+y8ML1gcTuvnvyTKUMal5t1gqGtip9VCLylFWm8WxC6phOv7zRL1x5AoIyYQg GVconxhj4JhTYnSqbj1wXE6V+p5hxcUKYggPKI6UvlCK/DY2q9ep8HDASLYpsyBkdH2a i2XMzFdqcFK3pr12XPcs2w3mApZbzcPhjUj5RfiAFpYLrXQvJAfBwh7RuUIUqK+e2xZN 5qpf1Ec17mqydxyIna76Twt3DLRvdtd+GHZSLqAV7rncUJ9bsNLMiZDM8N3CT49wxrf8 SWJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BdtDngCz11vLEZXj7V3uC9J00TCr9KSXBOiIikCKO7U=; b=XE9Pz6KghwhSDiZHtpT0B1lBysqQ2ppGw9d7WgJ5jz3gQHiocyiM8l+cXVc//22D4I 4UMxselhAHUhhwkex7DlfEHdAbd78syE94UZi6SMNJOrBhcuN5F80Mxe4FZx/AuVtMCf BrkJ60WxqvbJ1u5krWhk00HguUth7IrO5WdJElkdEJyUPrfFqfegyRiOQ2NipRMftv2A ulXuYYIxoWOgAKB+U2WuJ1INGbFI4KRMzYcqJR0Xuwxtmea1HlEGYCD+IWtOtvKg5VB1 Q59NCvkcaNwRUfNCGbXo4d5+X//X0Wu+VgzZoybTn98VZAHshiy4MrOYjhph92zjQ/Z+ FYNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=Tmh2ag0s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kj14-20020a17090306ce00b0019ea3ee6f0bsi982545plb.492.2023.03.10.15.46.56; Fri, 10 Mar 2023 15:47:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=Tmh2ag0s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231305AbjCJXps (ORCPT + 99 others); Fri, 10 Mar 2023 18:45:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231277AbjCJXpo (ORCPT ); Fri, 10 Mar 2023 18:45:44 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1480712B007; Fri, 10 Mar 2023 15:45:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=BdtDngCz11vLEZXj7V3uC9J00TCr9KSXBOiIikCKO7U=; b=Tmh2ag0sjCovH4EJWWQwXdUxX+ tenwk94A3/aExZGoKIycS4E/qwjvw6GBoYfMCn+Ts3UWB9Q8IxsFLVsKIEwRsQCRy1HU5h3V4Z2zz m6HJNegAhauwIIB4ZysU9UXzB0vIIFo8xoHYNHWY3rTbktsNh6Qr2xDGTUm3R7SFdhWczzwQX5pY6 CyimNzOoggaPYT46Z0oKm+CeOxCyVPQoniSfJes2rWunXJYH4vwzDGa1nFKSDTPJrdC2vHFw1AHDJ 4e7fnVs6H7XBkt3r5su+QCXMkzc1rIdlikYOzfLgGyR/qXn/dg+OnpFliqe0hMsZ0lQfyhZns9S1N P7aN9aeQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pamQS-00Gj2r-0b; Fri, 10 Mar 2023 23:45:28 +0000 From: Luis Chamberlain To: hca@linux.ibm.com, agordeev@linux.ibm.com, borntraeger@linux.ibm.com, svens@linux.ibm.com, linux-s390@vger.kernel.org, sudipm.mukherjee@gmail.com Cc: ebiederm@xmission.com, keescook@chromium.org, yzaikin@google.com, j.granados@samsung.com, patches@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH 1/6] s390: simplify one-level sysctl registration for topology_ctl_table Date: Fri, 10 Mar 2023 15:45:20 -0800 Message-Id: <20230310234525.3986352-2-mcgrof@kernel.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230310234525.3986352-1-mcgrof@kernel.org> References: <20230310234525.3986352-1-mcgrof@kernel.org> MIME-Version: 1.0 Sender: Luis Chamberlain X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760026457495672511?= X-GMAIL-MSGID: =?utf-8?q?1760026457495672511?= There is no need to declare an extra tables to just create directory, this can be easily be done with a prefix path with register_sysctl(). Simplify this registration. Signed-off-by: Luis Chamberlain --- arch/s390/kernel/topology.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c index c6eecd4a5302..e5d6a1c25d13 100644 --- a/arch/s390/kernel/topology.c +++ b/arch/s390/kernel/topology.c @@ -637,16 +637,6 @@ static struct ctl_table topology_ctl_table[] = { { }, }; -static struct ctl_table topology_dir_table[] = { - { - .procname = "s390", - .maxlen = 0, - .mode = 0555, - .child = topology_ctl_table, - }, - { }, -}; - static int __init topology_init(void) { timer_setup(&topology_timer, topology_timer_fn, TIMER_DEFERRABLE); @@ -654,7 +644,7 @@ static int __init topology_init(void) set_topology_timer(); else topology_update_polarization_simple(); - register_sysctl_table(topology_dir_table); + register_sysctl("s390", topology_ctl_table); return device_create_file(cpu_subsys.dev_root, &dev_attr_dispatching); } device_initcall(topology_init); From patchwork Fri Mar 10 23:45:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 67862 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp30594wrd; Fri, 10 Mar 2023 15:51:15 -0800 (PST) X-Google-Smtp-Source: AK7set/oyolDp15GdluJlSMk0HvaZXSDfLmoZJpHttpTM9uMZj/0uh5xbMK7QS882G9MofavjruC X-Received: by 2002:a17:902:d586:b0:19e:3caa:804e with SMTP id k6-20020a170902d58600b0019e3caa804emr25194073plh.6.1678492275296; Fri, 10 Mar 2023 15:51:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678492275; cv=none; d=google.com; s=arc-20160816; b=vYgaoDdZeWRqIeum5wUCSMXby3oc7ZJzgk2zGGo3P5IDunnN/vpx/FXiQcQB6Kh2cy k+VJ+LEKE6GSIPsr0ooeSuse84Eeh1B+viEfA+dtDj8vs3kphA0THwa8EY3boqgjfn6P o+uGPdZC2zEystd38ME0g+PaTG6Pd+kKbnviwNh6UEQA0urHqpgRf2/t20ONZklezupp coXpposeHkwj/9hSZ0K30OPaQiytNON+MhrE2/WoO4Sxq/NA343j0w5Pp21lBFCrtI9j mwuyyivkx3ZFn1uaXcXJm1VAq/74xzqKiK2ApUATu19cqTh8T5Q2BbfwMq2FkZ/5RrL/ LLEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=LMz951lH+GTlXBdT5Z97YwiBE8EmQ72In88ZwOJtlek=; b=fnUtuMZIoK1QKduWb6JmGcFwe09nSWm5lOPUMkS+S0KaCKH3TEgHFtTiGqc65dUu6k 4YDm4hEBeupdEO0zTDx4B2kY9fHRCEouGpNvEDjh0psxSQt8e7hRUs2Z+S05pTFXbfnd B9fisnuVrrH17K8VeePDHLMj9duDOavv5eD+/sv2lGWXIorhnuAFZH/YXQihz6DzTRID n6kcnghmV28XTuJ5Hp274RztaWDH9FBJvVkw6on8k4f37PCGe1jj1gHbgWL7nJslv2LF RDarXiSC23pqKvZEVswtn7HkWsR6rj0mbHlDOyubsOtIHafUO2K3soMRmfFcMdloRBuD GVEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="OflQ0N4/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b3-20020a170902b60300b0019f25dae4f5si162633pls.198.2023.03.10.15.51.01; Fri, 10 Mar 2023 15:51:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="OflQ0N4/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232093AbjCJXqJ (ORCPT + 99 others); Fri, 10 Mar 2023 18:46:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231654AbjCJXpq (ORCPT ); Fri, 10 Mar 2023 18:45:46 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 149A012B03A; Fri, 10 Mar 2023 15:45:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=LMz951lH+GTlXBdT5Z97YwiBE8EmQ72In88ZwOJtlek=; b=OflQ0N4/CEo1p1GvnhPn14bpjg vmz+hv+Jy3oouD/nIf1Vs6OZVTZLHssU2qrv5wXv26MXvSDxbzSf/ixlaGq9di1FLc3Tt+NaldRzl gVkepqTIr+4FuiUK0XdHT/UeYiYo8Xp7YYrDphAe04rmoUut+n/Iv0DkWyLbvTbzbM7EwE2raaTmg 3dD+DLd3lGYlD8qCF+wZi0zvK7gWAapuOSVbXih5eWvfZ/3xzZwVEzDLXlMO7Z2JZaY6eGW15pOaR CN27Hg3mEWxeTKsLrPi17eAX6fCPSZuiDaBT18bXXVPZtUwwUtLkxbZeNKuOONRADTL4BZLYiluq3 ag/IEb0Q==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pamQS-00Gj2v-1v; Fri, 10 Mar 2023 23:45:28 +0000 From: Luis Chamberlain To: hca@linux.ibm.com, agordeev@linux.ibm.com, borntraeger@linux.ibm.com, svens@linux.ibm.com, linux-s390@vger.kernel.org, sudipm.mukherjee@gmail.com Cc: ebiederm@xmission.com, keescook@chromium.org, yzaikin@google.com, j.granados@samsung.com, patches@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH 2/6] s390: simplify one-level syctl registration for s390dbf_table Date: Fri, 10 Mar 2023 15:45:21 -0800 Message-Id: <20230310234525.3986352-3-mcgrof@kernel.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230310234525.3986352-1-mcgrof@kernel.org> References: <20230310234525.3986352-1-mcgrof@kernel.org> MIME-Version: 1.0 Sender: Luis Chamberlain X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760026716434552071?= X-GMAIL-MSGID: =?utf-8?q?1760026716434552071?= There is no need to declare an extra tables to just create directory, this can be easily be done with a prefix path with register_sysctl(). Simplify this registration. Signed-off-by: Luis Chamberlain --- arch/s390/kernel/debug.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c index b376f0377a2c..221c865785c2 100644 --- a/arch/s390/kernel/debug.c +++ b/arch/s390/kernel/debug.c @@ -981,16 +981,6 @@ static struct ctl_table s390dbf_table[] = { { } }; -static struct ctl_table s390dbf_dir_table[] = { - { - .procname = "s390dbf", - .maxlen = 0, - .mode = S_IRUGO | S_IXUGO, - .child = s390dbf_table, - }, - { } -}; - static struct ctl_table_header *s390dbf_sysctl_header; /** @@ -1574,7 +1564,7 @@ static int debug_sprintf_format_fn(debug_info_t *id, struct debug_view *view, */ static int __init debug_init(void) { - s390dbf_sysctl_header = register_sysctl_table(s390dbf_dir_table); + s390dbf_sysctl_header = register_sysctl("s390dbf", s390dbf_table); mutex_lock(&debug_mutex); debug_debugfs_root_entry = debugfs_create_dir(DEBUG_DIR_ROOT, NULL); initialized = 1; From patchwork Fri Mar 10 23:45:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 67860 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp29901wrd; Fri, 10 Mar 2023 15:49:04 -0800 (PST) X-Google-Smtp-Source: AK7set87Ur3lGnzYYm/Xt+mb01VXfH3UNmeioLVzGAkOTgbPOOT/DWO9dNlO+rFyvbm80p4ljZbJ X-Received: by 2002:a17:90b:180b:b0:233:e660:aaae with SMTP id lw11-20020a17090b180b00b00233e660aaaemr28881590pjb.16.1678492143902; Fri, 10 Mar 2023 15:49:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678492143; cv=none; d=google.com; s=arc-20160816; b=RRUON8Kq9jDTyg7RTCW7gujiaeHwp7MBZqvCHUZsdH9xgli0zqIH+CSDPNsXDq/mSD nxLiJlVrj060LDDG55prEvY3QgjCtpmj0YuQkYmq9CYURXhCHsbgUOrtjqZMyZ7YrSDS XpE0MYem1zqSxu5YId5v3fReXk/UIF2QQBH4lMOzIebwR09IPZjEYF5rzzh2aOrlY5Sx A2CYBRJFrSlSm9cs84rMZp8PvXXaaesiAbiN6ofvSwXlOKpkJaB2LH4ddu9OHiXCW8MO xqqJSJL+3gpZk4GI2wJNrHEu0P1sv5VuUDncHsqTfxq7WElxzLKK8DmrfrJroIGzkRW3 ZI6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=H5HqYRjESHY8xUnMrM+cMVopzwc1JUtrK5M1N6TB7H4=; b=IiRYZBSOdbW7+l8hpm1VkcD9vSiBxHQ37lX6aCWOQwrQHepgEY85jcnpfMZQboWkIJ VkB73saBKPZ85q7hTWJOP3yfWMgN1LSxfJvidEBkD2NgbH5FfU6cI2xyuGWvCr0h/t8W TH5Hvq7Jna87W/DQwSMydrTOUA3WxNtN6rSTp3H5cu1I9NZ/L6xPBH6tpGjLo1qUOXp2 ESB9xQec9ZRK4HYdv6ErIjguZxb9u88EIYHHTGHrNoJMk0DlcBfX1VHA9kZhVXfrAQGG Hae7e+L/kqc/c7EhTyDPYQrvAt+5bC0SRAVb0QFss4xHEIW7V3B62Pzzt3bdhh0UXRA5 h2uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=Rb2ENORk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h20-20020a63df54000000b004ce0ead7aabsi962257pgj.302.2023.03.10.15.48.50; Fri, 10 Mar 2023 15:49:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=Rb2ENORk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231759AbjCJXqA (ORCPT + 99 others); Fri, 10 Mar 2023 18:46:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230203AbjCJXpp (ORCPT ); Fri, 10 Mar 2023 18:45:45 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14C2912B3D7; Fri, 10 Mar 2023 15:45:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=H5HqYRjESHY8xUnMrM+cMVopzwc1JUtrK5M1N6TB7H4=; b=Rb2ENORkOAXfh2XoBReOuS75Tk QqougMDviCgYgMy+K8gXsHJzMfAjPBP7p9aqASPSUV7bZqiRvrmjXrA3FnPk+e+c/xr4wFRIsB/bA j8j7O3tzwutLtXlFCED7jR5LAMiWEo8vD7BzCH7CYvQPjMZVWEynP7TtwIcvWh7IJZTAXigSDdTeJ FvX6Xca2XQ/MZEOdQ2HIofICvCWJrvY5GC8ECdH52BnqXyBtjnb3Or+a5MacnTO0NUwHoXKgq2Zaq SzHxI9n1Rt3jYzr+Gw6pebhK9sTPr/hf15Xhl3Dw/YbihBpStQ9m29aDqpAc1mu2MeU8jE+qzB8vR 5scFTiOg==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pamQS-00Gj2z-3K; Fri, 10 Mar 2023 23:45:28 +0000 From: Luis Chamberlain To: hca@linux.ibm.com, agordeev@linux.ibm.com, borntraeger@linux.ibm.com, svens@linux.ibm.com, linux-s390@vger.kernel.org, sudipm.mukherjee@gmail.com Cc: ebiederm@xmission.com, keescook@chromium.org, yzaikin@google.com, j.granados@samsung.com, patches@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH 3/6] s390: simplify one-level sysctl registration for appldata_table Date: Fri, 10 Mar 2023 15:45:22 -0800 Message-Id: <20230310234525.3986352-4-mcgrof@kernel.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230310234525.3986352-1-mcgrof@kernel.org> References: <20230310234525.3986352-1-mcgrof@kernel.org> MIME-Version: 1.0 Sender: Luis Chamberlain X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760026578121172416?= X-GMAIL-MSGID: =?utf-8?q?1760026578121172416?= There is no need to declare an extra tables to just create directory, this can be easily be done with a prefix path with register_sysctl(). Simplify this registration. Signed-off-by: Luis Chamberlain --- arch/s390/appldata/appldata_base.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c index c0fd29133f27..c593f2228083 100644 --- a/arch/s390/appldata/appldata_base.c +++ b/arch/s390/appldata/appldata_base.c @@ -66,16 +66,6 @@ static struct ctl_table appldata_table[] = { { }, }; -static struct ctl_table appldata_dir_table[] = { - { - .procname = appldata_proc_name, - .maxlen = 0, - .mode = S_IRUGO | S_IXUGO, - .child = appldata_table, - }, - { }, -}; - /* * Timer */ @@ -422,7 +412,7 @@ static int __init appldata_init(void) appldata_wq = alloc_ordered_workqueue("appldata", 0); if (!appldata_wq) return -ENOMEM; - appldata_sysctl_header = register_sysctl_table(appldata_dir_table); + appldata_sysctl_header = register_sysctl(appldata_proc_name, appldata_table); return 0; } From patchwork Fri Mar 10 23:45:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 67874 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp41549wrd; Fri, 10 Mar 2023 16:18:37 -0800 (PST) X-Google-Smtp-Source: AK7set+fTK4T/AoSBik+Rne+5BzK9OBPhnecFqL0AQ/HCe6sizrzKam1Ba+hPKJiomBY/WsKadEj X-Received: by 2002:a17:903:41d0:b0:19b:c2d:1222 with SMTP id u16-20020a17090341d000b0019b0c2d1222mr6894323ple.52.1678493917275; Fri, 10 Mar 2023 16:18:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678493917; cv=none; d=google.com; s=arc-20160816; b=paLKWVjKq/3OLVYh2RM2CbMYZByhNn9uq+/V3XWbYthRLohvKQ1RqBl4AOIGIhKFp6 itH1Jtq+xAO/zVBSqGYblt/qnccyArH6Gs8ATAxAVSl7JI/e+nTA2tfLtieDrCx9/OZw Dpn+jPaDCJT41fJ0mCyqVskt2TqsF6vXpT6xCIwoXoPfPmonjoFCeTtLvkMbvSXmxZLq C5lTmCJzXV/9yXF9hngXsB9stcNNoR9kQp30R0P717c11uOEI3A3HTOS8Zo4agH7enEO vmnEtfmrdRzVQpY2khraobiyE/8Q92L102WcZ+/0PKYM7IOC8w8BCv+TZ7HspwYWePNh to+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=N5vx1FBpbc8LlYLlnu7qtqpLSHJPRrla5oNVHVuiKnI=; b=jU+LgWGgLOcGvvC2ZJ0nK26LmLMTXtcnoRgZW4rtcgAxph1JYJUok8psktQJ2BStGy h4yhnni9G9yEvbwRfV8xAdglpK6ZUoqZffa2ruct0EiimIETfJWVKtzzDmuGNyjNwTwr Z7NM4MUfcvFdSlv9GVHKGJal+7CMp4Fxkm+2ZY6n87oWHEFyG/QWcJHz0DGh6pHWJzBQ 7TOwzA/p+VFpf3MSYiZrIPRulyaMfNm/SuqlMpkYXktf/M6lenuz1Sj4lkz9rJwRO00O 3eiINTHvZltChX+uvWEuRyyX9srg0xvDOn9AzbW8s4TSUdAiz2wOvuVocKe6IVwJdKuN GW7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="IK/npqdf"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kw7-20020a170902f90700b0019f1f0f9ccesi814112plb.216.2023.03.10.16.18.23; Fri, 10 Mar 2023 16:18:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="IK/npqdf"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231965AbjCJXqQ (ORCPT + 99 others); Fri, 10 Mar 2023 18:46:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231449AbjCJXpp (ORCPT ); Fri, 10 Mar 2023 18:45:45 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14CFD12B7D3; Fri, 10 Mar 2023 15:45:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=N5vx1FBpbc8LlYLlnu7qtqpLSHJPRrla5oNVHVuiKnI=; b=IK/npqdfvhyNAJvSI8r427YlNX RSVirLCMWv4Rr8iJyWSYktDBdNXsX1ZR+c6rhA0TmzDEkh3Vcrp/uF0UQJ+utUs5tPGi+F4VP4/rU tSdo7bRWz1clO+u+ufJTqZ2YzDinsFuuvFpcigeJ/rU6oLLooGaUqIWgOrdA9XPMxcLBFzUL273aU iyqelPcFo9CDdxyxD/7ANzhY92cyIPXjB9mTxx4+ZDErTgZq8xgYjWNpZaI12xLAImgh9S3imGmzk 0mHwKUcM2B/suuA5MX+v2xKZ6AsD0nHJx/RB10Ka3C+9yGPPsrFJDtJWv7ZI12vaqmPNlCLlUgMzm 12IlGySA==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pamQS-00Gj31-5G; Fri, 10 Mar 2023 23:45:28 +0000 From: Luis Chamberlain To: hca@linux.ibm.com, agordeev@linux.ibm.com, borntraeger@linux.ibm.com, svens@linux.ibm.com, linux-s390@vger.kernel.org, sudipm.mukherjee@gmail.com Cc: ebiederm@xmission.com, keescook@chromium.org, yzaikin@google.com, j.granados@samsung.com, patches@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH 4/6] s390: simplify one level sysctl registration for cmm_table Date: Fri, 10 Mar 2023 15:45:23 -0800 Message-Id: <20230310234525.3986352-5-mcgrof@kernel.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230310234525.3986352-1-mcgrof@kernel.org> References: <20230310234525.3986352-1-mcgrof@kernel.org> MIME-Version: 1.0 Sender: Luis Chamberlain X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760028437903549736?= X-GMAIL-MSGID: =?utf-8?q?1760028437903549736?= There is no need to declare an extra tables to just create directory, this can be easily be done with a prefix path with register_sysctl(). Simplify this registration. Signed-off-by: Luis Chamberlain --- arch/s390/mm/cmm.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c index 9141ed4c52e9..5300c6867d5e 100644 --- a/arch/s390/mm/cmm.c +++ b/arch/s390/mm/cmm.c @@ -335,16 +335,6 @@ static struct ctl_table cmm_table[] = { { } }; -static struct ctl_table cmm_dir_table[] = { - { - .procname = "vm", - .maxlen = 0, - .mode = 0555, - .child = cmm_table, - }, - { } -}; - #ifdef CONFIG_CMM_IUCV #define SMSG_PREFIX "CMM" static void cmm_smsg_target(const char *from, char *msg) @@ -389,7 +379,7 @@ static int __init cmm_init(void) { int rc = -ENOMEM; - cmm_sysctl_header = register_sysctl_table(cmm_dir_table); + cmm_sysctl_header = register_sysctl("vm", cmm_table); if (!cmm_sysctl_header) goto out_sysctl; #ifdef CONFIG_CMM_IUCV From patchwork Fri Mar 10 23:45:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 67863 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp30615wrd; Fri, 10 Mar 2023 15:51:20 -0800 (PST) X-Google-Smtp-Source: AK7set8CtotS6ebsOjSh14CHSzgOVCdtYUReziObyIAqVMEhUJ9pRFqsQ/m7ld4kyz/JDSZhthBk X-Received: by 2002:a05:6a20:918c:b0:d3:3e9b:4907 with SMTP id v12-20020a056a20918c00b000d33e9b4907mr1831664pzd.39.1678492280033; Fri, 10 Mar 2023 15:51:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678492280; cv=none; d=google.com; s=arc-20160816; b=dcCt8t4NJmQG/cppmhBBaKGtNm723HWhghxE4deXd8si+42d2EtYyLxm7jMkDFxm1g RH2qRJ/BTkGR5OAC/2L/lra4aSsgYocyu1vyUeatq74/pJy6B/Cc2/pD/w7rC1UDuCIa MgBlpnFhv26fgoqiSlLAebMypEU788wOfiHYh3haCN4+Xx1dhoGkTMQwgUwlLgYY8u2t aO9+SLp3RtoWWIsvvAVGWie8rnh4SdyjyGMOaRLs51ohc2iabwD8A1HnPsdsRk95Kh0K b7A1svOEvaweMYREkDzcTM6MuIWPPFTjJdpOu4kgkvcvF7/SemcU7ih6rIcwIac5u08p LsGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=nHMN7uwZ1jz4t3b3KbBdxN2XO9S9Ia12wFzWNFd3opY=; b=Sd/cagV4KnH0iRokqOWtxL1zDbwwEhalgOxgBEv9uVTxzGxWdhKWdIkmc6svPeec/9 mAPg3ZepUF0Fg5wUpCIfmVUDmFbQLmF+R3WXLGGG6WPCPKnniHJlPENef+IujDLKLXdj 4uWCuzm3NF1+v9du0svpb7XzSDsrBAXjJCrnmHyDSSO88EBwAtaodIaiZrIViGEool14 M4k5CvxtcZ7EK8na6V5VKbNEpY2ZjGNSW1UnoUtUaramGhnEEnbW23Y+7lYTD5UL5ukn ukg+Muhnw1Gqi6HPglUJ0/WSe1l2moRp3eIcvqs4hiLzycg6kRwGgS1dxfsgaKc2mAur gevg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=3GDvwXXQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d27-20020aa797bb000000b0058003199fbbsi791521pfq.63.2023.03.10.15.51.05; Fri, 10 Mar 2023 15:51:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=3GDvwXXQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232101AbjCJXqM (ORCPT + 99 others); Fri, 10 Mar 2023 18:46:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231657AbjCJXpq (ORCPT ); Fri, 10 Mar 2023 18:45:46 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 159DB12B942; Fri, 10 Mar 2023 15:45:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=nHMN7uwZ1jz4t3b3KbBdxN2XO9S9Ia12wFzWNFd3opY=; b=3GDvwXXQTMtsfQLNqy0vJ3E8tc 6n7irTuEwDXgM6CQLVv8I1yk6aK+TDHsXV86/H2xr6+YRZTiP0ByLSm8F7t8FVREr2m4jd5VaVRLa Rq63/fdFYH5SdwcxIz+v2kxZC7QiYkwwbQ8/BlfNQxBOncdyV5fuBBUsPxkWc7+xlY7t9OAy/aBGs +vpbqjiAfwhDgDAxTemRveRQB+7DdGJCae8xMhSFN1OAYe0bsNxr0zQW94wypu6N3TY3zyKGSdFFS vbDpisKqOX1y+h6VL7kC1FIRNbL4ZUHRIcIdZ1Y+AIi/5E1eM5nmaM/J5JAsEeniE9bUanhpP4xCZ ddqDO9xw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pamQS-00Gj33-7A; Fri, 10 Mar 2023 23:45:28 +0000 From: Luis Chamberlain To: hca@linux.ibm.com, agordeev@linux.ibm.com, borntraeger@linux.ibm.com, svens@linux.ibm.com, linux-s390@vger.kernel.org, sudipm.mukherjee@gmail.com Cc: ebiederm@xmission.com, keescook@chromium.org, yzaikin@google.com, j.granados@samsung.com, patches@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH 5/6] s390: simplify one-level sysctl registration for page_table_sysctl Date: Fri, 10 Mar 2023 15:45:24 -0800 Message-Id: <20230310234525.3986352-6-mcgrof@kernel.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230310234525.3986352-1-mcgrof@kernel.org> References: <20230310234525.3986352-1-mcgrof@kernel.org> MIME-Version: 1.0 Sender: Luis Chamberlain X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760026721297388150?= X-GMAIL-MSGID: =?utf-8?q?1760026721297388150?= There is no need to declare an extra tables to just create directory, this can be easily be done with a prefix path with register_sysctl(). Simplify this registration. Signed-off-by: Luis Chamberlain --- arch/s390/mm/pgalloc.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c index 2de48b2c1b04..0f68b7257e08 100644 --- a/arch/s390/mm/pgalloc.c +++ b/arch/s390/mm/pgalloc.c @@ -33,19 +33,9 @@ static struct ctl_table page_table_sysctl[] = { { } }; -static struct ctl_table page_table_sysctl_dir[] = { - { - .procname = "vm", - .maxlen = 0, - .mode = 0555, - .child = page_table_sysctl, - }, - { } -}; - static int __init page_table_register_sysctl(void) { - return register_sysctl_table(page_table_sysctl_dir) ? 0 : -ENOMEM; + return register_sysctl("vm", page_table_sysctl) ? 0 : -ENOMEM; } __initcall(page_table_register_sysctl); From patchwork Fri Mar 10 23:45:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 67861 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp29931wrd; Fri, 10 Mar 2023 15:49:09 -0800 (PST) X-Google-Smtp-Source: AK7set8SRtCgsfv05hPpK8QvNdHSPCYdEBDW3C30iYC5nliM/XFA3n5QRu0HybR1wol2wUTvC4hH X-Received: by 2002:a05:6a20:8e03:b0:c7:af88:3c8f with SMTP id y3-20020a056a208e0300b000c7af883c8fmr3797778pzj.25.1678492149388; Fri, 10 Mar 2023 15:49:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678492149; cv=none; d=google.com; s=arc-20160816; b=PmDvinRUsluY4s1OnxkE+UaZ5jIsCvL6YDpSUtxuAgTgzyaR/OVHZ/IEjsVDGg4CxX 55kzoqPcvmq//VixAA4W7slYGVKvDsp9suWdOktDuzbp7IKzwr90ugQD9/8TwEAHs2II t/OkDUu+HwzZw5m2fadBwUuIfjFAtgF/oQf795TnEe6tcqfXlUAkdhBsl3e438L/EKAO qGoyDzU6ECYUQIW02tB1/nQ5t9WzPh/UzAPCf9PoqJl2Osi09COoZ6Ub9bcZ3VRYse+s vy6WQgZSolPqGBF+T0RDgW81C6bw3adbVxnUnBNbbzRT8+l29RfbAmDyZw+MVN2WSWV8 uG9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6RSbXeOyJXMcC096K906LGWK1pufxQXw88aIMgb//hY=; b=gTJT7ACxV26X8k6EiuyhFGjcOdYEobOjNOcQJpvPLesE8I8/vw/yQhkSG7ccNPDihO PMcgCzDoZWP4K0FKkxxveYRpjhKDmtEnqEVPZBXBYiwk3/NmR9yH06Fzpj2H6pHZoy9u 0HPxRNT8VWGHn5zG88t9POYe5kfFzcQFnEztXWPI+MJhmgoPBDjNNGXr/jzp16WeaUBI zKytHiqzKvDw8rzcl07AlN3qpYYNSz/YOZnov6FcPMIwuHVZ3hhODZoZ27l1QCnkaoCP uMaR1VXBvexJhh4adaiPHExW7iu2G4h1E5ZwflTR6F9I/pqDG1Tj14J2CcKkv4p1SDoe QOnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=oPkUxijQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d27-20020aa797bb000000b0058003199fbbsi791521pfq.63.2023.03.10.15.48.55; Fri, 10 Mar 2023 15:49:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=oPkUxijQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232013AbjCJXqE (ORCPT + 99 others); Fri, 10 Mar 2023 18:46:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231326AbjCJXpp (ORCPT ); Fri, 10 Mar 2023 18:45:45 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13FB4126991; Fri, 10 Mar 2023 15:45:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=6RSbXeOyJXMcC096K906LGWK1pufxQXw88aIMgb//hY=; b=oPkUxijQji7nsAPM9NoPoMym+I AR65R3ylE5x03QCPirCr2PlHYS0RXVk6IA586IZCoN+CVwZyxHSPlfGIRAOj/TNyFpl67NiQB0txS dNinDi5REGeIrrg5VGBGMjJzr6z9eF1AmBa7IFYBe5tcWeTT1u2eu7mHZsx9QBht1S6dYvGp60Lij y5NMIxZAhBUSZlsUAT58b4NtLvGew+LNFw6z8eEPaI+yo1xxDFjfA08xuqBhHueLjj9y4A1VV/AqF RktygUAbAEOmsDduIfaJl+JYHG2UDxfI25po7gm08BHdl3sZJ03wZ0inOuzaNEmxwVhVv0zZ8FAix EUc9SXIA==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pamQS-00Gj35-95; Fri, 10 Mar 2023 23:45:28 +0000 From: Luis Chamberlain To: hca@linux.ibm.com, agordeev@linux.ibm.com, borntraeger@linux.ibm.com, svens@linux.ibm.com, linux-s390@vger.kernel.org, sudipm.mukherjee@gmail.com Cc: ebiederm@xmission.com, keescook@chromium.org, yzaikin@google.com, j.granados@samsung.com, patches@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH 6/6] s390: simplify dynamic sysctl registration for appldata_register_ops Date: Fri, 10 Mar 2023 15:45:25 -0800 Message-Id: <20230310234525.3986352-7-mcgrof@kernel.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230310234525.3986352-1-mcgrof@kernel.org> References: <20230310234525.3986352-1-mcgrof@kernel.org> MIME-Version: 1.0 Sender: Luis Chamberlain X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760026584256681545?= X-GMAIL-MSGID: =?utf-8?q?1760026584256681545?= The routine appldata_register_ops() allocates a sysctl table with 4 entries. The firsts one, ops->ctl_table[0] is the parent directory with an empty entry following it, ops->ctl_table[1]. The next entry is for the the ops->name and that is ops->ctl_table[2]. It needs an empty entry following that, and that is ops->ctl_table[3]. And so hence the kcalloc(4, sizeof(struct ctl_table), GFP_KERNEL). We can simplify this considerably since sysctl_register("foo", table) can create the parent directory for us if it does not exist. So we can just remove the first two entries and move back the ops->name to the first entry, and just use kcalloc(2, ...). Signed-off-by: Luis Chamberlain --- arch/s390/appldata/appldata_base.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c index c593f2228083..a60c1e093039 100644 --- a/arch/s390/appldata/appldata_base.c +++ b/arch/s390/appldata/appldata_base.c @@ -351,7 +351,8 @@ int appldata_register_ops(struct appldata_ops *ops) if (ops->size > APPLDATA_MAX_REC_SIZE) return -EINVAL; - ops->ctl_table = kcalloc(4, sizeof(struct ctl_table), GFP_KERNEL); + /* The last entry must be an empty one */ + ops->ctl_table = kcalloc(2, sizeof(struct ctl_table), GFP_KERNEL); if (!ops->ctl_table) return -ENOMEM; @@ -359,17 +360,12 @@ int appldata_register_ops(struct appldata_ops *ops) list_add(&ops->list, &appldata_ops_list); mutex_unlock(&appldata_ops_mutex); - ops->ctl_table[0].procname = appldata_proc_name; - ops->ctl_table[0].maxlen = 0; - ops->ctl_table[0].mode = S_IRUGO | S_IXUGO; - ops->ctl_table[0].child = &ops->ctl_table[2]; + ops->ctl_table[0].procname = ops->name; + ops->ctl_table[0].mode = S_IRUGO | S_IWUSR; + ops->ctl_table[0].proc_handler = appldata_generic_handler; + ops->ctl_table[0].data = ops; - ops->ctl_table[2].procname = ops->name; - ops->ctl_table[2].mode = S_IRUGO | S_IWUSR; - ops->ctl_table[2].proc_handler = appldata_generic_handler; - ops->ctl_table[2].data = ops; - - ops->sysctl_header = register_sysctl_table(ops->ctl_table); + ops->sysctl_header = register_sysctl(appldata_proc_name, ops->ctl_table); if (!ops->sysctl_header) goto out; return 0;