Skip to content

Commit 8b18a2e

Browse files
bcodding-rhTrond Myklebust
authored andcommitted
NFS: rename nfs_client_kset to nfs_kset
Be brief and match the subsystem name. There's no need to distinguish this kset variable from the server. Signed-off-by: Benjamin Coddington <bcodding@redhat.com> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
1 parent c8407f2 commit 8b18a2e

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

fs/nfs/sysfs.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "sysfs.h"
1919

2020
struct kobject *nfs_client_kobj;
21-
static struct kset *nfs_client_kset;
21+
static struct kset *nfs_kset;
2222

2323
static void nfs_netns_object_release(struct kobject *kobj)
2424
{
@@ -55,13 +55,13 @@ static struct kobject *nfs_netns_object_alloc(const char *name,
5555

5656
int nfs_sysfs_init(void)
5757
{
58-
nfs_client_kset = kset_create_and_add("nfs", NULL, fs_kobj);
59-
if (!nfs_client_kset)
58+
nfs_kset = kset_create_and_add("nfs", NULL, fs_kobj);
59+
if (!nfs_kset)
6060
return -ENOMEM;
61-
nfs_client_kobj = nfs_netns_object_alloc("net", nfs_client_kset, NULL);
61+
nfs_client_kobj = nfs_netns_object_alloc("net", nfs_kset, NULL);
6262
if (!nfs_client_kobj) {
63-
kset_unregister(nfs_client_kset);
64-
nfs_client_kset = NULL;
63+
kset_unregister(nfs_kset);
64+
nfs_kset = NULL;
6565
return -ENOMEM;
6666
}
6767
return 0;
@@ -70,7 +70,7 @@ int nfs_sysfs_init(void)
7070
void nfs_sysfs_exit(void)
7171
{
7272
kobject_put(nfs_client_kobj);
73-
kset_unregister(nfs_client_kset);
73+
kset_unregister(nfs_kset);
7474
}
7575

7676
static ssize_t nfs_netns_identifier_show(struct kobject *kobj,
@@ -159,7 +159,7 @@ static struct nfs_netns_client *nfs_netns_client_alloc(struct kobject *parent,
159159
p = kzalloc(sizeof(*p), GFP_KERNEL);
160160
if (p) {
161161
p->net = net;
162-
p->kobject.kset = nfs_client_kset;
162+
p->kobject.kset = nfs_kset;
163163
if (kobject_init_and_add(&p->kobject, &nfs_netns_client_type,
164164
parent, "nfs_client") == 0)
165165
return p;

0 commit comments

Comments
 (0)