Skip to content

Commit d5082ac

Browse files
bcodding-rhTrond Myklebust
authored andcommitted
NFS: rename nfs_client_kobj to nfs_net_kobj
Match the variable names to the sysfs structure. Signed-off-by: Benjamin Coddington <bcodding@redhat.com> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
1 parent 8b18a2e commit d5082ac

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

fs/nfs/sysfs.c

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

20-
struct kobject *nfs_client_kobj;
20+
struct kobject *nfs_net_kobj;
2121
static struct kset *nfs_kset;
2222

2323
static void nfs_netns_object_release(struct kobject *kobj)
@@ -58,8 +58,8 @@ int nfs_sysfs_init(void)
5858
nfs_kset = kset_create_and_add("nfs", NULL, fs_kobj);
5959
if (!nfs_kset)
6060
return -ENOMEM;
61-
nfs_client_kobj = nfs_netns_object_alloc("net", nfs_kset, NULL);
62-
if (!nfs_client_kobj) {
61+
nfs_net_kobj = nfs_netns_object_alloc("net", nfs_kset, NULL);
62+
if (!nfs_net_kobj) {
6363
kset_unregister(nfs_kset);
6464
nfs_kset = NULL;
6565
return -ENOMEM;
@@ -69,7 +69,7 @@ int nfs_sysfs_init(void)
6969

7070
void nfs_sysfs_exit(void)
7171
{
72-
kobject_put(nfs_client_kobj);
72+
kobject_put(nfs_net_kobj);
7373
kset_unregister(nfs_kset);
7474
}
7575

@@ -172,7 +172,7 @@ void nfs_netns_sysfs_setup(struct nfs_net *netns, struct net *net)
172172
{
173173
struct nfs_netns_client *clp;
174174

175-
clp = nfs_netns_client_alloc(nfs_client_kobj, net);
175+
clp = nfs_netns_client_alloc(nfs_net_kobj, net);
176176
if (clp) {
177177
netns->nfs_client = clp;
178178
kobject_uevent(&clp->kobject, KOBJ_ADD);

fs/nfs/sysfs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ struct nfs_netns_client {
1414
const char __rcu *identifier;
1515
};
1616

17-
extern struct kobject *nfs_client_kobj;
17+
extern struct kobject *nfs_net_kobj;
1818

1919
extern int nfs_sysfs_init(void);
2020
extern void nfs_sysfs_exit(void);

0 commit comments

Comments
 (0)