sunrpc: Create a sunrpc directory under /sys/kernel/

This is where we'll put per-rpc_client related files

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/net/sunrpc/Makefile b/net/sunrpc/Makefile
index 9488600451e89022a24f278b4487230844ac4efa..1c8de397d6adcebd955f46691f2e7fa7cccb39ed 100644 (file)
--- a/net/sunrpc/Makefile
+++ b/net/sunrpc/Makefile
@@ -12,7 +12,7 @@ sunrpc-y := clnt.o xprt.o socklib.o xprtsock.o sched.o \
            auth.o auth_null.o auth_unix.o \
            svc.o svcsock.o svcauth.o svcauth_unix.o \
            addr.o rpcb_clnt.o timer.o xdr.o \
-           sunrpc_syms.o cache.o rpc_pipe.o \
+           sunrpc_syms.o cache.o rpc_pipe.o sysfs.o \
            svc_xprt.o \
            xprtmultipath.o
 sunrpc-$(CONFIG_SUNRPC_DEBUG) += debugfs.o

diff --git a/net/sunrpc/sunrpc_syms.c b/net/sunrpc/sunrpc_syms.c
index 236fadc4a4399a89cf6bfba15cf4ebdcb81976bb..3b57efc692ecbc9e30208e7f99edf60a870fdd97 100644 (file)
--- a/net/sunrpc/sunrpc_syms.c
+++ b/net/sunrpc/sunrpc_syms.c
@@ -24,6 +24,7 @@
 #include <linux/sunrpc/xprtsock.h>
 
 #include "sunrpc.h"
+#include "sysfs.h"
 #include "netns.h"
 
 unsigned int sunrpc_net_id;
@@ -103,6 +104,10 @@ init_sunrpc(void)
        if (err)
                goto out4;
 
+       err = rpc_sysfs_init();
+       if (err)
+               goto out5;
+
        sunrpc_debugfs_init();
 #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
        rpc_register_sysctl();
@@ -111,6 +116,8 @@ init_sunrpc(void)
        init_socket_xprt();     /* clnt sock transport */
        return 0;
 
+out5:
+       unregister_rpc_pipefs();
 out4:
        unregister_pernet_subsys(&sunrpc_net_ops);
 out3:
@@ -124,6 +131,7 @@ out:
 static void __exit
 cleanup_sunrpc(void)
 {
+       rpc_sysfs_exit();
        rpc_cleanup_clids();
        rpcauth_remove_module();
        cleanup_socket_xprt();

diff --git a/net/sunrpc/sysfs.c b/net/sunrpc/sysfs.c
new file mode 100644 (file)
index 0000000..27eda18
--- /dev/null
+++ b/net/sunrpc/sysfs.c
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2020 Anna Schumaker <Anna.Schumaker@Netapp.com>
+ */
+#include <linux/kobject.h>
+
+static struct kset *rpc_sunrpc_kset;
+
+int rpc_sysfs_init(void)
+{
+       rpc_sunrpc_kset = kset_create_and_add("sunrpc", NULL, kernel_kobj);
+       if (!rpc_sunrpc_kset)
+               return -ENOMEM;
+       return 0;
+}
+
+void rpc_sysfs_exit(void)
+{
+       kset_unregister(rpc_sunrpc_kset);
+}

diff --git a/net/sunrpc/sysfs.h b/net/sunrpc/sysfs.h
new file mode 100644 (file)
index 0000000..f181c65
--- /dev/null
+++ b/net/sunrpc/sysfs.h
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2020 Anna Schumaker <Anna.Schumaker@Netapp.com>
+ */
+#ifndef __SUNRPC_SYSFS_H
+#define __SUNRPC_SYSFS_H
+
+int rpc_sysfs_init(void);
+void rpc_sysfs_exit(void);
+
+#endif