2021-02-15 17:42:03

by Dan Aloni

Subject: [PATCH v1 1/8] sunrpc: rename 'net' to 'client'

This is in preparation to adding a second directory to keep track
of each transport.

Signed-off-by: Dan Aloni <[email protected]>
---
net/sunrpc/clnt.c | 8 ++++----
net/sunrpc/sysfs.c | 22 +++++++++++-----------
net/sunrpc/sysfs.h | 4 ++--
3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 02905eae5c0a..0a4811be01cd 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -301,7 +301,7 @@ static int rpc_client_register(struct rpc_clnt *clnt,
int err;

rpc_clnt_debugfs_register(clnt);
- rpc_netns_sysfs_setup(clnt, net);
+ rpc_netns_client_sysfs_setup(clnt, net);

pipefs_sb = rpc_get_sb_net(net);
if (pipefs_sb) {
@@ -329,7 +329,7 @@ static int rpc_client_register(struct rpc_clnt *clnt,
out:
if (pipefs_sb)
rpc_put_sb_net(net);
- rpc_netns_sysfs_destroy(clnt);
+ rpc_netns_client_sysfs_destroy(clnt);
rpc_clnt_debugfs_unregister(clnt);
return err;
}
@@ -736,7 +736,7 @@ int rpc_switch_client_transport(struct rpc_clnt *clnt,

rpc_unregister_client(clnt);
__rpc_clnt_remove_pipedir(clnt);
- rpc_netns_sysfs_destroy(clnt);
+ rpc_netns_client_sysfs_destroy(clnt);
rpc_clnt_debugfs_unregister(clnt);

/*
@@ -883,7 +883,7 @@ static void rpc_free_client_work(struct work_struct *work)
* so they cannot be called in rpciod, so they are handled separately
* here.
*/
- rpc_netns_sysfs_destroy(clnt);
+ rpc_netns_client_sysfs_destroy(clnt);
rpc_clnt_debugfs_unregister(clnt);
rpc_free_clid(clnt);
rpc_clnt_remove_pipedir(clnt);
diff --git a/net/sunrpc/sysfs.c b/net/sunrpc/sysfs.c
index 8b01b4df64ee..3fe814795ed9 100644
--- a/net/sunrpc/sysfs.c
+++ b/net/sunrpc/sysfs.c
@@ -9,7 +9,7 @@
#include "sysfs.h"

struct kobject *rpc_client_kobj;
-static struct kset *rpc_client_kset;
+static struct kset *rpc_sunrpc_kset;

static void rpc_netns_object_release(struct kobject *kobj)
{
@@ -45,13 +45,13 @@ static struct kobject *rpc_netns_object_alloc(const char *name,

int rpc_sysfs_init(void)
{
- rpc_client_kset = kset_create_and_add("sunrpc", NULL, kernel_kobj);
- if (!rpc_client_kset)
+ rpc_sunrpc_kset = kset_create_and_add("sunrpc", NULL, kernel_kobj);
+ if (!rpc_sunrpc_kset)
return -ENOMEM;
- rpc_client_kobj = rpc_netns_object_alloc("net", rpc_client_kset, NULL);
+ rpc_client_kobj = rpc_netns_object_alloc("client", rpc_sunrpc_kset, NULL);
if (!rpc_client_kobj) {
- kset_unregister(rpc_client_kset);
- rpc_client_kset = NULL;
+ kset_unregister(rpc_sunrpc_kset);
+ rpc_sunrpc_kset = NULL;
return -ENOMEM;
}
return 0;
@@ -119,18 +119,18 @@ static struct kobj_type rpc_netns_client_type = {
void rpc_sysfs_exit(void)
{
kobject_put(rpc_client_kobj);
- kset_unregister(rpc_client_kset);
+ kset_unregister(rpc_sunrpc_kset);
}

static struct rpc_netns_client *rpc_netns_client_alloc(struct kobject *parent,
- struct net *net, int clid)
+ struct net *net, int clid)
{
struct rpc_netns_client *p;

p = kzalloc(sizeof(*p), GFP_KERNEL);
if (p) {
p->net = net;
- p->kobject.kset = rpc_client_kset;
+ p->kobject.kset = rpc_sunrpc_kset;
if (kobject_init_and_add(&p->kobject, &rpc_netns_client_type,
parent, "%d", clid) == 0)
return p;
@@ -139,7 +139,7 @@ static struct rpc_netns_client *rpc_netns_client_alloc(struct kobject *parent,
return NULL;
}

-void rpc_netns_sysfs_setup(struct rpc_clnt *clnt, struct net *net)
+void rpc_netns_client_sysfs_setup(struct rpc_clnt *clnt, struct net *net)
{
struct rpc_netns_client *rpc_client;
struct rpc_xprt *xprt = rcu_dereference(clnt->cl_xprt);
@@ -155,7 +155,7 @@ void rpc_netns_sysfs_setup(struct rpc_clnt *clnt, struct net *net)
}
}

-void rpc_netns_sysfs_destroy(struct rpc_clnt *clnt)
+void rpc_netns_client_sysfs_destroy(struct rpc_clnt *clnt)
{
struct rpc_netns_client *rpc_client = clnt->cl_sysfs;

diff --git a/net/sunrpc/sysfs.h b/net/sunrpc/sysfs.h
index 137a12c87954..ab75c3cc91b6 100644
--- a/net/sunrpc/sysfs.h
+++ b/net/sunrpc/sysfs.h
@@ -16,7 +16,7 @@ extern struct kobject *rpc_client_kobj;
extern int rpc_sysfs_init(void);
extern void rpc_sysfs_exit(void);

-void rpc_netns_sysfs_setup(struct rpc_clnt *clnt, struct net *net);
-void rpc_netns_sysfs_destroy(struct rpc_clnt *clnt);
+void rpc_netns_client_sysfs_setup(struct rpc_clnt *clnt, struct net *net);
+void rpc_netns_client_sysfs_destroy(struct rpc_clnt *clnt);

#endif
--
2.26.2

2021-02-16 21:27:15

by Anna Schumaker

Subject: Re: [PATCH v1 1/8] sunrpc: rename 'net' to 'client'

Hi Dan,

On Mon, Feb 15, 2021 at 12:42 PM Dan Aloni <[email protected]> wrote:
>
> This is in preparation to adding a second directory to keep track
> of each transport.

I initially named the directory "net" to match how NFS's sysfs
directories are created (/sys/fs/nfs/net). If naming it "client" makes
more sense then I should probably introduce it that way in my patches.

Thoughts?
Anna

>
> Signed-off-by: Dan Aloni <[email protected]>
> ---
> net/sunrpc/clnt.c | 8 ++++----
> net/sunrpc/sysfs.c | 22 +++++++++++-----------
> net/sunrpc/sysfs.h | 4 ++--
> 3 files changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
> index 02905eae5c0a..0a4811be01cd 100644
> --- a/net/sunrpc/clnt.c
> +++ b/net/sunrpc/clnt.c
> @@ -301,7 +301,7 @@ static int rpc_client_register(struct rpc_clnt *clnt,
> int err;
>
> rpc_clnt_debugfs_register(clnt);
> - rpc_netns_sysfs_setup(clnt, net);
> + rpc_netns_client_sysfs_setup(clnt, net);
>
> pipefs_sb = rpc_get_sb_net(net);
> if (pipefs_sb) {
> @@ -329,7 +329,7 @@ static int rpc_client_register(struct rpc_clnt *clnt,
> out:
> if (pipefs_sb)
> rpc_put_sb_net(net);
> - rpc_netns_sysfs_destroy(clnt);
> + rpc_netns_client_sysfs_destroy(clnt);
> rpc_clnt_debugfs_unregister(clnt);
> return err;
> }
> @@ -736,7 +736,7 @@ int rpc_switch_client_transport(struct rpc_clnt *clnt,
>
> rpc_unregister_client(clnt);
> __rpc_clnt_remove_pipedir(clnt);
> - rpc_netns_sysfs_destroy(clnt);
> + rpc_netns_client_sysfs_destroy(clnt);
> rpc_clnt_debugfs_unregister(clnt);
>
> /*
> @@ -883,7 +883,7 @@ static void rpc_free_client_work(struct work_struct *work)
> * so they cannot be called in rpciod, so they are handled separately
> * here.
> */
> - rpc_netns_sysfs_destroy(clnt);
> + rpc_netns_client_sysfs_destroy(clnt);
> rpc_clnt_debugfs_unregister(clnt);
> rpc_free_clid(clnt);
> rpc_clnt_remove_pipedir(clnt);
> diff --git a/net/sunrpc/sysfs.c b/net/sunrpc/sysfs.c
> index 8b01b4df64ee..3fe814795ed9 100644
> --- a/net/sunrpc/sysfs.c
> +++ b/net/sunrpc/sysfs.c
> @@ -9,7 +9,7 @@
> #include "sysfs.h"
>
> struct kobject *rpc_client_kobj;
> -static struct kset *rpc_client_kset;
> +static struct kset *rpc_sunrpc_kset;
>
> static void rpc_netns_object_release(struct kobject *kobj)
> {
> @@ -45,13 +45,13 @@ static struct kobject *rpc_netns_object_alloc(const char *name,
>
> int rpc_sysfs_init(void)
> {
> - rpc_client_kset = kset_create_and_add("sunrpc", NULL, kernel_kobj);
> - if (!rpc_client_kset)
> + rpc_sunrpc_kset = kset_create_and_add("sunrpc", NULL, kernel_kobj);
> + if (!rpc_sunrpc_kset)
> return -ENOMEM;
> - rpc_client_kobj = rpc_netns_object_alloc("net", rpc_client_kset, NULL);
> + rpc_client_kobj = rpc_netns_object_alloc("client", rpc_sunrpc_kset, NULL);
> if (!rpc_client_kobj) {
> - kset_unregister(rpc_client_kset);
> - rpc_client_kset = NULL;
> + kset_unregister(rpc_sunrpc_kset);
> + rpc_sunrpc_kset = NULL;
> return -ENOMEM;
> }
> return 0;
> @@ -119,18 +119,18 @@ static struct kobj_type rpc_netns_client_type = {
> void rpc_sysfs_exit(void)
> {
> kobject_put(rpc_client_kobj);
> - kset_unregister(rpc_client_kset);
> + kset_unregister(rpc_sunrpc_kset);
> }
>
> static struct rpc_netns_client *rpc_netns_client_alloc(struct kobject *parent,
> - struct net *net, int clid)
> + struct net *net, int clid)
> {
> struct rpc_netns_client *p;
>
> p = kzalloc(sizeof(*p), GFP_KERNEL);
> if (p) {
> p->net = net;
> - p->kobject.kset = rpc_client_kset;
> + p->kobject.kset = rpc_sunrpc_kset;
> if (kobject_init_and_add(&p->kobject, &rpc_netns_client_type,
> parent, "%d", clid) == 0)
> return p;
> @@ -139,7 +139,7 @@ static struct rpc_netns_client *rpc_netns_client_alloc(struct kobject *parent,
> return NULL;
> }
>
> -void rpc_netns_sysfs_setup(struct rpc_clnt *clnt, struct net *net)
> +void rpc_netns_client_sysfs_setup(struct rpc_clnt *clnt, struct net *net)
> {
> struct rpc_netns_client *rpc_client;
> struct rpc_xprt *xprt = rcu_dereference(clnt->cl_xprt);
> @@ -155,7 +155,7 @@ void rpc_netns_sysfs_setup(struct rpc_clnt *clnt, struct net *net)
> }
> }
>
> -void rpc_netns_sysfs_destroy(struct rpc_clnt *clnt)
> +void rpc_netns_client_sysfs_destroy(struct rpc_clnt *clnt)
> {
> struct rpc_netns_client *rpc_client = clnt->cl_sysfs;
>
> diff --git a/net/sunrpc/sysfs.h b/net/sunrpc/sysfs.h
> index 137a12c87954..ab75c3cc91b6 100644
> --- a/net/sunrpc/sysfs.h
> +++ b/net/sunrpc/sysfs.h
> @@ -16,7 +16,7 @@ extern struct kobject *rpc_client_kobj;
> extern int rpc_sysfs_init(void);
> extern void rpc_sysfs_exit(void);
>
> -void rpc_netns_sysfs_setup(struct rpc_clnt *clnt, struct net *net);
> -void rpc_netns_sysfs_destroy(struct rpc_clnt *clnt);
> +void rpc_netns_client_sysfs_setup(struct rpc_clnt *clnt, struct net *net);
> +void rpc_netns_client_sysfs_destroy(struct rpc_clnt *clnt);
>
> #endif
> --
> 2.26.2
>

2021-02-17 21:03:27

by Dan Aloni

Subject: Re: [PATCH v1 1/8] sunrpc: rename 'net' to 'client'

On Tue, Feb 16, 2021 at 04:24:41PM -0500, Anna Schumaker wrote:
> Hi Dan,
>
> On Mon, Feb 15, 2021 at 12:42 PM Dan Aloni <[email protected]> wrote:
> >
> > This is in preparation to adding a second directory to keep track
> > of each transport.
>
> I initially named the directory "net" to match how NFS's sysfs
> directories are created (/sys/fs/nfs/net). If naming it "client" makes
> more sense then I should probably introduce it that way in my patches.
>
> Thoughts?

We can keep the "net" directory under "sunrpc" and have the three
directories under it, i.e:

/sys/kernel/sunrpc/net/client
/sys/kernel/sunrpc/net/transport
/sys/kernel/sunrpc/net/multipath

It works for me too, but I no preference either way.

--
Dan Aloni