From patchwork Sat Mar 11 20:51:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 68198 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp451746wrd; Sat, 11 Mar 2023 13:03:42 -0800 (PST) X-Google-Smtp-Source: AK7set9/DyTQkJsnpFrkzfl1gtxhOcrkTSeg9g6EX9Ubb27UCl+BvRdKxaG2+k2OyJxUN4UifLZL X-Received: by 2002:a05:6a20:2a19:b0:d3:e4d8:a684 with SMTP id e25-20020a056a202a1900b000d3e4d8a684mr393331pzh.7.1678568621856; Sat, 11 Mar 2023 13:03:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678568621; cv=none; d=google.com; s=arc-20160816; b=WHnWzBxAP1xdk4Vx8hI14UrtQX4lNMmTBkDQ22q8MO50drsZ/VleKkgOXymzm53k0W b9lMCa9va0b0xX4w77RQJ5TfTwV4SrMl31gW65U4K1558SO+FsPbqDAytc3dgaTcTCqY uB1NDLv2SBq5cZ5OqBDT1Sv/l0wtFidC6sILgIDRvfwCsoQZjOniR7j78bRExTbLmVuo jr7SpyLqMx7FpSlxjyLsRhTJg5HK82fqiGAQTvZE9s72Krm3lZ/mwBEcf/rV3dIGqeO3 61PnfUMpgNoID1pFyEL7Yp5hBkLY5t6NHqtFrB1ExMAb2O8ZLZI5rsLJivNEMWW75kUy i/cg== 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=XIoPX8KdCwgXnvpcDRNW0+6992U8KOWdKG/zQLzC1bo=; b=pVzqq4isGK3JW/sW34WNs8t/jNbxirxDwX/4i4uz9Bjys+PQsoYbPCtImwoNXmkZ7b iJadh8H74ZCe60RxtDQemYSPiolLJpa9gwGnrwbfMBccfQmGLdVrxebbFSYY5O5FJLur dSJ45WMUDViwzbyWmvLk69Rbnb/WYYrHyBhv+wcZEtyzAZttxaU1EG/77O5qRGCEGYZR c+Qd+E0ALKgVjc2qIRTbEKk/G+JAHWix0yKLt+lVnaqryIhzC2fEQszCdMvq7Nifsanf x21+m/0sgANp+MfQQMmlEnn7zLOyHQtirymEw4458/3L/koc+id8UnLA+VMz2a+PWeyu qG6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=NWdEVYNy; 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 h7-20020aa79f47000000b005a8a9d14496si2616076pfr.47.2023.03.11.13.03.28; Sat, 11 Mar 2023 13:03:41 -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=NWdEVYNy; 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 S230038AbjCKUwK (ORCPT + 99 others); Sat, 11 Mar 2023 15:52:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229514AbjCKUwE (ORCPT ); Sat, 11 Mar 2023 15:52:04 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1E046B30E; Sat, 11 Mar 2023 12:52:00 -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=XIoPX8KdCwgXnvpcDRNW0+6992U8KOWdKG/zQLzC1bo=; b=NWdEVYNyVND64gD2By+ArxWn9i GvIMY2HatnEvgFY4p2eqCVZJUQlsVpbQdbGdOj1J5Dcbgj8ZFTg/Gw/9fM4sY/PrT6GVx/BNCMr5a ITVp7nxGYvJSYj/okyh/Zw0r5jUxu7iOtwKkWBAu0v1HKQDUcqNK8MF1e/2zkzD3Q7ImqZgXXij67 x10IZd+p2vuDOiIII9LFdwA+77fZOMfpmU5yE1QE8yFC0xwNMmofXvYQx2COX7eQVH0rS3HS6/oPa 1f+Jq/it/8POhExEYsnJq1BLbxVr3TSew4CTACPEO4hsSK5u8cBKs1sZ1DZOldqoPrzhzfZbvr5y/ oqFvrMLg==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pb6Bz-001EKA-Qm; Sat, 11 Mar 2023 20:51:51 +0000 From: Luis Chamberlain To: chuck.lever@oracle.com, jlayton@kernel.org, trond.myklebust@hammerspace.com, anna@kernel.org, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, kuba@kernel.org, linux-nfs@vger.kernel.org Cc: ebiederm@xmission.com, keescook@chromium.org, yzaikin@google.com, j.granados@samsung.com, patches@lists.linux.dev, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH v2 1/5] sunrpc: simplify two-level sysctl registration for tsvcrdma_parm_table Date: Sat, 11 Mar 2023 12:51:44 -0800 Message-Id: <20230311205148.293375-2-mcgrof@kernel.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230311205148.293375-1-mcgrof@kernel.org> References: <20230311205148.293375-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?1760106771417214643?= X-GMAIL-MSGID: =?utf-8?q?1760106771417214643?= There is no need to declare two tables to just create directories, this can be easily be done with a prefix path with register_sysctl(). Simplify this registration. Signed-off-by: Luis Chamberlain --- net/sunrpc/xprtrdma/svc_rdma.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c index 5bc20e9d09cd..f0d5eeed4c88 100644 --- a/net/sunrpc/xprtrdma/svc_rdma.c +++ b/net/sunrpc/xprtrdma/svc_rdma.c @@ -212,24 +212,6 @@ static struct ctl_table svcrdma_parm_table[] = { { }, }; -static struct ctl_table svcrdma_table[] = { - { - .procname = "svc_rdma", - .mode = 0555, - .child = svcrdma_parm_table - }, - { }, -}; - -static struct ctl_table svcrdma_root_table[] = { - { - .procname = "sunrpc", - .mode = 0555, - .child = svcrdma_table - }, - { }, -}; - static void svc_rdma_proc_cleanup(void) { if (!svcrdma_table_header) @@ -263,7 +245,8 @@ static int svc_rdma_proc_init(void) if (rc) goto out_err; - svcrdma_table_header = register_sysctl_table(svcrdma_root_table); + svcrdma_table_header = register_sysctl("sunrpc/svc_rdma", + svcrdma_parm_table); return 0; out_err: From patchwork Sat Mar 11 20:51:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 68196 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp451037wrd; Sat, 11 Mar 2023 13:02:09 -0800 (PST) X-Google-Smtp-Source: AK7set8s+6OF2lTO2hqIaRyeMaQXmRC0TBIho6hHOKoHwtCUh+lVoo+ufvWzUQSL//0Fkz+KSjkk X-Received: by 2002:a17:90a:1a49:b0:234:b964:570d with SMTP id 9-20020a17090a1a4900b00234b964570dmr30445712pjl.13.1678568528968; Sat, 11 Mar 2023 13:02:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678568528; cv=none; d=google.com; s=arc-20160816; b=erJOlVxleQQTIvnA0w5fGPg3njHoDrTS2RQNGm6FmxsG6vHwkja08K0OOyi/Au+GVy 6Ro5ibXBALWMOzPQEsTx/tSgOJxEmFScF4BzTbj0m4vn2Wcn3NiAvdMMigtDJFsKihGa zhb9f+oimlLkgT0piLXlSvTsKg10MLXhls4xaSRF273LjvvePHNnOIDpCsQWJNk5vxbP fHoL7Hz3wnNtpJmolI8OUEVGOOvZDLaGOpvrJpNrq10n1Qco6JvzzV5yzkXWoa99pe1I sY5HWdsUizsGFUXXByDQYCtlPCaAV8T2sxAm9thG4OYfnZvN9Sgqu5DizxiEfGQkGabz LYeQ== 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=NH4tVoLA/Ab9gFvMSSGVxXB8I+Y2VZfuJjnFdVe1WZI=; b=BQOMTnvmI6D1fyyDU6+GBToHsnCPL5qQ3nB2L2nLljCSmhkwHKzxQgvKlZVj4/idO8 GJjSk3D8V0FNzj5nD60xKv5mOBCmyWDfn5LzRiXQy7jmnlCwE/Vpslyc3jWP6nxSfiu3 qVXd5BkFQ8ioHrLFbwQ5issoCCTK2bT/1rbQiAW7B+hGH5ROVuhE8NjTWsd4qzL+w9eR v7P5zPMnyM58UoUMmt213QtrcCnehV8ZVoCKQHP91wdjZCIxWfmxKJrvnIQhbG5lW19a ThjCby+8UTemAfAiuIVb6c0kVaO/fnWjTRA9Czc+obpUP2tkvKe8FXRx5Mo1WEK7JKyL cstw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=MBOHa5bX; 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 kk9-20020a17090b4a0900b00233fdabf0e6si2860320pjb.12.2023.03.11.13.01.56; Sat, 11 Mar 2023 13:02: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=MBOHa5bX; 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 S229997AbjCKUwG (ORCPT + 99 others); Sat, 11 Mar 2023 15:52:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229666AbjCKUwE (ORCPT ); Sat, 11 Mar 2023 15:52:04 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1F026B319; Sat, 11 Mar 2023 12:52:00 -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=NH4tVoLA/Ab9gFvMSSGVxXB8I+Y2VZfuJjnFdVe1WZI=; b=MBOHa5bX+EABvDhkdB/7qv7vSl GVUSDgKxgX7yefTJIVBJBdmNe1Ts3Tkl/3O2a3Jd+vRuUJixDZ35Hj11Xdg5ekyjrSJRsEmFMZtcb 3ZbuZ74QnM8A+ubsMl9KSBJDvfb+XXrHCa/6b3mSEzG+vhBQgn/bSpoYQkL+4INVlyjzjpxhq8xTd xOTsAfp0PA1UzHpg1bhRa6X5URlkg7TUmFl8AMZlKgrJH4aNvMpm2K94wq/NxeWqV6WdwIUFX0uo7 u+yXxcHlVMNKxWlxj7rvqCflb/ElYQtU16FzhZG3oEIuB9kT49OjfLZK5hEJU9z9PNKmb3zvyi3Dc 8X1e0YSQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pb6Bz-001EKC-S4; Sat, 11 Mar 2023 20:51:51 +0000 From: Luis Chamberlain To: chuck.lever@oracle.com, jlayton@kernel.org, trond.myklebust@hammerspace.com, anna@kernel.org, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, kuba@kernel.org, linux-nfs@vger.kernel.org Cc: ebiederm@xmission.com, keescook@chromium.org, yzaikin@google.com, j.granados@samsung.com, patches@lists.linux.dev, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH v2 2/5] sunrpc: simplify one-level sysctl registration for xr_tunables_table Date: Sat, 11 Mar 2023 12:51:45 -0800 Message-Id: <20230311205148.293375-3-mcgrof@kernel.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230311205148.293375-1-mcgrof@kernel.org> References: <20230311205148.293375-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?1760106674160328831?= X-GMAIL-MSGID: =?utf-8?q?1760106674160328831?= 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 --- net/sunrpc/xprtrdma/transport.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c index 10bb2b929c6d..29b0562d62e7 100644 --- a/net/sunrpc/xprtrdma/transport.c +++ b/net/sunrpc/xprtrdma/transport.c @@ -140,15 +140,6 @@ static struct ctl_table xr_tunables_table[] = { { }, }; -static struct ctl_table sunrpc_table[] = { - { - .procname = "sunrpc", - .mode = 0555, - .child = xr_tunables_table - }, - { }, -}; - #endif static const struct rpc_xprt_ops xprt_rdma_procs; @@ -799,7 +790,7 @@ int xprt_rdma_init(void) #if IS_ENABLED(CONFIG_SUNRPC_DEBUG) if (!sunrpc_table_header) - sunrpc_table_header = register_sysctl_table(sunrpc_table); + sunrpc_table_header = register_sysctl("sunrpc", xr_tunables_table); #endif return 0; } From patchwork Sat Mar 11 20:51:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 68195 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp448617wrd; Sat, 11 Mar 2023 12:55:57 -0800 (PST) X-Google-Smtp-Source: AK7set/Gv9ZCjoUuBBJDosEAaujaSXTzi1WC/FInEak1uvUJF2WoPGCop+I25pKpr2lQSA/nqKVw X-Received: by 2002:a05:6a20:1587:b0:cb:9fcc:3f37 with SMTP id h7-20020a056a20158700b000cb9fcc3f37mr32300378pzj.35.1678568157260; Sat, 11 Mar 2023 12:55:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678568157; cv=none; d=google.com; s=arc-20160816; b=EUDrhsSjGseZsR30SgZB2q6iLgk9/omc06RsyqQ+H0xhLQmwkLpDmcsub4ZsnGyaID HDYZpLvsWfqKMc7/C382G65Iq5qimMlydnIgRoVr2yVq+FvPp8QgQqZ5yzYwsZ/BOW65 bpWFueYI/yEmrrY3yaKVULGmCKYbBsRFTz1ySrDjfNnVkOX0COwnbTtPalyj3f1Am9lg 3hrpW3hve7MT8kSTnoOtCjFU38RQENvYKeMggILJs8J0wACosKOhsi3BH8/f7En6Tk95 Q/M7UcEf58YiSESorButzosBSEpR94WZgHq4en66xTWz0VID5D+n/w9TkP3K7ZkEhav2 bO3w== 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=JMrOLqBblBfuXk+q4S5+9mk7xuUL4OAY5iCRONC3a9s=; b=0s5Gm0ZyfeVQpYWjoN/HJhTlAE3MtL+OmVbOEnGCdmcQ7mOSbVg/8ChxK3zZLhNUAw t3rj5dZQpYI2LBlCw37fXsTCYQABV2b8eWlqDyp3NhIhg15oYA3gch2IoSK9mifLIlVa 7Hr1AdH3BZsbx2mUoR8gB3EmEXM02tSBRBMJ9wewdQmguMYrqFNJ3YonRc9eHHgSa5ug 591Yz7/WZUA2em1beEfmphLf76e3HFJVci9jhsiJZAmTukG1acewPyArOn7fQeCJsek2 adrCuADYZqUF86Dek/ljzAh8OGZJGqHJGJqyJ3RfjBibdaULzX+InUbzGWjaLO9/jKza yYew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=EHg9BXEf; 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 v135-20020a63618d000000b00502f10fa6e0si2675856pgb.819.2023.03.11.12.55.42; Sat, 11 Mar 2023 12:55:57 -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=EHg9BXEf; 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 S229884AbjCKUwW (ORCPT + 99 others); Sat, 11 Mar 2023 15:52:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229960AbjCKUwF (ORCPT ); Sat, 11 Mar 2023 15:52:05 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0DE16B5C9; Sat, 11 Mar 2023 12:52:01 -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=JMrOLqBblBfuXk+q4S5+9mk7xuUL4OAY5iCRONC3a9s=; b=EHg9BXEfB4ZQjbQwkxiHKpoYGU A2q6+FFpnWew4fEu9zKjwDtCirVGQ7SDtYMSRqCv4scOBBPrxMd3RAOvw7lk1WPwCph8OT3OeR5a2 3F5CUhgg6sR2221WCfmeAwKk5wRUau0DA8FZF5EGCpNCELYa24Li5V2euz7KwrputgT/8qfjSiJ/1 02bOVg4eWwbybR4AW1Yfq16JG94S5YZIpyQtG1tZorCiKgsnEvTNQCoZfmXMQfhbUl/8pauraN/oA DnvnZJU0642c63HqIWEwqTorr5fKDaGoKhBFLwzGZAf1n2zf7VjCl6N4qG5iOYZndzLyr7F2cQP27 4qO3nLFg==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pb6Bz-001EKE-TS; Sat, 11 Mar 2023 20:51:51 +0000 From: Luis Chamberlain To: chuck.lever@oracle.com, jlayton@kernel.org, trond.myklebust@hammerspace.com, anna@kernel.org, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, kuba@kernel.org, linux-nfs@vger.kernel.org Cc: ebiederm@xmission.com, keescook@chromium.org, yzaikin@google.com, j.granados@samsung.com, patches@lists.linux.dev, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH v2 3/5] sunrpc: simplify one-level sysctl registration for xs_tunables_table Date: Sat, 11 Mar 2023 12:51:46 -0800 Message-Id: <20230311205148.293375-4-mcgrof@kernel.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230311205148.293375-1-mcgrof@kernel.org> References: <20230311205148.293375-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?1760106284055877501?= X-GMAIL-MSGID: =?utf-8?q?1760106284055877501?= 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 --- net/sunrpc/xprtsock.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index aaa5b2741b79..46bbd6230650 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -77,7 +77,7 @@ static unsigned int xs_tcp_fin_timeout __read_mostly = XS_TCP_LINGER_TO; /* * We can register our own files under /proc/sys/sunrpc by - * calling register_sysctl_table() again. The files in that + * calling register_sysctl() again. The files in that * directory become the union of all files registered there. * * We simply need to make sure that we don't collide with @@ -157,15 +157,6 @@ static struct ctl_table xs_tunables_table[] = { { }, }; -static struct ctl_table sunrpc_table[] = { - { - .procname = "sunrpc", - .mode = 0555, - .child = xs_tunables_table - }, - { }, -}; - /* * Wait duration for a reply from the RPC portmapper. */ @@ -3174,7 +3165,7 @@ static struct xprt_class xs_bc_tcp_transport = { int init_socket_xprt(void) { if (!sunrpc_table_header) - sunrpc_table_header = register_sysctl_table(sunrpc_table); + sunrpc_table_header = register_sysctl("sunrpc", xs_tunables_table); xprt_register_transport(&xs_local_transport); xprt_register_transport(&xs_udp_transport); From patchwork Sat Mar 11 20:51:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 68199 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp456345wrd; Sat, 11 Mar 2023 13:17:02 -0800 (PST) X-Google-Smtp-Source: AK7set/cs4eQwmtxp51n0vdqvN40JyBhqMijZXxesiAwTVpuOXbee2py+RpLDOdgRtrqX313jB8L X-Received: by 2002:a17:90a:fb0e:b0:234:13a3:6e67 with SMTP id it14-20020a17090afb0e00b0023413a36e67mr31071210pjb.12.1678569421774; Sat, 11 Mar 2023 13:17:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678569421; cv=none; d=google.com; s=arc-20160816; b=BggiCxa9vMyuaufZNY0xFjiBrfpzcx+u9gDL/VhZqO+0Bqj2oP7MMTONA/LLCJCQ7n O9Be1j6ZwezDsni81W/7pFgTcoSKZHnkmm1QfThNh7LdRDxTjcBOmIwfpTVaEPja2db3 AQG7H4o8bALq3qh2i+6pi0N1F833IMoBjrnRcwA0gD8CrClGz5S60hUsydOF3z+wqH7l 9uJNT9w3rKTLEsB1yRIUqVwclZheAHWhUJMpKesPkcN2GjWKSpS2kCrvTLcMxggRyF8N 6tLD0IcN3uSiGJAPFBLHKKl9sG595j4oLRcVFD2QBLFDUHBrp+7EaNSruECdr7Lz2AJx NoTQ== 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=uVA5gkd7agM5XGy1IcOl4n0Hi/2VsqP4CuIiylpH99w=; b=JMa72m+YcG97YXj7ENdUCxbIVPnBCSKrftd0uVEf6d65zjd1eN39AmOC7MaS58PgYo fMCqdzJtY3ShztJ/L0zD64l9lwhfAW0LzCLBoIa8LGbCWrOdti7IXve+PmEhlQCEyo0b 2gr58fn+rymNSAFmNyPEeI7SPCqGtt8HoHQK+Vq5AQtIuAgPtjQ26CND2xCaStmaQ+RV /7c9PpbL+TErd5AvWHWsq6Kb9r0zuiqPfwEe1jCdGieknT3u71PVO/ythfpFTPK6S0SI Szbdi/ADcvEoXRfs7RmDBGmhIT7iPUnKJwbed7D3K5phrF0Ewc++8b9nyO+eSeEywWtw Z7yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=2sfCSCCS; 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 s193-20020a632cca000000b004df5fe7a161si2799192pgs.660.2023.03.11.13.16.48; Sat, 11 Mar 2023 13:17:01 -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=2sfCSCCS; 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 S229783AbjCKUwU (ORCPT + 99 others); Sat, 11 Mar 2023 15:52:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229897AbjCKUwF (ORCPT ); Sat, 11 Mar 2023 15:52:05 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3FF26B5C5; Sat, 11 Mar 2023 12:52:01 -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=uVA5gkd7agM5XGy1IcOl4n0Hi/2VsqP4CuIiylpH99w=; b=2sfCSCCSYqnla7r5cEbjLxX5XG mWPsPA4I5aYIaO0CQoU/LuEURbrOXc9ZF4gLI7F/SYYQW0o78LP7XLImsoGftNTTyU0dC774xBLLC BDrOkVzyd0vHDmHoLv46OaBxE30K3cOJnhkol/6DRcfHyRmeSVXWBkiGfZLcilHs2BlqA/0kRKPR1 ZRS8d3LHzh0/NJRLSK8Owz3LfMrxyincMlD1H3am0iLtwtQ7SxY+HW/u2I09ZI1szs0eqJ516mB2e 7PBXCT6inJayGyV9fiVaJKXKuxw5vLoUaffIO8N8ejLQcrjkunqTvLR4NF5+sLDIe+OZLT5uu00TE JmJPQUbA==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pb6Bz-001EKG-Ul; Sat, 11 Mar 2023 20:51:51 +0000 From: Luis Chamberlain To: chuck.lever@oracle.com, jlayton@kernel.org, trond.myklebust@hammerspace.com, anna@kernel.org, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, kuba@kernel.org, linux-nfs@vger.kernel.org Cc: ebiederm@xmission.com, keescook@chromium.org, yzaikin@google.com, j.granados@samsung.com, patches@lists.linux.dev, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH v2 4/5] sunrpc: move sunrpc_table and proc routines above Date: Sat, 11 Mar 2023 12:51:47 -0800 Message-Id: <20230311205148.293375-5-mcgrof@kernel.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230311205148.293375-1-mcgrof@kernel.org> References: <20230311205148.293375-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?1760107609951060834?= X-GMAIL-MSGID: =?utf-8?q?1760107609951060834?= No need to do a forward declaration for sunrpc_table, just move the sysctls up as everyone else does it. This will make the next change easier to read. This change produces no functional changes. Signed-off-by: Luis Chamberlain --- net/sunrpc/sysctl.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c index 3aad6ef18504..a54438d68d1b 100644 --- a/net/sunrpc/sysctl.c +++ b/net/sunrpc/sysctl.c @@ -40,25 +40,6 @@ EXPORT_SYMBOL_GPL(nlm_debug); #if IS_ENABLED(CONFIG_SUNRPC_DEBUG) -static struct ctl_table_header *sunrpc_table_header; -static struct ctl_table sunrpc_table[]; - -void -rpc_register_sysctl(void) -{ - if (!sunrpc_table_header) - sunrpc_table_header = register_sysctl_table(sunrpc_table); -} - -void -rpc_unregister_sysctl(void) -{ - if (sunrpc_table_header) { - unregister_sysctl_table(sunrpc_table_header); - sunrpc_table_header = NULL; - } -} - static int proc_do_xprt(struct ctl_table *table, int write, void *buffer, size_t *lenp, loff_t *ppos) { @@ -141,7 +122,9 @@ proc_dodebug(struct ctl_table *table, int write, void *buffer, size_t *lenp, *ppos += *lenp; return 0; } +#endif +static struct ctl_table_header *sunrpc_table_header; static struct ctl_table debug_table[] = { { @@ -190,4 +173,19 @@ static struct ctl_table sunrpc_table[] = { { } }; -#endif + +void +rpc_register_sysctl(void) +{ + if (!sunrpc_table_header) + sunrpc_table_header = register_sysctl_table(sunrpc_table); +} + +void +rpc_unregister_sysctl(void) +{ + if (sunrpc_table_header) { + unregister_sysctl_table(sunrpc_table_header); + sunrpc_table_header = NULL; + } +} From patchwork Sat Mar 11 20:51:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 68197 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp451668wrd; Sat, 11 Mar 2023 13:03:29 -0800 (PST) X-Google-Smtp-Source: AK7set/fKltpibKSodvwfqzbSRoIO94J/UnaLpsVF54wJpeAY4dc2bUWVFHJa0x2k7LCT2qBWUyX X-Received: by 2002:a17:90a:4b8c:b0:233:b73c:18c9 with SMTP id i12-20020a17090a4b8c00b00233b73c18c9mr31305072pjh.40.1678568608778; Sat, 11 Mar 2023 13:03:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678568608; cv=none; d=google.com; s=arc-20160816; b=n7m2ygWnr2VDYQC/Ts0+UblrZiRB8YQu0E9cHZgwghiCHIdicQVFJWjvoQzCJHh1AA uzCpNGx/m0PeMKxxKsJYFWE67ZP9N9wuRfnoepO+Nx/E0YSvP8QULpAHGk2dNeTWcRj0 UrM8QozbaUM68kktqwghgh3uNz+EpkePb9IVcFKKMaY7ph8Z+wuKnVEuDZWRMzwrI6bh caSfpMsSKma+FUZAVyP+9kbmB9EX6/8UYg7t/zBKDhofyUiAVjGX7UjLnoaJt3jUKH6t 3sYCOLMy9jPspf7/09yUP1I92mB8+MZSQjVDgDq01rvwAWlni9j0KfjqybNLkPROt+mx 9NLQ== 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=8qaxjUIDzCVtggcE5OBgXoP+RAqWhUksXRNkmAxrrvc=; b=nxLUWKHPEa1v8p8AjSlI5WHpEIzxKhaiEbTrexF2LKe88tyyP0NP2jniNLoZvm0l6t QZGwkCdnMzgP/bnvpfg6OxUKgEI/UvQwDpL5z2m3/dhIG3rmv1C0Mt4cKvAEHGv1igRW NZ4/6c+BBTGM3gDDyo3La0xAJjgs7yI7ZphKQtE0R5K6b6iVM/+GvD/39XKza+5rhIVz V0m9sQfSUequVLZE3qGNbZWftcfaJo6s38uYkAoPotKSgs0Te4l7KNiyql5RwWx5Fk0Y 3N0pncQF+1KQDl+IVbm85SyGggSGWPpju6G1g+kuiEAKrGP7u8pSBXQWGxZYt7YRxNqH 5nFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=RJpECNtN; 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 bm18-20020a656e92000000b00502d650cfa2si2700204pgb.811.2023.03.11.13.03.15; Sat, 11 Mar 2023 13:03:28 -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=RJpECNtN; 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 S229636AbjCKUwS (ORCPT + 99 others); Sat, 11 Mar 2023 15:52:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229843AbjCKUwE (ORCPT ); Sat, 11 Mar 2023 15:52:04 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E54916B323; Sat, 11 Mar 2023 12:52:00 -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=8qaxjUIDzCVtggcE5OBgXoP+RAqWhUksXRNkmAxrrvc=; b=RJpECNtNMygd1mX/HW48Hp2Sc8 96MkInTnHGiS7wHGe+kg6aViDijV9GH4e6tyj7gpJcNHi5z8KBWYfaB1QfARuF+cgyUIsDZvPnRVC kYayuq20aBM3SCpqCOfUYHBLegcGQ8cQX0ufRpxbJAVXO76kWkp9dy2caL005KKTHxsZQB6CF87RS qgMowMVFIbJbIYwCuRTO+2Q0H2pxbCdL0DbCyOw/8D6y6BMNYVGZ9ai0ynCq4TdHuZJUG9jM0x3Dw Mu0JYogYvy3kBr8dQCsyVoa7LEraz5UJG8FuBFSy8PUBkcaF/y7CNBlH8qtHqDJbH87BjYWFGfIMy 3EafRBgg==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pb6Bz-001EKI-WB; Sat, 11 Mar 2023 20:51:52 +0000 From: Luis Chamberlain To: chuck.lever@oracle.com, jlayton@kernel.org, trond.myklebust@hammerspace.com, anna@kernel.org, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, kuba@kernel.org, linux-nfs@vger.kernel.org Cc: ebiederm@xmission.com, keescook@chromium.org, yzaikin@google.com, j.granados@samsung.com, patches@lists.linux.dev, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH v2 5/5] sunrpc: simplify one-level sysctl registration for debug_table Date: Sat, 11 Mar 2023 12:51:48 -0800 Message-Id: <20230311205148.293375-6-mcgrof@kernel.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230311205148.293375-1-mcgrof@kernel.org> References: <20230311205148.293375-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?1760106757333247449?= X-GMAIL-MSGID: =?utf-8?q?1760106757333247449?= 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 --- net/sunrpc/sysctl.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c index a54438d68d1b..d51e6d9a2467 100644 --- a/net/sunrpc/sysctl.c +++ b/net/sunrpc/sysctl.c @@ -164,21 +164,11 @@ static struct ctl_table debug_table[] = { { } }; -static struct ctl_table sunrpc_table[] = { - { - .procname = "sunrpc", - .mode = 0555, - .child = debug_table - }, - { } -}; - - void rpc_register_sysctl(void) { if (!sunrpc_table_header) - sunrpc_table_header = register_sysctl_table(sunrpc_table); + sunrpc_table_header = register_sysctl("sunrpc", debug_table); } void