Commit d5082ace authored by Benjamin Coddington's avatar Benjamin Coddington Committed by Trond Myklebust

NFS: rename nfs_client_kobj to nfs_net_kobj

Match the variable names to the sysfs structure.
Signed-off-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 8b18a2ed
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "netns.h" #include "netns.h"
#include "sysfs.h" #include "sysfs.h"
struct kobject *nfs_client_kobj; struct kobject *nfs_net_kobj;
static struct kset *nfs_kset; static struct kset *nfs_kset;
static void nfs_netns_object_release(struct kobject *kobj) static void nfs_netns_object_release(struct kobject *kobj)
...@@ -58,8 +58,8 @@ int nfs_sysfs_init(void) ...@@ -58,8 +58,8 @@ int nfs_sysfs_init(void)
nfs_kset = kset_create_and_add("nfs", NULL, fs_kobj); nfs_kset = kset_create_and_add("nfs", NULL, fs_kobj);
if (!nfs_kset) if (!nfs_kset)
return -ENOMEM; return -ENOMEM;
nfs_client_kobj = nfs_netns_object_alloc("net", nfs_kset, NULL); nfs_net_kobj = nfs_netns_object_alloc("net", nfs_kset, NULL);
if (!nfs_client_kobj) { if (!nfs_net_kobj) {
kset_unregister(nfs_kset); kset_unregister(nfs_kset);
nfs_kset = NULL; nfs_kset = NULL;
return -ENOMEM; return -ENOMEM;
...@@ -69,7 +69,7 @@ int nfs_sysfs_init(void) ...@@ -69,7 +69,7 @@ int nfs_sysfs_init(void)
void nfs_sysfs_exit(void) void nfs_sysfs_exit(void)
{ {
kobject_put(nfs_client_kobj); kobject_put(nfs_net_kobj);
kset_unregister(nfs_kset); kset_unregister(nfs_kset);
} }
...@@ -172,7 +172,7 @@ void nfs_netns_sysfs_setup(struct nfs_net *netns, struct net *net) ...@@ -172,7 +172,7 @@ void nfs_netns_sysfs_setup(struct nfs_net *netns, struct net *net)
{ {
struct nfs_netns_client *clp; struct nfs_netns_client *clp;
clp = nfs_netns_client_alloc(nfs_client_kobj, net); clp = nfs_netns_client_alloc(nfs_net_kobj, net);
if (clp) { if (clp) {
netns->nfs_client = clp; netns->nfs_client = clp;
kobject_uevent(&clp->kobject, KOBJ_ADD); kobject_uevent(&clp->kobject, KOBJ_ADD);
......
...@@ -14,7 +14,7 @@ struct nfs_netns_client { ...@@ -14,7 +14,7 @@ struct nfs_netns_client {
const char __rcu *identifier; const char __rcu *identifier;
}; };
extern struct kobject *nfs_client_kobj; extern struct kobject *nfs_net_kobj;
extern int nfs_sysfs_init(void); extern int nfs_sysfs_init(void);
extern void nfs_sysfs_exit(void); extern void nfs_sysfs_exit(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment